Commit graph

22485 commits

Author SHA1 Message Date
Paulo Reis
8249f4e17e Wrap copies of existing history UI elements in components. 2018-04-27 11:22:20 +01:00
Shane Kilkelly
76224cdd17 Merge pull request #5 from sharelatex/sk-upgrade-node-8
Upgrade to Node 6
2018-04-26 11:36:19 +01:00
Shane Kilkelly
d79d255c7c change to node6 2018-04-26 11:16:46 +01:00
Shane Kilkelly
cdfc6b6131 Merge pull request #30 from sharelatex/sk-upgrade-node-8
Upgrade NodeJS to version 6
2018-04-26 10:53:07 +01:00
Shane Kilkelly
0433692aec remove package-lock file 2018-04-26 10:34:05 +01:00
Shane Kilkelly
f0495d8ec6 Change to Node 6 2018-04-26 10:24:59 +01:00
Shane Kilkelly
231f8596ac Merge pull request #12 from sharelatex/sk-upgrade-node-8
Upgrade to Node 8
2018-04-26 10:10:31 +01:00
Shane Kilkelly
f5dd9783fa revert npm shrinkwrap 2018-04-26 09:55:54 +01:00
Shane Kilkelly
0f4a48b410 Change to node 6 2018-04-26 09:53:14 +01:00
James Allen
79c1370640 Update CONTRIBUTING.md 2018-04-26 09:43:07 +01:00
Hayden Faulds
2ce19b13e3 Merge pull request #29 from sharelatex/revert-28-revert-26-hof-deleted-project-history
Add projectHistoryId to updates
2018-04-26 09:15:04 +01:00
Shane Kilkelly
0fec876f99 Merge pull request #6 from sharelatex/sk-node-6
Change to Node 6
2018-04-25 10:58:43 +01:00
Alasdair Smith
4759097e49 Merge pull request #494 from sharelatex/as-main-role
Add main role
2018-04-25 09:45:17 +01:00
Shane Kilkelly
55269a322d Change to Node 6 2018-04-24 16:33:33 +01:00
Shane Kilkelly
4d9f9b42c4 Go back to Node 4 2018-04-24 16:17:44 +01:00
Shane Kilkelly
d0ebfd8d66 Merge pull request #5 from sharelatex/sk-upgrade-node-8
Upgrade to Node 8
2018-04-24 14:01:24 +01:00
Henry Oswald
c6f4df4f77 Merge pull request #498 from sharelatex/ho-recurly-v4
Payment page improvments
2018-04-24 09:01:34 +01:00
Jessica Lawshe
8bedd99d73 Merge pull request #492 from sharelatex/jel-annual-buy-text
Update button text for annual plan
2018-04-23 11:35:09 -05:00
Jessica Lawshe
2d67b1e82f Merge pull request #501 from sharelatex/jel-v1-folders
Remove v1 folder management
2018-04-23 11:34:54 -05:00
Jessica Lawshe
5d5edb7808 Button text for annual plan
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.

Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
2018-04-23 11:34:34 -05:00
Jessica Lawshe
5365760994 Don't include v1 folders in "Add to folders" list 2018-04-23 11:34:10 -05:00
Jessica Lawshe
b6554fc309 Don't show dropdown for v1 folders 2018-04-23 11:34:10 -05:00
Jessica Lawshe
820f9c7acc Merge pull request #506 from sharelatex/as-document-event-emitter
Add documentation and tests of EventEmitter implementation
2018-04-23 11:33:40 -05:00
Hayden Faulds
af92ca70a1 coerce projectHistoryId to integer after reading from Redis 2018-04-23 15:19:06 +01:00
Shane Kilkelly
7bab021389 Upgrade to Node 8 2018-04-23 13:55:36 +01:00
Hayden Faulds
1b63141e49 Revert "Revert "Add projectHistoryId to updates"" 2018-04-23 12:08:04 +01:00
Hayden Faulds
ee2b8e9a60 Merge pull request #28 from sharelatex/revert-26-hof-deleted-project-history
Revert "Add projectHistoryId to updates"
2018-04-23 12:02:38 +01:00
Hayden Faulds
3cc20d6311 Revert "Add projectHistoryId to updates" 2018-04-23 11:41:29 +01:00
Hayden Faulds
9629d0a11e Merge pull request #26 from sharelatex/hof-deleted-project-history
Add projectHistoryId to updates
2018-04-23 11:01:53 +01:00
Alasdair Smith
152c816b5c Add documentation and tests of EventEmitter implementation 2018-04-23 11:01:19 +01:00
Alberto Fernández-Capel
49ce3e6917 Merge pull request #28 from sharelatex/afc-setup-travisci
Setup travis ci
2018-04-23 10:58:39 +01:00
Alberto Fernández-Capel
71256b58d2 Merge pull request #31 from sharelatex/afc-fix-travisci-build
Do not specify the node version in .travis.yml
2018-04-23 10:51:34 +01:00
Alberto Fernández-Capel
5679302462 Merge pull request #27 from sharelatex/afc-fix-jenkins-build
Do not specify node version in .travis.yml
2018-04-23 10:51:13 +01:00
Alberto Fernández-Capel
5fb368d1f2 Merge pull request #505 from sharelatex/afc-travisci
Fix build in travisci
2018-04-23 10:50:59 +01:00
Alasdair Smith
ad1df3532f Merge pull request #490 from sharelatex/hof-deleted-project-history
Pass project history id with updates
2018-04-23 10:05:07 +01:00
Alasdair Smith
b0349af21d Merge pull request #493 from sharelatex/as-editor-toolbar
Add toggle switch directive to editor toolbar
2018-04-23 10:04:12 +01:00
Alasdair Smith
61648e1f19 Merge pull request #497 from sharelatex/as-naming-consistency
Include snake_case named file in frontend tests
2018-04-23 10:03:54 +01:00
John Lees-Miller
0a08a4956e Merge pull request #1 from overleaf/tidy-up
Tidy up for release
2018-04-23 09:51:32 +01:00
John Lees-Miller
138b339c0f Tidy up for release 2018-04-23 08:11:08 +01:00
Alberto Fernández Capel
8c10c737dc Setup travis ci 2018-04-19 14:37:46 +01:00
Alberto Fernández Capel
6757f70daa Do not specify the node version in .travis.yml
So travis picks it from .nvmrc
2018-04-19 14:08:41 +01:00
Alberto Fernández Capel
7d597fe59e Do not specify node version in .travis.yml
So travis picks instead the version from .nvmrc
2018-04-19 14:03:35 +01:00
Alberto Fernández Capel
4db146dd51 Do not specify node version in .travis.yml
That way, travis uses the version specified in .nvmrc
2018-04-19 12:30:31 +01:00
Alberto Fernández Capel
5d266c7f04 Show export user CSV even if the group has reached max capacity 2018-04-17 16:12:33 +01:00
Alasdair Smith
d524249fc8 Include snake_case named tests 2018-04-17 15:03:52 +01:00
James Allen
d9a7b1248a Re-order compile rate limits to do project/user check before everyone check 2018-04-17 14:43:54 +01:00
Henry Oswald
b5e6181c49 added .capitalised style 2018-04-17 11:26:02 +01:00
James Allen
37f009c3cd Remove blank test causing race condition 2018-04-17 10:00:06 +01:00
James Allen
7364f607d0 Merge pull request #499 from sharelatex/ja-restore-files-fix
Fix doc open looping bug and tests for restoring files
2018-04-17 09:34:11 +01:00
James Allen
87cc08569a Fix bad if statement sending doc open into infinite loop 2018-04-16 17:03:18 +01:00