Alasdair Smith
|
4c81cd874f
|
Remove unnecessary method - handled by FreeTrialModalController
|
2017-12-13 11:09:46 +00:00 |
|
Alasdair Smith
|
f5c914ed6c
|
When upgrading track changes on V2, redirect to V1 trial page
|
2017-12-11 18:03:09 +00:00 |
|
James Allen
|
9fe1f36df4
|
Merge pull request #200 from sharelatex/ja-add-recaptcha
Add recaptcha to share and register endpoint
|
2017-12-11 13:31:47 +00:00 |
|
James Allen
|
de484e1a08
|
Remove unused reference to e
|
2017-12-11 13:31:16 +00:00 |
|
James Allen
|
f465a962d4
|
Put recaptcha css in a base location
|
2017-12-11 13:01:21 +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
|
74cc13a888
|
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex-internal
|
2017-12-11 11:55:17 +00:00 |
|
Henry Oswald
|
314dcd1901
|
added null checks to mandrill
|
2017-12-11 11:48:31 +00:00 |
|
Henry Oswald
|
3e2c997e8b
|
added stubs for nodemailer into unit tests
|
2017-12-11 11:40:25 +00:00 |
|
Henry Oswald
|
d92405c3b5
|
Merge pull request #198 from sharelatex/ho-mandrill
add mandrill as email option
|
2017-12-11 11:15:40 +00:00 |
|
Henry Oswald
|
bd7e2d956d
|
add mandrill as email option
|
2017-12-11 11:05:04 +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 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 |
|
Paulo Reis
|
2ccf0750f2
|
Run SVGs through SVGOMG.
|
2017-12-06 11:21:02 +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
|
cf9861bace
|
Merge pull request #186 from sharelatex/as-show-v1-warnings
Show warnings on project list for some V1 data
|
2017-12-05 13:16:58 +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 |
|
Paulo Reis
|
aab43f5916
|
Smaller line-height in the file tree.
|
2017-12-05 10:07:45 +00:00 |
|
Hayden Faulds
|
1ddd199b7d
|
Merge pull request #104 from sharelatex/hof-version-entity-creation
Version entity creation in SL -> OL history
|
2017-12-04 11:35:54 +00:00 |
|
James Allen
|
eb5ba2814e
|
Merge branch 'master' into as-import-v1
|
2017-12-04 10:41:07 +00:00 |
|
James Allen
|
9e0f5424d0
|
Merge branch 'master' into as-show-v1-warnings
|
2017-12-04 10:40:28 +00:00 |
|
James Allen
|
5da7d170a1
|
Merge branch 'master' into pr-ol-beta-editor-styling
|
2017-12-04 10:17:00 +00:00 |
|
James Allen
|
52b414498c
|
Merge branch 'master' into as-show-v1-warnings
|
2017-12-04 10:03:38 +00:00 |
|
James Allen
|
0602fed6e5
|
Merge branch 'master' into as-import-v1
|
2017-12-04 10:02:21 +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
|
1405b645f3
|
fix acceptance tests after rebase
|
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
|
77eac423c7
|
add tpds project structure acceptance tests
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
9736513f59
|
fix ProjectEntityHandler.replaceFile
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
3466db0aae
|
add acceptance tests
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
61a1336ec6
|
pass userId into ProjectEntiyHandler.copyFileFromExistingProjectWithProject
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
feee582368
|
pass user_id into EditorController.replaceFile
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
08891c7a7f
|
pass userId into ProjectEntityHandler.replaceFile
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
088ce33cbc
|
version ProjectEntityHandler.copyFileFromExistingProjectWithProject
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
60ee78704a
|
return url from FileStoreHandler.copyFile
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
4ec0d07aae
|
remove unused ProjectEntityHandler.copyFileFromExistingProject
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
90e3b71c1c
|
version replacing files
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
980e43e478
|
pass user_id into EditorController.addDoc
|
2017-12-04 09:42:09 +00:00 |
|
Hayden Faulds
|
e4ca3bc5ad
|
pass user_id into EditorController.addDocWithoutLock
|
2017-12-04 09:42:09 +00:00 |
|