8000 Fix conflicst for #154 by andreimc · Pull Request #412 · coder/code-server · GitHub
[go: up one dir, main page]
Skip to content

Fix conflicst for #154 #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

Fix conflicst for #154 #412

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
cab9610
Added serviceworker and manifest.json
lucacasonato Mar 8, 2019
ba6aa19
added deps in package.json
lucacasonato Mar 9, 2019
712486c
fixed image link
lucacasonato Mar 9, 2019
b6bc800
actually fixed images i think
lucacasonato Mar 9, 2019
ebb9cdd
added assets to individual module folders
lucacasonato Mar 9, 2019
0535fd5
added caching
lucacasonato Mar 9, 2019
88cb7cc
Merge pull request #1 from codercom/master
lucacasonato Mar 10, 2019
7f242e6
Serviceworker now properly loads
lucacasonato Mar 20, 2019
3cddc28
Changed single to double quotes
lucacasonato Mar 20, 2019
61e3a70
Merge branch 'master' into master
lucacasonato Mar 20, 2019
396084d
Merge remote-tracking branch 'sw/master'
andreimc Apr 3, 2019
2bd44c6
Update lock
andreimc Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
added assets to individual module folders
  • Loading branch information
@lucacasonato
lucacasonato committed Mar 9, 2019
commit ebb9cddc12a7172a59a928b265b9fca503175f53
0 assets/logo.png → packages/app/browser/assets/logo.png
View file
Open in desktop
File renamed without changes
Binary file added packages/web/assets/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion scripts/webpack.client.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module.exports = (options = {}) => merge(
background_color: "#303030",
icons: [
{
src: path.resolve("../../../assets/logo.png"),
src: path.resolve("./assets/logo.png"),
sizes: [96, 128, 192, 256, 384]
}
]
Expand Down
0