Commit graph

1697 commits

Author SHA1 Message Date
Brian Gough
b30dd22f0e return a 400 status code for invalid moves
was previously returning 500
2018-01-26 17:00:55 +00:00
Brian Gough
4bac80dfd5 Merge branch 'bg-prevent-duplicate-filenames' of github.com:sharelatex/web-sharelatex-internal into bg-prevent-duplicate-filenames 2018-01-25 17:09:43 +00:00
Brian Gough
aa5d880902 don't update project structure if file not created 2018-01-25 17:09:32 +00:00
Brian Gough
302bbe8893 rename checkElementName to checkValidElementName 2018-01-25 17:09:31 +00:00
Brian Gough
7ba17a8875 only need to load rootFolder from project 2018-01-25 17:09:31 +00:00
Brian Gough
9d74a0a2f0 handle errors normally in addFolder modal 2018-01-25 17:09:31 +00:00
Brian Gough
e183956d16 check for duplicates on move 2018-01-25 17:09:31 +00:00
Brian Gough
e421192b5c check for duplicates on rename 2018-01-25 17:09:31 +00:00
Brian Gough
6e0881f85d check for duplicates in addFolder 2018-01-25 17:09:31 +00:00
Brian Gough
82a9fc97d9 check for duplicates in putElement 2018-01-25 17:09:30 +00:00
Brian Gough
ec93cedf27 rename checkElementName to checkValidElementName 2018-01-24 10:07:42 +00:00
Brian Gough
2a0b0d3a87 only need to load rootFolder from project 2018-01-24 10:07:42 +00:00
Brian Gough
9b8ce78eb9 handle errors normally in addFolder modal 2018-01-24 10:07:42 +00:00
Brian Gough
4f5a5cb677 check for duplicates on move 2018-01-24 10:07:42 +00:00
Brian Gough
3881eb1d78 check for duplicates on rename 2018-01-24 10:07:42 +00:00
Brian Gough
c6cca79737 check for duplicates in addFolder 2018-01-24 10:07:42 +00:00
Brian Gough
b537747ccd check for duplicates in putElement 2018-01-24 10:07:42 +00:00
James Allen
d7706f642b Show the creator as the owner if no owner present 2018-01-23 13:47:48 +00:00
James Allen
d5c5d9c204 Merge pull request #268 from sharelatex/as-unsupported-project-error
Adds UnsupportedBrandError & UnsupportedExportRecordsError types
2018-01-23 10:30:33 +00:00
James Allen
d79d6b4ede Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents 2018-01-22 16:25:11 +00:00
Alasdair Smith
89af8ba123 More renaming 2018-01-18 16:41:26 +00:00
Alasdair Smith
f8a068ee9e Rename to be more explicit about the error 2018-01-18 15:42:32 +00:00
Alasdair Smith
649ca86a75 Add publisher exports error type 2018-01-18 15:41:14 +00:00
Alasdair Smith
f234e84c95 Export error 2018-01-18 12:09:33 +00:00
Alasdair Smith
950ef0cebb Add unsupported project error 2018-01-17 17:50:09 +00:00
James Allen
6d04eeaa03 Merge pull request #256 from sharelatex/ja-display-v2-history-users
Inject v2 user details into project-history updates and diffs
2018-01-15 14:21:14 +00:00
James Allen
67061154fe Merge pull request #237 from sharelatex/hof-editor-controller-locking
Project Locking: EditorController
2018-01-15 14:21:03 +00:00
Timothée Alby
62bc3f947f Merge pull request #257 from sharelatex/ta-remove-proxy-headers
Remove headers when proxying analytics request
2018-01-12 15:48:18 +02:00
Hayden Faulds
e781779c24 use LockManager.runWithLock in EditorController 2018-01-12 10:53:36 +00:00
Hayden Faulds
76c7dff33a rename EditorController.replaceFile -> replaceFileWithoutLock 2018-01-12 10:06:18 +00:00
Hayden Faulds
a8818a4149 add locking for EditorController.renameEntity 2018-01-12 10:06:18 +00:00
Tim Alby
7a9d52b0f6 remove all headers when proxying the analytics request 2018-01-11 19:04:41 +02:00
Alberto Fernández-Capel
4dce9e36c3 Merge pull request #251 from sharelatex/fix-group-member-subscription-page
Fix subscription page for members of a group
2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel
feaa7c6d3f Merge pull request #242 from sharelatex/rename-entity-bugfix
Ensure the dirname is not affected when we rename an entity
2018-01-11 14:41:21 +00:00
James Allen
8edef2f94d Fix next -> callback 2018-01-11 14:11:44 +00:00
James Allen
17a5dfa5a5 Inject v2 user details into project-history updates and diffs 2018-01-11 11:32:16 +00:00
James Allen
945ef25ef5 Merge pull request #244 from sharelatex/hof-lock-file-upload
Project Locking: ProjectUploadController
2018-01-11 08:42:36 +00:00
Tim Alby
c1febbeb7c run analytics proxy on public API router 2018-01-11 09:34:24 +02:00
Timothée Alby
bdef7b707d Merge pull request #241 from sharelatex/ta-analytics-proxy
Proxy requests to analytics service
2018-01-10 15:39:28 +02:00
Timothée Alby
859e03cd4f Merge pull request #234 from sharelatex/hof-remove-unused-method
remove unused EditorController.getListOfDocPaths
2018-01-10 15:26:02 +02:00
Tim Alby
08b74c95f5 proxy requests to analytics service 2018-01-10 15:03:14 +02:00
Alberto Fernández Capel
a81b56556f Add test for SubscriptionViewModelBuilder 2018-01-09 17:00:56 +00:00
Hayden Faulds
817840840a use LockManger.runWithLock 2018-01-09 16:37:34 +00:00
Alberto Fernández Capel
6d007bfe74 DRY logic to get subscription from Recurly
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736 Fix subscription page for members of a group
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.

SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
2018-01-05 16:28:49 +00:00
James Allen
bbfcff30fb Enable project history for new projects if enabled in settings 2018-01-03 16:55:33 +00:00
James Allen
0f1b0be231 Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging
Change an erroneous `logger.error` to `logger.log`; Fixes #227
2018-01-03 11:30:46 +00:00
James Allen
ada76e820a Merge pull request #238 from sharelatex/as-ol-emails
v2 themed emails
2018-01-03 11:30:28 +00:00
Alasdair Smith
b2d92ea482 Increase autocompile rollout to 100% 2018-01-03 10:01:35 +00:00
Hayden Faulds
fe62db05a0 lock project when uploading a file 2018-01-02 12:43:41 +00:00