Alasdair Smith
|
dc2ddf7e09
|
Check for OL free trial instead of host as it may be fragile indicator
|
2017-12-18 16:53:58 +00:00 |
|
Alasdair Smith
|
da2c0b3fea
|
Switch redirectToOLFreeTrialUrl to calculate trial url
Sending unnecessary query params to OL seems like a footgun, so switch to
compromise that is more explicit but doesn't send unnecessary query params
|
2017-12-14 17:09:11 +00:00 |
|
Alasdair Smith
|
7322522323
|
Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl
|
2017-12-14 17:05:12 +00:00 |
|
Alasdair Smith
|
e7992e65e4
|
Merge branch 'master' into as-v2-upgrade-redirect
|
2017-12-13 14:45:51 +00:00 |
|
Alasdair Smith
|
60b00d2b94
|
Merge pull request #196 from sharelatex/as-clean-up-failed-import
Add unsupported file type error
|
2017-12-13 10:31:02 +00:00 |
|
Alasdair Smith
|
5c62ac4f8a
|
Change error type for consistency
|
2017-12-12 12:59:10 +00:00 |
|
Alasdair Smith
|
4126e9bd31
|
Merge branch 'master' into as-v1-dash-link
|
2017-12-12 09:55:48 +00:00 |
|
Alasdair Smith
|
f5c914ed6c
|
When upgrading track changes on V2, redirect to V1 trial page
|
2017-12-11 18:03:09 +00:00 |
|
Paulo Reis
|
edfc259c53
|
Fix missing border on SL.
|
2017-12-11 16:55:50 +00:00 |
|
Paulo Reis
|
59e675797e
|
Merge branch 'master' into pr-style-v2-resizers
|
2017-12-11 15:55:50 +00:00 |
|
Paulo Reis
|
0652fc62a0
|
Configure resizer cursors for v2.
|
2017-12-11 15:33:00 +00:00 |
|
James Allen
|
53dc8cddfc
|
Refactor captcha into middleware and angular service
|
2017-12-11 12:58:55 +00:00 |
|
James Allen
|
69499847e4
|
Refactor front end code into validateCaptcha service
|
2017-12-11 12:32:43 +00:00 |
|
James Allen
|
0b03bbc7c3
|
Don't inject recaptcha element if recaptcha is not enabled
|
2017-12-11 12:04:33 +00:00 |
|
James Allen
|
83086e4a79
|
Add recaptch to share endpoint
|
2017-12-11 11:57:59 +00:00 |
|
Henry Oswald
|
314dcd1901
|
added null checks to mandrill
|
2017-12-11 11:48:31 +00:00 |
|
Henry Oswald
|
bd7e2d956d
|
add mandrill as email option
|
2017-12-11 11:05:04 +00:00 |
|
Alasdair Smith
|
6198491e5f
|
Add unsupported file type error
|
2017-12-08 11:31:44 +00:00 |
|
Nate Stemen
|
d224e09b5e
|
Merge pull request #192 from sharelatex/ns-remove-labels
removing labels service
|
2017-12-07 09:38:00 -05:00 |
|
Paulo Reis
|
7c5a7880b0
|
Merge branch 'master' into pr-style-v2-resizers
|
2017-12-06 15:49:18 +00:00 |
|
Alasdair Smith
|
48cd048e5c
|
Merge branch 'master' into as-v1-dash-link
|
2017-12-06 15:12:29 +00:00 |
|
Paulo Jorge Reis
|
37a571283a
|
Merge pull request #194 from sharelatex/as-autocompile-rollout-40
Increase autocompile rollout to 40%
|
2017-12-06 11:22:40 +00:00 |
|
Paulo Jorge Reis
|
a5f99ccce3
|
Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling
V2 editor styling
|
2017-12-06 11:22:28 +00:00 |
|
Alasdair Smith
|
fa89b91ac6
|
Increase rollout to 40%
|
2017-12-06 09:58:38 +00:00 |
|
Nate Stemen
|
9bf5d1e14c
|
removing labels service
|
2017-12-05 13:57:36 -05:00 |
|
Alasdair Smith
|
2d66fd7280
|
Merge pull request #169 from sharelatex/as-import-v1
V1 Import Modal
|
2017-12-05 13:19:49 +00:00 |
|
Alasdair Smith
|
ab6830976e
|
Merge branch 'master' into as-show-v1-warnings
|
2017-12-05 11:13:25 +00:00 |
|
Alasdair Smith
|
9f4aef76ea
|
Merge branch 'master' into as-import-v1
|
2017-12-05 10:43:07 +00:00 |
|
Paulo Reis
|
5dffdf3efc
|
Add a small a11y fix.
|
2017-12-05 10:23:28 +00:00 |
|
Paulo Reis
|
a88538c3fd
|
Make the back to projects button closer to current SL.
|
2017-12-05 10:20:25 +00:00 |
|
Alasdair Smith
|
c84c00d56d
|
Change query param for nicer api on OL side
|
2017-12-04 15:19:03 +00:00 |
|
Paulo Reis
|
0bad7d8549
|
Adjustments to synctex controls.
|
2017-12-04 15:12:13 +00:00 |
|
Alasdair Smith
|
77dc7adf1f
|
Revert "Move to sidebar template"
This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.
|
2017-12-04 14:53:18 +00:00 |
|
Paulo Reis
|
9fda8e62fa
|
Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers
|
2017-12-04 13:48:52 +00:00 |
|
Paulo Reis
|
fd852004fe
|
Refactor synctex controls z-index handling.
|
2017-12-04 12:25:40 +00:00 |
|
Alasdair Smith
|
ab78cea48d
|
Move to sidebar template
|
2017-12-04 12:24:21 +00:00 |
|
Alasdair Smith
|
1fd518ec58
|
Add query param to mark as explicitly using V1 dash
|
2017-12-04 12:22:27 +00:00 |
|
Alasdair Smith
|
65b7b242d9
|
Merge remote-tracking branch 'origin' into as-v1-dash-link
|
2017-12-04 12:02:41 +00:00 |
|
Alasdair Smith
|
a25464d925
|
Add check for OL host
|
2017-12-04 11:34:00 +00:00 |
|
Alasdair Smith
|
f595009911
|
Switch to existing v1 dash flag
|
2017-12-04 11:23:09 +00:00 |
|
James Allen
|
52b414498c
|
Merge branch 'master' into as-show-v1-warnings
|
2017-12-04 10:03:38 +00:00 |
|
James Allen
|
0b0fd576eb
|
Merge branch 'master' into as-v1-dash-link
|
2017-12-04 10:02:42 +00:00 |
|
James Allen
|
0602fed6e5
|
Merge branch 'master' into as-import-v1
|
2017-12-04 10:02:21 +00:00 |
|
James Allen
|
158b0d56cf
|
Merge branch 'master' into pr-style-v2-resizers
|
2017-12-04 10:01:45 +00:00 |
|
James Allen
|
f21870aac2
|
Merge branch 'master' into pr-ol-beta-editor-styling
|
2017-12-04 10:01:27 +00:00 |
|
Hayden Faulds
|
4094801f18
|
pass object to DocumentUpdater.updateProjectStructure instead of separate arrays
|
2017-12-04 09:42:10 +00:00 |
|
Hayden Faulds
|
19643f4bb5
|
pass user_id into editorController.addDoc in ThirdPartyDataStore/UpdateMerger
|
2017-12-04 09:42:10 +00:00 |
|
Hayden Faulds
|
497c6facd5
|
fix ProjectEntityHandler.replaceFile
|
2017-12-04 09:42:10 +00:00 |
|
Hayden Faulds
|
9736513f59
|
fix ProjectEntityHandler.replaceFile
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
61a1336ec6
|
pass userId into ProjectEntiyHandler.copyFileFromExistingProjectWithProject
|
2017-12-04 09:42:09 +00:00 |
|