github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
18874 commits 3 branches 7 tags 199 MiB
Commit graph

1220 commits

Author SHA1 Message Date
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
feee992b43 Reverse an un-necessary re-arrangement of tests 2018-03-06 10:13:39 +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
cae09028ff Fix tests 2018-03-05 10:37:53 +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
1629f68d5e Geolocate user on login, and pass country-code to editing-sessions 2018-03-02 12:02:45 +00:00
Brian Gough
af494dedf2 check project structure version in unit tests 2018-03-01 12:32:09 +00:00
Brian Gough
67d784a74a increment project version on every structure change 2018-03-01 12:32:08 +00:00
James Allen
becb76d69b Don't allow backslashes in file names 2018-03-01 11:42:44 +00:00
Alasdair Smith
f11f208772 Revert "Revert "Upgrade to mocha 5.0.1"" 2018-02-27 15:03:21 +00:00
Alasdair Smith
315587605c Revert "Upgrade to mocha 5.0.1" 2018-02-27 12:25:42 +00:00
Alasdair Smith
46ac74a160 Fix incorrectly scoped variable 2018-02-26 14:26:04 +00:00
Alasdair Smith
2247e4d465 Fix scoping issues where stubs were defined in wrong describe blocks 2018-02-26 14:21:14 +00:00
Alasdair Smith
136fd84810 Fix module stub in incorrect scope 2018-02-26 13:52:58 +00:00
Alasdair Smith
be6fa346d5 Fix bug where incorrect variable was used 2018-02-26 13:37:17 +00:00
Alasdair Smith
ec7237b7e8 Fix callback stub being defined in wrong scope 2018-02-26 12:33:48 +00:00
Alasdair Smith
2529ed756a Fix callback being defined in wrong describe block 2018-02-26 12:27:54 +00:00
Alasdair Smith
fd8c61985f Fix bug where stubs were attached to undefined variables 2018-02-26 12:19:56 +00:00
Alasdair Smith
5d017beac5 Fix stub incorrectly overriding top level beforeEach 2018-02-26 11:46:06 +00:00
Alasdair Smith
cfc9dbdbb3 Fix bad scoping of user agent 2018-02-26 11:34:08 +00:00
Alasdair Smith
34b53726d4 Fix error not being defined in wrong describe block 2018-02-26 11:19:52 +00:00
Alasdair Smith
192eb8b44f Fix error not being defined in wrong describe block 2018-02-26 11:16:04 +00:00
Alasdair Smith
d79e226a20 Fix callback defined in wrong describe block scope 2018-02-26 10:58:20 +00:00
Hayden Faulds
adc90b68e7 use gauge not inc 2018-02-21 13:25:25 +00:00
Hayden Faulds
d924dbd1ed improve metrics 2018-02-20 13:58:09 +00:00
Hayden Faulds
e50c3837bc add extra metrics around locking 2018-02-19 12:15:02 +00:00
Hayden Faulds
693c8e8c60 move where lock keys are defined 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
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
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
ecea3dd1be add an extra test for invalid element names 2018-02-09 15:13:58 +00:00
Brian Gough
2c2b6e5f36 fix filename length check 2018-02-09 15:05:52 +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
c6f74d24f1 add missing SafePath.clean function 2018-02-07 15:21:04 +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
Michael Walker
5987d6d79c Add unit tests for failing history API 2018-02-02 10:12:57 +00:00
Michael Walker
217940d76f Fix failing unit tests 2018-02-02 10:12:57 +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
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
Hayden Faulds
a9be50ebcd stream request to file outside of project lock 2018-02-01 10:44:53 +00:00
Hayden Faulds
9496480a29 test project lock is taken 2018-02-01 10:44:53 +00:00
Hayden Faulds
22737e8bd6 group together tests 2018-02-01 10:44:53 +00:00
Hayden Faulds
a6666bee62 group together private in UpdateMerger tests 2018-02-01 10:44:53 +00:00
Hayden Faulds
44d4a1dbe2 replace mocks with stubs in UpdateMerger tests 2018-02-01 10:44:52 +00:00
Hayden Faulds
e214347ede add locking around project structure updates in TPDS 2018-02-01 10:44:52 +00:00
Brian Gough
b7b40faefe fix unit test 2018-01-31 13:28:11 +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
ea9976994a update unit tests for duplicate checks 2018-01-25 17:09:31 +00:00
Brian Gough
77adb60a8a fix typo in project getter exclusions 2018-01-24 10:06:53 +00:00
Alberto Fernández Capel
8dbb89c09e Add test for the updateEditingSession endpoint 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
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
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
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
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
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
Alberto Fernández Capel
0200fd66cd Mock LimitationsManager as well 2018-01-10 10:26:16 +00: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
James Allen
bbfcff30fb Enable project history for new projects if enabled in settings 2018-01-03 16:55:33 +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
Hayden Faulds
fe62db05a0 lock project when uploading a file 2018-01-02 12:43:41 +00:00
Alberto Fernández Capel
bf324b5e04 Ensure the dirname is not affected when we rename an entity 
Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93
 2017-12-22 14:24:00 +00:00
