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
Alasdair Smith
152c816b5c
Add documentation and tests of EventEmitter implementation
2018-04-23 11:01:19 +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
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
Alasdair Smith
d524249fc8
Include snake_case named tests
2018-04-17 15:03:52 +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
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
Alasdair Smith
3af10733cc
Replace hard coded rich text hashed file path with registration system
2018-04-16 14:14:49 +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
Henry Oswald
086f080ee4
add !isFormValid(simpleCCForm) back in, was used during debugging
2018-04-16 11:01:14 +01:00
Henry Oswald
985d05a297
remove .has-error class, not used
2018-04-16 10:56:03 +01:00
Henry Oswald
c3eeefdc5b
only use recurly.js from our public libs folder
2018-04-16 10:52:33 +01:00
Henry Oswald
7940b60144
make a seperate external error class which is used on entire payment form
2018-04-16 10:35:12 +01:00
Henry Oswald
06fb31533f
add highlight for bad card/cvv/mmyy number in.
2018-04-16 10:26:39 +01:00
Henry Oswald
903a9db936
upgrade static recurly lib to 4.8.5 for plans page
2018-04-16 10:10:43 +01:00
Henry Oswald
a1be0e95b4
remove the dead validation
2018-04-16 10:10:25 +01:00
Alasdair Smith
4a12754d90
Mark visible toggle switch as hidden from screen readers
2018-04-16 10:07:46 +01:00
Alasdair Smith
0f70d526d9
Remove unused toggleRichText method
2018-04-16 09:42:26 +01:00
Alasdair Smith
a8c6ac1367
Style toggle switch
2018-04-16 09:36:32 +01:00
Alasdair Smith
591f341f5f
Add switch-toggle directive
2018-04-16 09:36:10 +01:00
Henry Oswald
b1ee05de3e
better styling, close to being deployable
2018-04-13 17:32:20 +01:00
Henry Oswald
e19a118ef4
poorly styled but almost viable
2018-04-13 17:26:05 +01:00
Henry Oswald
c050791905
change ng to use show/hide
...
ng-if doesn't render html until evaulated to true, need the form
to be there at time of recurly.configure
2018-04-13 16:57:33 +01:00
Henry Oswald
ccef0760ae
remove the form control, it just breaks the iframe styling
2018-04-13 16:51:55 +01:00
Henry Oswald
ae3858bcd0
can subscribe using new form. terrible styling
2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3
wip form loads as ifram
2018-04-13 16:01:41 +01:00
Paulo Jorge Reis
9e40555c89
Merge pull request #487 from sharelatex/pr-fix-v2-togglers
...
Control the visibility of the custom toggler
2018-04-13 13:46:55 +01:00
Hayden Faulds
7755a7cc1f
add overleaf to projections for project structure updates
2018-04-13 13:45:07 +01:00
Hayden Faulds
9ef40902ca
send projectHistoryId with resync requests
2018-04-13 13:45:03 +01:00
Hayden Faulds
3006d018d9
send projectHistoryId with project structure updates
2018-04-13 13:45:03 +01:00
Hayden Faulds
e5f3c472e3
return projectHistoryId in DocumentController.getDoc
2018-04-13 13:45:02 +01:00
Jessica Lawshe
b8d010bf51
Merge pull request #488 from sharelatex/jel-remove-undefined-controller
...
Remove undefined controller
2018-04-12 13:55:19 -05:00
Jessica Lawshe
18c6802b84
Revert "Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp""
...
This reverts commit 5c3f391041303456aeb800522c0fdcfe900625ac.
2018-04-12 13:53:26 -05:00
Jessica Lawshe
5290c29ce1
Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp"
...
This reverts commit c5919be6d2e880ac4d3f5820c38211b1c88812ff, reversing
changes made to 3c8772cf020738c767b6f7a956bd002b47988932.
2018-04-12 13:25:42 -05:00
