Commit graph

2225 commits

Author SHA1 Message Date
James Allen
de94e33b5d Merge pull request #397 from sharelatex/ja-fix-project-upload
Add files to project in series to avoid lock contention
2018-03-13 13:33:16 +00:00
James Allen
371caa41ca Merge pull request #378 from sharelatex/hof-history-resync
resync project history endpoint
2018-03-13 13:33:08 +00:00
James Allen
d9b301023a Use eachSeries rather than a job array 2018-03-13 13:30:06 +00:00
James Allen
33904fe7be Add files to project in series to avoid lock contention 2018-03-13 13:21:48 +00:00
Alasdair Smith
41d8a50a8e Merge pull request #385 from sharelatex/sk-add-recent-team-activity-proxy
Add a proxy to `AnalyticsRouter` for `/recentTeamActivity`
2018-03-13 11:20:55 +00:00
Hayden Faulds
a7945e9b96 extra logging for DocumentUpdaterHandler 2018-03-09 11:16:35 +00:00
Hayden Faulds
75f5fbcdbf refactor DocumentUpdaterHandler 2018-03-09 11:15:18 +00:00
Hayden Faulds
af9cc28419 additional logging 2018-03-09 11:11:06 +00:00
Hayden Faulds
792e8bbd7e fix route name 2018-03-09 11:11:06 +00:00
Hayden Faulds
9ab0ded8f1 update project history resync url 2018-03-09 11:11:06 +00:00
Hayden Faulds
5b2e7d981a resyncProject -> resyncProjectHistory 2018-03-09 11:11:06 +00:00
Hayden Faulds
926f91dd3b wrap project resync in project structure lock 2018-03-09 11:11:06 +00:00
Hayden Faulds
4d2f0218af add resync project history endpoint 2018-03-09 11:11:06 +00:00
Tim Alby
d5109d22d2 record both project-created and project-imported events 2018-03-06 18:26:25 -05:00
Tim Alby
4b291fab2a Record new project event 2018-03-06 18:13:24 -05:00
Shane Kilkelly
f6e66b9346 Add a proxy to AnalyticsRouter for /recentTeamActivity 2018-03-06 16:21:28 +00:00
Shane Kilkelly
84fff5e9b7 Merge pull request #379 from sharelatex/sk-geolocate-user-sessions
Geolocate user, and pass country-code to editing-sessions
2018-03-06 11:33:50 +00:00
Shane Kilkelly
7d81c42b9c More explicit handling of empty-string country-code 2018-03-06 10:32:28 +00:00
Shane Kilkelly
97d181c3f9 Reverse an un-necessary change 2018-03-05 13:24:54 +00:00
Shane Kilkelly
b3f47ea44a Remove obsolete segmentation payload in editing-session request 2018-03-05 11:15:41 +00:00
Shane Kilkelly
f625b22ec5 Move the geolocation out of login, to the editingSession action 2018-03-05 10:46:51 +00:00
James Allen
d92c3e8b55 Logging and error message tweaks 2018-03-05 10:37:53 +00:00
James Allen
d4025908b7 Add in enabledLinkedFileTypes setting 2018-03-05 10:37:53 +00:00
James Allen
a99f55891f Use external proxy 2018-03-05 10:37:53 +00:00
James Allen
6848e97a82 Hook up refresh button to backend 2018-03-05 10:37:00 +00:00
James Allen
9733223840 Show linked file status in front end 2018-03-05 10:37:00 +00:00
James Allen
01d84bd983 Handle error cases when downloading URL 2018-03-05 10:37:00 +00:00
James Allen
b1dda931f4 Add in modal for creating linked URL file 2018-03-05 10:37:00 +00:00
James Allen
85f25b810c First pass at URL based linked files 2018-03-05 10:37:00 +00:00
Brian Gough
3bbd49c7eb Merge pull request #377 from sharelatex/bg-add-project-structure-version-number
add project structure version number
2018-03-05 08:41:14 +00:00
Shane Kilkelly
bbe15a3ff3 Remove stray log 2018-03-02 12:06:18 +00:00
Shane Kilkelly
1629f68d5e Geolocate user on login, and pass country-code to editing-sessions 2018-03-02 12:02:45 +00:00
Brian Gough
14713aa393 added comment about project version 2018-03-01 15:15:09 +00:00
Brian Gough
12911598de send current project structure version to docupdater 2018-03-01 12:32:08 +00:00
Brian Gough
98f50919e8 comment about file replacements 2018-03-01 12:32:08 +00:00
Brian Gough
67d784a74a increment project version on every structure change 2018-03-01 12:32:08 +00:00
Brian Gough
470d67a3aa avoid exception in error message when project undefined 2018-03-01 12:31:51 +00:00
Brian Gough
cb35da3cf7 increment a project version number on every change in folder structure 2018-03-01 12:17:33 +00:00
James Allen
becb76d69b Don't allow backslashes in file names 2018-03-01 11:42:44 +00:00
James Allen
0371aaaf05 Merge pull request #352 from sharelatex/hof-lock-metrics
Improve lock metrics
2018-02-21 13:52:08 +00:00
Hayden Faulds
adc90b68e7 use gauge not inc 2018-02-21 13:25:25 +00:00
Shane Kilkelly
b19f7a6ea3 Re-add template id fields to Project model.
The original pull request (/web-sharelatex-internal/pull/324) had to be reverted
because of a failing test. This just re-adds the fields
2018-02-20 14:19:54 +00:00
Hayden Faulds
584cd71173 fix exceeded lock timeout logging
we were logging this after failing to get the lock, this stops that
2018-02-20 14:03:45 +00:00
Hayden Faulds
d924dbd1ed improve metrics 2018-02-20 13:58:09 +00:00
Shane Kilkelly
05faf06f59 Revert "Add template id fields to project model" 2018-02-20 13:51:30 +00:00
Shane Kilkelly
57d50a68f8 Merge pull request #324 from sharelatex/hob-add-template-fields-to-project
Add template id fields to project model
2018-02-20 13:40:11 +00:00
Hayden Faulds
d750f942de fix: stop pass milis not seconds into setTimeout 2018-02-20 10:26:24 +00:00
Hayden Faulds
e50c3837bc add extra metrics around locking 2018-02-19 12:15:02 +00:00
Hayden Faulds
dd582d1b2e type-check ProjectGetter.getProject and getProjectWithoutLock arguments 2018-02-16 14:44:21 +00:00
Hayden Faulds
693c8e8c60 move where lock keys are defined 2018-02-16 14:44:21 +00:00
Hayden Faulds
a05d172052 clean up variable names in ProjectGetter.getProject 2018-02-16 14:44:21 +00:00
Hayden Faulds
66cd5cd24b use ProjectGetter.getProject in other ProjectGetter methods 2018-02-16 14:44:21 +00:00
Hayden Faulds
95b82a3c9d use ProjectGetter in ProjectLocator.findElementByPath 2018-02-16 14:44:21 +00:00
Hayden Faulds
cbc6fb232d add mongo transaction lock when getting or updating projects 2018-02-16 14:44:21 +00:00
Brian Gough
fc1e94b14a Merge pull request #343 from sharelatex/bg-block-javascript-property-names
block javascript property names being used as file names
2018-02-16 14:07:12 +00:00
Hayden Faulds
eb198cd8c3 make getSafePathname a method in CompileController rather than Project 2018-02-16 13:10:48 +00:00
Brian Gough
8a10e98b56 block javascript property names being used as file names 2018-02-16 10:31:47 +00:00
Hayden Faulds
304a6bc332 use ProjectGetter rather than Project directly 2018-02-16 08:55:09 +00:00
Hayden Faulds
aa89b7e70b Merge pull request #327 from sharelatex/hof-entity-refactoring
Refactor ProjectEntityHandler
2018-02-14 13:28:41 +00:00
hugh-obrien
5d1c2a9cf6 rename v1 template fields on project module 2018-02-14 11:07:38 +00:00
Hayden Faulds
9ed2d7f971 fix excess argument pass into UpdateMerger.p.processFile 2018-02-13 14:39:38 +00:00
Hayden Faulds
e9b218fe5f allow the updating of doc lines for deleted docs 2018-02-13 14:39:38 +00:00
Shane Kilkelly
9c83ff5353 Merge pull request #316 from sharelatex/afc-fix-typo-in-path
Update analytics manager to use new path
2018-02-13 09:39:09 +00:00
Shane Kilkelly
9a7b3c2b23 Merge pull request #320 from sharelatex/sk-retry-analytics-requests
Add a retry to analytics requests
2018-02-13 09:38:56 +00:00
Hayden Faulds
2f9f26eae2 fix logging 2018-02-12 16:05:34 +00:00
Shane Kilkelly
0efc8136cb Use requestretry node package 2018-02-12 15:16:21 +00:00
Hayden Faulds
458bbc7cfd refactor ProjectEntityHandler
- moves project locking into ProjectEntityHandler
- splits ProjectEntityHandler into ProjectEntityHandler,
  ProjectEntityUpdateHandler and ProjectEntityMongoUpdateHandler
