github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

Browse source
This commit is contained in:
Henry Oswald 2014-08-19 15:35:38 +01:00
commit b5341e8a25
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor/left-menu.jade
View file

@ -127,7 +127,7 @@ aside#left-menu.full-size(
option(value=size) #{size}px
.form-controls
label(for="pdfViewer")
label(for="pdfViewer") #{translate("pdf_viewer")}
select(
name="pdfViewer"
ng-model="settings.pdfViewer"

17
services/web/package.json
View file

@ -1,6 +1,11 @@
{
"name": "web-sharelatex",
"version": "0.0.1",
"version": "0.1.0",
"description": "The HTTP front end for ShareLaTeX",
"repository": {
"type": "git",
"url": "https://github.com/sharelatex/web-sharelatex.git"
},
"directories": {
"public": "./public"
},
@ -22,11 +27,11 @@
"socket.io": "0.9.16",
"mimelib": "0.2.14",
"bufferedstream": "1.6.0",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#master",
"translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#master",
"soa-req-id": "git+https://github.com/sharelatex/soa-req-id.git#master",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0",
"logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.0.0",
"metrics-sharelatex": "git+https://github.com/sharelatex/metrics-sharelatex.git#v1.0.0",
"translations-sharelatex": "git+https://github.com/sharelatex/translations-sharelatex.git#v0.1.0",
"soa-req-id": "git+https://github.com/sharelatex/soa-req-id.git#v1.0.0",
"fairy": "0.0.2",
"node-uuid": "1.4.1",
"nodemailer": "0.6.1",