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 |
|