- adds upsertDoc/upsertFile and upsertDocWithPath/upsertFileWithPath to
  EditorController and ProjectEntiyUpdateHandler
2018-02-12 13:33:59 +00:00
Brian Gough
3c9eb07848 Merge pull request #322 from sharelatex/bg-validate-filename-length-client
validate filename length client
2018-02-12 10:08:03 +00:00
hugh-obrien
ea736390a1 add template id fields to project model 2018-02-11 16:58:45 +00:00
Brian Gough
2c2b6e5f36 fix filename length check 2018-02-09 15:05:52 +00:00
Alasdair Smith
7ff0f40477 Merge pull request #266 from sharelatex/as-cm
CodeMirror
2018-02-09 11:23:11 +00:00
Alasdair Smith
bfda9c595b Hide rich text behind feature flag 2018-02-09 10:42:11 +00:00
Henry Oswald
ba1e45d12c Merge pull request #317 from sharelatex/ho-nice-recaptcha-message
improved recaptcha error message
2018-02-09 10:26:33 +00:00
Shane Kilkelly
8117061674 Make the retry-on-fail behaviour optional 2018-02-08 13:04:47 +00:00
Shane Kilkelly
1c15e0966c Add a retry to analytics requests 2018-02-08 11:42:48 +00:00
Henry Oswald
696e9d27d6 send invalid_email error type down when sharing project 2018-02-08 10:35:18 +00:00
Brian Gough
14ef9a2c49 comment out broken length check 2018-02-08 10:08:22 +00:00
Brian Gough
cba4a391a9 Merge pull request #314 from sharelatex/bg-validate-filenames-server
server side check for valid filenames
2018-02-08 09:16:31 +00:00
Brian Gough
9c36b38e2c make SafePath.coffee shareable between client and server code 2018-02-07 15:43:56 +00:00
Brian Gough
57549d32be remove unused path module 2018-02-07 15:28:26 +00:00
Brian Gough
2a5ed0caf5 use Errors.InvalidName instead of plain Error object 2018-02-07 15:22:00 +00:00
Brian Gough
c6f74d24f1 add missing SafePath.clean function 2018-02-07 15:21:04 +00:00
Henry Oswald
df9b866bee remove 'script blocker' from recaptcha message 2018-02-07 14:24:15 +00:00
Henry Oswald
b387ca3b2a change wording on recaptcha to JLM's option 2018-02-07 14:19:33 +00:00
Henry Oswald
a52aed9070 improved recaptcha error message
- works on register and share project
- decided not to go down i18n for register, would be scope creep on async form
2018-02-07 14:15:13 +00:00
Shane Kilkelly
a06c4003f9 Merge pull request #312 from sharelatex/sk-add-from-v2-flag-to-analytics
Add a `fromV2` flag to Analytics events, when coming from V2 instance
2018-02-07 09:48:11 +00:00
Alberto Fernández Capel
413e81f29a Update analytics manager to use new path
It fixes a typo in the path.

