Commit graph

6837 commits

Author SHA1 Message Date
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
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
Hayden Faulds
50686090c8 push doc pathname logic into DocController 2018-04-12 16:16:44 +01: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
Alasdair Smith
c87cb1d361 Basic styles for editor toolbar 2018-04-12 13:46:19 +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
Alasdair Smith
bcb025e706 Merge pull request #481 from sharelatex/as-fix-tests
Add defensive check for req.query, fixing tests
2018-04-10 10:41:09 +01:00
Alasdair Smith
35cc5bf19c Add defensive check for req.query, fixing tests 2018-04-10 10:38:40 +01:00
Alasdair Smith
f0bcb332bb Merge pull request #479 from sharelatex/as-rt-feature-flag
Switch to runtime flag for RT instead of feature flag
2018-04-10 10:24:58 +01:00
Brian Gough
882b555433 create new file on replace 2018-04-09 12:05:08 +01:00
Brian Gough
1a68f768d4 rename internal method uploadFile to _uploadFile 2018-04-09 12:05:08 +01:00
Brian Gough
38dab1c82c clean up whitespace 2018-04-09 12:05:08 +01:00
Brian Gough
e29c657c8a preserve original callback signature for addFile 2018-04-09 12:05:08 +01:00
Brian Gough
b551f3c7e9 fix indentation 2018-04-09 12:05:08 +01:00
Brian Gough
61b192fb2c fix indentation of comment 2018-04-09 12:05:07 +01:00
Brian Gough
fe8897d757 refactor addFile and addFileWithOutUpdatingHistory 2018-04-09 12:05:07 +01:00
Brian Gough
d949338ed4 separate out file uploads 2018-04-09 12:05:07 +01:00
Brian Gough
cdfa2de68d add comment about upsert and locking 2018-04-09 12:05:07 +01:00