github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
22485 commits 3 branches 7 tags 199 MiB
Commit graph

22485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christopher Hoskin
95c8e29e66 Merge pull request #1322 from sharelatex/csh-issue-1309-node-6.15.1 
Bump node to 6.15.1

GitOrigin-RevId: 7ae516d1231cd79baf0ff29768768a53b1f5f080
 2019-01-02 16:03:52 +00:00
Henry Oswald
a4eda59189 add getDic 2019-01-02 15:23:40 +00:00
Christopher Hoskin
f3b764601f Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-02 12:42:24 +00:00
Christopher Hoskin
594b403bd3 Move metrics init to start of app.coffee 2019-01-02 09:55:31 +00:00
Christopher Hoskin
3b6eba33ba Remove Metrics.inc "startup" from app.coffee 2019-01-02 09:53:53 +00:00
Christopher Hoskin
aab5a1af6a Merge branch 'master' into csh-ho-docker 2019-01-02 09:51:35 +00:00
Christopher Hoskin
6214256568 Bump logger to v1.5.8 2019-01-02 09:47:38 +00:00
Christopher Hoskin
9e7f84cd0d Bump node version to 6.15.1 2018-12-27 08:23:18 +00:00
Nate Stemen
adc4c3bdb8 use public rc files 2018-12-21 13:55:29 -05:00
Ersun Warncke
c313b255bb Merge pull request #1309 from sharelatex/sk-git-bridge-acceptance-tests-2 
Add more acceptance tests for git-bridge api

GitOrigin-RevId: 404c857fb73686d7073cd314dd4ee050a5b2e3bc
 2018-12-21 12:23:02 +00:00
Ersun Warncke
7bf860cde5 Merge pull request #1312 from sharelatex/ja-add-rate-limits 
Add rate limits to adding emails and changing password

GitOrigin-RevId: e73c17985cc9c74d60f8856b3b47b28fecd0d489
 2018-12-21 12:22:56 +00:00
Henry Oswald
6c3a28d963 Merge pull request #8 from sharelatex/ho-log-levels 
add process.env['LOG_LEVEL'] varable to let us change the logging level
 2018-12-21 11:04:27 +00:00
Nate Stemen
9f65be5771 Prettier: convert individual decaffeinated files to Prettier format 2018-12-20 14:14:14 -05:00
Nate Stemen
ee4d9766fd Decaffeinate: convert individual files to js 2018-12-20 14:14:12 -05:00
Nate Stemen
c47ec473e6 Rename individual coffee files to js files 2018-12-20 14:14:11 -05:00
Nate Stemen
c82e899c2a Prettier: convert test/acceptance decaffeinated files to Prettier format 2018-12-20 14:14:11 -05:00
Nate Stemen
08c43ea4bf Rename test/acceptance/coffee to test/acceptance/js 2018-12-20 14:14:09 -05:00
decaffeinate
ca55bac90f decaffeinate: Run post-processing cleanups on DeletingAMessageTests.coffee and 7 other files 2018-12-20 14:14:08 -05:00
decaffeinate
41eed6df4e decaffeinate: Convert DeletingAMessageTests.coffee and 7 other files to JS 2018-12-20 14:14:05 -05:00
decaffeinate
c34b906598 decaffeinate: Rename DeletingAMessageTests.coffee and 7 other files from .coffee to .js 2018-12-20 14:14:02 -05:00
Nate Stemen
03093dc283 Prettier: convert app/js decaffeinated files to Prettier format 2018-12-20 14:13:59 -05:00
Nate Stemen
976d1675e6 Rename app/coffee dir to app/js 2018-12-20 14:13:56 -05:00
decaffeinate
45f865ebbb decaffeinate: Run post-processing cleanups on MessageFormatter.coffee and 6 other files 2018-12-20 14:13:56 -05:00
decaffeinate
0a12cee071 decaffeinate: Convert MessageFormatter.coffee and 6 other files to JS 2018-12-20 14:13:53 -05:00
decaffeinate
36a9f79d11 decaffeinate: Rename MessageFormatter.coffee and 6 other files from .coffee to .js 2018-12-20 14:13:50 -05:00
Nate Stemen
d54fc7efc6 Decaffeinate: add eslint and prettier rc files 2018-12-20 14:13:48 -05:00
Nate Stemen
273b81b806 forgot prettier-eslint-cli package. thanks @40thieves 2018-12-20 14:13:07 -05:00
Nate Stemen
b751f70436 bump settings-sharelatex version to latest release 2018-12-20 13:56:51 -05:00
Brian Gough
cf12ec1154 use the aws sdk to copy files in S3PersistorManager 
to work around problems with knox
 2018-12-20 16:11:18 +00:00