Related to https://github.com/sharelatex/analytics-sharelatex/pull/43
2018-02-07 09:39:00 +00:00
Brian Gough
7f727d434e server side check for valid filenames 2018-02-06 10:44:58 +00:00
Alasdair Smith
e3811d33e9 Merge pull request #302 from sharelatex/msw-history-failure
Bail out if history API request fails
2018-02-06 10:35:57 +00:00
Shane Kilkelly
6d8b50efc4 Add a fromV2 flag to Analytics events, when coming from V2 instance 2018-02-06 10:35:15 +00:00
James Allen
c89bbd7588 Merge pull request #296 from sharelatex/ja-show-v2-message
Show v2 message if awareOfV2 flag set
2018-02-02 11:04:06 +00:00
Michael Walker
e886217b85 Bail out if history API request fails 2018-02-02 10:12:54 +00:00
Hayden Faulds
9955fd570c Merge pull request #299 from sharelatex/hof-tpds-locking
Project Locking: TPDS locking
2018-02-02 09:20:07 +00:00
Shane Kilkelly
6e2af763ec Revert "Bail out if history API request fails" 2018-02-01 12:49:25 +00:00
Shane Kilkelly
19c97cb15b Merge pull request #289 from sharelatex/afc-track-edit-sessions
Send editing session heartbeat to the analytics service
2018-02-01 12:31:38 +00:00
Shane Kilkelly
ba31df3dae Merge pull request #295 from sharelatex/msw-history-failure
Bail out if history API request fails
2018-02-01 12:31:30 +00:00
Hayden Faulds
a9be50ebcd stream request to file outside of project lock 2018-02-01 10:44:53 +00:00
Hayden Faulds
e214347ede add locking around project structure updates in TPDS 2018-02-01 10:44:52 +00:00
Brian Gough
c19acd82a4 Merge pull request #291 from sharelatex/bg-fix-project-get-exclusion
fix typo in project getter exclusions
2018-01-31 11:51:01 +00:00
Brian Gough
5e52ade1ff Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames
prevent duplicate filenames
2018-01-31 11:50:45 +00:00
James Allen
9a9938083c Merge pull request #267 from sharelatex/as-remove-rollout
Remove rollout logic for auto compile and link sharing
2018-01-31 10:27:09 +00:00
Brian Gough
c652abf739 replace error message with Error object 2018-01-31 10:26:31 +00:00
James Allen
97c0577d8e Merge pull request #293 from sharelatex/ja-allow-sl-login-to-v2
Show different message if user comes from SL instead of OL v2
2018-01-31 10:23:22 +00:00
James Allen
de7f13aea6 Use hasFeature for message about returning to v1/SL 2018-01-31 10:05:56 +00:00
Brian Gough
b30dd22f0e return a 400 status code for invalid moves
was previously returning 500
2018-01-26 17:00:55 +00:00
James Allen
12e55fb487 Show v2 message if awareOfV2 flag set 2018-01-26 16:44:14 +00:00
Michael Walker
9303969d7b Bail out if history API request fails 2018-01-26 15:16:37 +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
James Allen
3ed805a65a Show different message if user comes from SL rather than OL v2 2018-01-24 16:56:51 +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
Brian Gough
77adb60a8a fix typo in project getter exclusions 2018-01-24 10:06:53 +00:00
Alberto Fernández Capel
4ca71fb379 Do not track anonymous sessions
And DRY the controller a bit.
2018-01-23 15:51:10 +00:00
James Allen
d7706f642b Show the creator as the owner if no owner present 2018-01-23 13:47:48 +00:00
Alberto Fernández Capel
8714909a9a Build query string with style 2018-01-23 12:47:51 +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
Alberto Fernández Capel
0bef5531bb Rename editSession -> editingSession 2018-01-23 10:29:11 +00:00
James Allen
d79d6b4ede Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents 2018-01-22 16:25:11 +00:00
Alberto Fernández Capel
868e32c1bc Send edit sessions heartbeat to the analytics service 2018-01-22 15:10:52 +00:00
Alberto Fernández Capel
1a1ccc9f46 Remove trailing whitespace 2018-01-22 15:00:56 +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
Alasdair Smith
4d29c4d769 Remove unused link sharing onboarding now at 100% 2018-01-17 15:18:40 +00:00
Alasdair Smith
45de9bb5dc Remove unused autocompile rollout logic now that at 100% 2018-01-17 15:17:55 +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