Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #49 from ONLYOFFICE/master

Browse source 
Back merge to develop
This commit is contained in:
Alexey Golubev 2018-01-25 18:09:03 +03:00 committed by GitHub
parent c0ca28d905 c2d4d22640
commit d3f81b3dfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/index.html.deploy
View file

@ -282,7 +282,7 @@
}; };
</script> </script>
<inline src="../../common/main/resources/img/header/buttons.svg" /> <inline src="resources/img/header/buttons.svg" />
<div id="viewport"></div> <div id="viewport"></div>
<script data-main="app" src="../../../vendor/requirejs/require.js"></script> <script data-main="app" src="../../../vendor/requirejs/require.js"></script>

2
apps/presentationeditor/main/index.html.deploy
View file

@ -282,7 +282,7 @@
}; };
</script> </script>
<inline src="../../common/main/resources/img/header/buttons.svg" /> <inline src="resources/img/header/buttons.svg" />
<div id="viewport"></div> <div id="viewport"></div>

2
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -281,7 +281,7 @@
}; };
</script> </script>
<inline src="../../common/main/resources/img/header/buttons.svg" /> <inline src="resources/img/header/buttons.svg" />
<div id="viewport"></div> <div id="viewport"></div>

4
build/documenteditor.json
View file

@ -171,11 +171,11 @@
"expand": true, "expand": true,
"cwd": "../apps/common/main/resources/img", "cwd": "../apps/common/main/resources/img",
"src": "**/*.svg", "src": "**/*.svg",
"dest": "../deploy/web-apps/apps/common/main/resources/img" "dest": "../deploy/web-apps/apps/documenteditor/main/resources/img"
} }
], ],
"clean": [ "clean": [
"../deploy/web-apps/apps/common" "../deploy/web-apps/apps/documenteditor/main/resources/img/**/*.svg"
] ]
} }
}, },

4
build/presentationeditor.json
View file

@ -171,11 +171,11 @@
"expand": true, "expand": true,
"cwd": "../apps/common/main/resources/img", "cwd": "../apps/common/main/resources/img",
"src": "**/*.svg", "src": "**/*.svg",
"dest": "../deploy/web-apps/apps/common/main/resources/img" "dest": "../deploy/web-apps/apps/presentationeditor/main/resources/img"
} }
], ],
"clean": [ "clean": [
"../deploy/web-apps/apps/common" "../deploy/web-apps/apps/presentationeditor/main/resources/img/**/*.svg"
] ]
}, },
"reporter": { "reporter": {

4
build/spreadsheeteditor.json
View file

@ -185,11 +185,11 @@
"expand": true, "expand": true,
"cwd": "../apps/common/main/resources/img", "cwd": "../apps/common/main/resources/img",
"src": "**/*.svg", "src": "**/*.svg",
"dest": "../deploy/web-apps/apps/common/main/resources/img" "dest": "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img"
} }
], ],
"clean": [ "clean": [
"../deploy/web-apps/apps/common" "../deploy/web-apps/apps/spreadsheeteditor/main/resources/img/**/*.svg"
] ]
} }
}, },