James Allen
2cf7fefaeb Merge pull request #1307 from sharelatex/pr-git-bridge-modal 
Redo the git bridge trial modal.

GitOrigin-RevId: 9ddb61a84a018459fa040ab1514dc35085c93d4e
 2018-12-20 15:48:58 +00:00
James Allen
5a7f72c9f9 Merge pull request #1302 from sharelatex/jel-cms-iframe-attr 
Allow style attribute on iframes

GitOrigin-RevId: f6a88f544eab665fecc00b8c89e87d489f39b88d
 2018-12-20 15:48:52 +00:00
Alasdair Smith
7112e65dc5 Merge pull request #1303 from sharelatex/project-import-refactor 
Project import refactor

GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117
 2018-12-20 12:06:15 +00:00
Shane Kilkelly
0c1e754736 Merge pull request #1289 from sharelatex/sk-labeled-versions-in-git-bridge-v2 
Add support for labeled-versions in git-bridge api.

GitOrigin-RevId: 94858627034ffd000d49b92ba5c7ab45e7294840
 2018-12-20 10:55:59 +00:00
Shane Kilkelly
97e357f772 Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status 
Remove deprecated display of v1 team data in v2

GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d
 2018-12-20 10:55:52 +00:00
nate stemen
efadf662f2 Merge pull request #2 from sharelatex/afc-js-settings 
Allow .js setting files
 2018-12-19 15:18:08 -05:00
Simon Detheridge
531f5fb6ee Merge pull request #1280 from sharelatex/spd-open-in-overleaf-conversions 
open-in-overleaf: Add support for partner and client_media_id parameters
GitOrigin-RevId: a4c18a03affa62a1ef2cfb0c595766724ba8969b
 2018-12-19 16:02:47 +00:00
Simon Detheridge
d2465f8d6a Merge pull request #1297 from sharelatex/ja-rate-limit-v2-login 
Add rate limit to v2 login end point

GitOrigin-RevId: 81b14387e4a6381f4c0eae17e43af84b2af7fea5
 2018-12-19 16:02:38 +00:00
Simon Detheridge
b0b87a7b6e Merge pull request #1299 from sharelatex/spd-redirect-bypass-header 
Add support for header to allow bypass of redirects

GitOrigin-RevId: 2d40c51c23809c19f0a053093e8ee0719a0190e2
 2018-12-19 16:02:29 +00:00
Chrystal Maria Griffiths
366dbbd54f Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff 
Make comments cancel when you cancel them on firefox

GitOrigin-RevId: 68b8be1ac34f0510103f3b9a8e7b617988fb55de
 2018-12-19 10:38:35 +00:00
Chrystal Maria Griffiths
2b556df43c Merge pull request #1294 from sharelatex/mm-exportstatus-fields 
F1000 export fixes

GitOrigin-RevId: 8f9a149cded8f204949750fc2788bc02223b84af
 2018-12-19 10:38:29 +00:00
Ersun Warncke
bfeefe8406 Merge pull request #1282 from sharelatex/ew-collabratec-support-imported-projects 
Support importing projects with collabratec users to v2

GitOrigin-RevId: 2dd3781dde158cdab6bf95138311224a032ab8a4
 2018-12-18 15:14:37 +00:00
Douglas Lovell
740dce07a9 Merge remote-tracking branch 'origin/hb-publisher-management' 
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
 2018-12-18 13:42:56 +00:00
Paulo Jorge Reis
e139abb110 Merge pull request #1273 from sharelatex/ja-password-reset-v1 
Handle v1-only users in v2 password reset flow

GitOrigin-RevId: 38ce8e9aebd3330b980e73640a23661d8015d4f3
 2018-12-18 11:48:53 +00:00
Paulo Jorge Reis
4563ce864c Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes 
History compare labels fixes

GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3
 2018-12-18 11:48:49 +00:00
Christopher Hoskin
3e5bb147ec Merge pull request #107 from sharelatex/csh-issue-1309-node-6.15 
Bump node to 6.15
 2018-12-18 11:16:25 +00:00
Christopher Hoskin
19bd4791dd Add npm-shrinkwrap.json 2018-12-18 11:03:06 +00:00
Alasdair Smith
1160620afc Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page 
Revert "Import status page"

GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd
 2018-12-17 15:45:36 +00:00
Christopher Hoskin
b57342128d package-lock not supported until npm 5 2018-12-17 15:31:45 +00:00
Christopher Hoskin
dd3774b7a9 Bump node to 6.15.1 2018-12-17 15:29:56 +00:00
Alasdair Smith
56784c4089 Merge pull request #1240 from sharelatex/as-import-status-page 
Import status page

GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a
 2018-12-17 14:01:24 +00:00