Commit graph

6449 commits

Author SHA1 Message Date
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
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
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
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
Jessica Lawshe
8d2c3ca6a1 Remove undefined controller 2018-04-12 11:53:31 -05:00
Jessica Lawshe
49222f11db Merge pull request #480 from sharelatex/jel-remove-old-exp
Remove old A/B experiments
2018-04-12 11:23:41 -05:00
Paulo Reis
35d7c96d04 Control the visibility of the custom toggler when panes are hidden externally. 2018-04-12 16:41:49 +01:00
Jessica Lawshe
292e21fbb6 Merge pull request #486 from sharelatex/afc-fix-flaky-tests
Fix LinkedFiles flaky tests
2018-04-12 10:30:41 -05:00
Alberto Fernández Capel
1b8f4bff2f Ensure dump folder exists before running LinkedFiles tests
The folder is also created in another test, so it will work the second
time the tests are executed, but it fails the first time.
2018-04-12 10:29:24 -05:00
Jessica Lawshe
f9a56f7b37 Remove unknown experiments 2018-04-12 10:18:15 -05:00
Jessica Lawshe
be5f95ba69 Remove "history-discount" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
2301b83f22 Remove "teaser-dropbox-text" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
55cb5b3c70 Remove "teaser-history" experiment 2018-04-12 10:18:15 -05:00
Jessica Lawshe
5683f48d97 Fix conditional 2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928 Remove "plans-1610" experiment
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
2018-04-12 10:18:15 -05:00
Hugh O'Brien
2d3f169c49 Merge pull request #473 from sharelatex/hob-publish-modal-setup
Publish modal web setup
2018-04-12 14:01:18 +01:00
Brian Gough
4115a35773 Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking
replace files and separate uploads and locking (connects to overleaf/sharelatex#422)
2018-04-12 09:52:02 +01:00
Alasdair Smith
d3d7bde6ef Merge pull request #482 from sharelatex/as-fix-hashed-files
Fix hashed file path for rich text
2018-04-11 12:12:30 +01:00
Alasdair Smith
60a28f7173 Fix hashed file path for rich text 2018-04-11 12:00:36 +01:00
Paulo Jorge Reis
68ee3f7449 Merge pull request #474 from sharelatex/pr-fix-z-index-v2-resizers
Remove forced z-index from v2 splitters
2018-04-11 11:31:05 +01:00
hugh-obrien
6c3482f2a1 add reactDOM, fix publish menu configs 2018-04-10 15:59:39 +01:00
hugh-obrien
39d25fdff9 webpack compiling for publish menu 2018-04-10 15:59:30 +01:00
hugh-obrien
a250004036 initial publish modal setup 2018-04-10 15:59:24 +01:00