Commit Graph

6250 Commits

Author SHA1 Message Date
Paulo Reis a501e7dc85 History file tree styles. 2018-05-21 15:13:16 +01:00
Paulo Reis a716f9ccd3 Integrate history file tree in the UI. 2018-05-21 15:12:47 +01:00
Paulo Reis 6701b4413b Add history file tree components. 2018-05-21 15:12:03 +01:00
Paulo Reis 2a52eab8d6 Proxy history filetree requests through web. 2018-05-21 15:10:46 +01:00
Paulo Reis 9f6dc12658 Add custom styling; add code to handle point-in-time selection. 2018-05-01 17:27:51 +01:00
Paulo Reis 6e6bc91130 Style the history entries components. 2018-04-27 15:59:28 +01:00
Paulo Reis 8249f4e17e Wrap copies of existing history UI elements in components. 2018-04-27 11:22:20 +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
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 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
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 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 9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +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
Alasdair Smith 3af10733cc Replace hard coded rich text hashed file path with registration system 2018-04-16 14:14:49 +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
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
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