Alasdair Smith
562534034f Stub out brandPrefix for email tests 2017-12-21 17:18:10 +00:00
Hayden Faulds
8663dba37c remove unused EditorController.getListOfDocPaths 2017-12-20 15:14:56 +00:00
Shane Kilkelly
18ae27fd66 Merge branch 'sk-account-sync' 2017-12-20 14:02:45 +00:00
James Allen
339b7ec14f Merge branch 'ja-allow-importing-without-history' 2017-12-19 15:06:17 +00:00
James Allen
1d89a535a1 Merge pull request #208 from sharelatex/ja-front-end-history 
Add in web front end that supports v2 history; Fixes #168
 2017-12-19 15:00:34 +00:00
James Allen
5463b608ad Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history 2017-12-19 13:59:06 +00:00
James Allen
ffa2e231fd Fix up tests 2017-12-19 13:58:47 +00:00
Hayden Faulds
ac36de9629 make ProjectEntityHandler._clean* argument signatures consistent 2017-12-18 15:15:36 +00:00
Hayden Faulds
938caed4f7 set userId when deleting entities via the tpds 2017-12-18 15:15:36 +00:00
Hayden Faulds
ca15fdb6eb pass userId to EditorHttpController.deleteEntity 2017-12-18 15:15:36 +00:00
Hayden Faulds
5f6686ed3b pass userId to ProjectEntityHandler.deleteEntity 2017-12-18 15:15:36 +00:00
Hayden Faulds
2ac74b9adc pass userId into _clean methods in ProjectEntityHandler 2017-12-18 15:15:36 +00:00
Hayden Faulds
475e84b039 version entity deletions in ProjectEntityHandler 2017-12-18 15:15:36 +00:00
Hayden Faulds
81c061c6a7 acceptance test moving entities 2017-12-18 15:15:36 +00:00
Hayden Faulds
e5e75a8ccb update DocumentUpdaterHandler.updateProjectStructure to support entity deletions 2017-12-18 15:15:36 +00:00
Shane Kilkelly
6fe937bcad Finish unit tests for SubscriptionUpdater 2017-12-13 10:57:56 +00:00
Henry Oswald
3e2c997e8b added stubs for nodemailer into unit tests 2017-12-11 11:40:25 +00:00
Shane Kilkelly
a1f1c25294 Merge branch 'master' into sk-account-sync 2017-12-07 11:51:41 +00:00
Shane Kilkelly
44c289d8dd Fix unit tests for SubscriptionUpdater 2017-12-04 15:34:46 +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
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
Hayden Faulds
7d63939f79 pass owner_id to ProjectEntityHandler.addDoc from ProjectDuplicator 2017-12-04 09:42:09 +00:00
Hayden Faulds
300f76bc5c pass user_id into ProjectEntityHandler.addDoc / addDocWithProject 2017-12-04 09:42:09 +00:00
Hayden Faulds
bfd22899a0 fix DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Hayden Faulds
ef68c6a531 avoid N+1 lookups in DocumentUpdaterHandler 2017-12-04 09:42:09 +00:00
Hayden Faulds
953dba0ede pass userId into Editorcontroller.addFile / addFileWithoutLock 2017-12-04 09:42:09 +00:00
Hayden Faulds
42a1deaaca pass userId into ProjectEntityHandler.addFile 2017-12-04 09:42:09 +00:00
Hayden Faulds
c1481d596f call DocumentUpdaterHandle.updateProjectStructure from ProjectEntityHandler.addDoc and addFile 
pass in user_id as null
 2017-12-04 09:42:09 +00:00
Hayden Faulds
6e84c635cf return url from FileStoreHandler.uploadFileFromDisk 2017-12-04 09:42:09 +00:00
Hayden Faulds
0178f78249 handle file additions in DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Shane Kilkelly
c203a8d80a Merge branch 'sk-use-recurly-hosted-details-page' 2017-11-29 09:45:54 +00:00
Nate Stemen
2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -05:00
James Allen
62de9d8946 Move test/UnitTests -> unit/test 2017-11-27 17:10:22 +00:00