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
James Allen
9e525702c1
Merge branch 'master' into ja-restore-files
2018-04-16 16:14: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
Henry Oswald
086f080ee4
add !isFormValid(simpleCCForm)
back in, was used during debugging
2018-04-16 11:01:14 +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
a1be0e95b4
remove the dead validation
2018-04-16 10:10:25 +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
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
8d2c3ca6a1
Remove undefined controller
2018-04-12 11:53:31 -05:00
Jessica Lawshe
f9a56f7b37
Remove unknown experiments
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
60a28f7173
Fix hashed file path for rich text
2018-04-11 12:00:36 +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
35cc5bf19c
Add defensive check for req.query, fixing tests
2018-04-10 10:38:40 +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
Brian Gough
baec4eb195
move uploads outside the lock
2018-04-09 12:05:07 +01:00
Alasdair Smith
eb05be6eb3
Remove unused feature flag
2018-04-06 17:00:27 +01:00
Alasdair Smith
c3b2af4345
Instead of checking RT flag at compile time, adjust at run time
2018-04-06 16:59:06 +01:00
Alasdair Smith
d433a88158
Pass rich text flag if query string is set
2018-04-06 16:58:12 +01:00
James Allen
2c0bd94fa7
Use mkdirp when restoring a file if the folder doesn't exist
2018-04-06 15:20:51 +01:00
James Allen
1e8439a2c6
Fix restore of docs from old deleted docs
2018-04-06 10:30:13 +01:00
James Allen
b4fa47d664
Add unit tests for RestoreManager
2018-04-06 10:30:13 +01:00
James Allen
415be6b4e0
Open file after restoring
2018-04-06 10:30:13 +01:00
James Allen
0a1c543841
Hook up front end to restore documents
2018-04-06 10:30:13 +01:00