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
Brian Gough
baec4eb195
move uploads outside the lock
2018-04-09 12:05:07 +01:00
Alasdair Smith
84c1bf0736
Merge pull request #476 from sharelatex/as-disable-source-map
...
Temporarily disable webpack source map
2018-04-09 10:16:03 +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
Alasdair Smith
315b2f24ee
Always include RT styles
2018-04-06 16:01:59 +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
11d47fcc31
Use updated project-history response format
2018-04-06 15:20:18 +01:00
Alasdair Smith
fba5e4f80a
Disable webpack source map
2018-04-06 11:28:21 +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
James Allen
075db1e5b9
Remove stray console.log
2018-04-06 10:30:13 +01:00
James Allen
3832850be6
Implement restore end point with acceptance tests
2018-04-06 10:30:13 +01:00
James Allen
beee86f1ce
First pass at restore end point
2018-04-06 10:30:13 +01:00
Paulo Reis
3fecb4f180
Forcing z-index is not needed anymore.
2018-04-05 11:54:53 +01:00
Alasdair Smith
8ff1492962
Merge pull request #471 from sharelatex/as-karma-css
...
Serve CSS when running karma tests
2018-04-05 09:27:58 +01:00
Alasdair Smith
1d6dd06b88
Serve underscore in karma tests
...
Because of the way that we're using underscore in the ES bundle (using the
global), we need to include underscore globally
2018-04-04 13:19:21 +01:00
Jessica Lawshe
e288ec47cf
Merge pull request #472 from sharelatex/pr-v2-error-pages
...
v2 error pages
2018-04-03 09:02:31 -05:00
Paulo Reis
2e898bcf13
Use LESS to conditionally hide SL assets.
2018-04-03 09:01:43 -05:00
Paulo Reis
4ee81b3b44
Undo unintended SL changes.
2018-04-03 09:01:42 -05:00
Paulo Reis
396b29f32d
Conditionally load SL assets on error pages; adjust styles for OL v2.
2018-04-03 09:01:42 -05:00
Jessica Lawshe
9ab3107cee
Merge pull request #452 from sharelatex/jel-onboard-analytics
...
v2 onboard analytics
2018-04-03 09:00:32 -05:00
Jessica Lawshe
b2c7bb9d95
Track v2 onboard events
...
Added events to the v2 banner to track on Metabase and Google
Analytics.
2018-04-03 08:48:11 -05:00
James Allen
216b17ab92
Fill in v2 link
2018-04-03 11:55:19 +01:00