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
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
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
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
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
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
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
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
James Allen
0a00dea610
Merge pull request #469 from sharelatex/ja-feature-flag-rename
...
Split references feature flag into mendeley and referencesSearch
2018-04-03 11:53:58 +01:00
Alasdair Smith
b417516c7f
Add CSS to karma
...
This is useful for rich text tests which rely on DOM structure/CSS layout of
rich text
2018-04-03 11:12:17 +01:00
Alasdair Smith
672305c9c2
Merge pull request #453 from sharelatex/ja-update-import-modal
...
Tone down and reword v1 import modal
2018-04-03 10:24:39 +01:00
Alasdair Smith
3668912102
Merge pull request #470 from sharelatex/pr-fix-v2-resizers-width
...
Configure splitter width in v2
2018-04-03 10:24:31 +01:00
Alasdair Smith
fa7e64adbb
Wrap RT styles in .rich-text to prevent clashes
2018-04-03 09:47:35 +01:00
Alasdair Smith
4511cfa92f
Add RT styles
2018-04-03 09:47:35 +01:00
Paulo Reis
bd3c12cf90
Make sure the layout lib knows about the resizer width in v2.
2018-03-29 10:35:17 +01:00
James Allen
f80962b74b
Split references feature flag into mendeley and referencesSearch
2018-03-28 17:11:41 +01:00
Paulo Jorge Reis
bc46044f85
Merge pull request #466 from sharelatex/pr-v2-system-messages
...
v2 system messages
2018-03-28 15:17:26 +01:00
Paulo Jorge Reis
efee5a88bf
Merge pull request #434 from sharelatex/jel-preview-unsupported
...
Remove expressions used for debugging
2018-03-28 15:16:49 +01:00
Paulo Jorge Reis
ab6abb2a4c
Merge pull request #465 from sharelatex/revert-464-as-hotfix-rt
...
Bring back editor toolbar
2018-03-28 15:15:44 +01:00
Paulo Reis
8d2db3b31e
V2 styling for system messages.
2018-03-28 14:46:07 +01:00
Paulo Reis
525deabc2b
Move language subdomain message into the projects list too; make the close buttons similar.
2018-03-28 13:54:02 +01:00