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
James Allen
d6605610f5
Fix HistoryV2Manager front end tests
2018-04-16 16:31:49 +01:00
James Allen
d1b68ddf7c
Fix RestoreManager unit tests
2018-04-16 16:27:24 +01:00
James Allen
f7a3231b42
Merge pull request #391 from sharelatex/ja-restore-files
...
Restore deletes files from their contents in project-history/OL history
2018-04-16 16:14:50 +01:00
James Allen
9e525702c1
Merge branch 'master' into ja-restore-files
2018-04-16 16:14:31 +01:00
Shane Kilkelly
1b3abe3b9a
Upgrade docker images for Jenkins
2018-04-16 15:13:27 +01:00
Henry Oswald
45f51c9a27
change country select to proper angular setup so pre population works
...
it may have been broken from an angular upgrade or similar.
2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352
capitalise month and year on payment page
2018-04-16 15:11:31 +01:00
Shane Kilkelly
488a8f1493
Upgrade docker image for jenkins
2018-04-16 15:10:40 +01:00
Alasdair Smith
39342b0219
Merge pull request #484 from sharelatex/as-register-hashed-files
...
Add system for registering hashed asset files
2018-04-16 15:05:25 +01:00
Shane Kilkelly
dd7386bb54
Upgrade NodeJS to version 8
2018-04-16 14:44:59 +01:00
Alasdair Smith
3af10733cc
Replace hard coded rich text hashed file path with registration system
2018-04-16 14:14:49 +01:00
Shane Kilkelly
0bff9d8c01
Upgrade to Node 8
2018-04-16 13:52:28 +01:00
Henry Oswald
a45dc69e4d
Merge pull request #495 from sharelatex/ho-recurly-v4
...
change to plans[currencyCode]['symbol'] from price.currency.symbol
2018-04-16 12:31:42 +01:00
Henry Oswald
39e41681a0
change to plans[currencyCode]['symbol'] from price.currency.symbol
...
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
2018-04-16 12:19:55 +01:00
Henry Oswald
f041b0a1e9
Merge pull request #491 from sharelatex/ho-recurly-v4
...
Recurly.js v4
2018-04-16 11:52:24 +01:00
Alasdair Smith
671a2c9767
Make content wrapper have main role
2018-04-16 11:43:24 +01:00
Alasdair Smith
3482724679
Make ide body have main role
2018-04-16 11:33:53 +01:00
Henry Oswald
086f080ee4
add !isFormValid(simpleCCForm)
back in, was used during debugging
2018-04-16 11:01:14 +01:00