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
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
0114ed362f
Swap out email templates based on brand prefix
2017-12-21 10:26:14 +00:00
Alasdair Smith
1fc527ff48
Fix OL auto-linking styles
2017-12-21 09:59:19 +00:00
Shane Kilkelly
c76bdaa824
Change an erroneous logger.error to logger.log
2017-12-21 09:54:35 +00:00
Alasdair Smith
9657108146
Add OL themed email templates
2017-12-20 17:53:45 +00:00
Alasdair Smith
7f7916f5b1
Clean up whitespace
2017-12-20 17:52:49 +00:00
Hayden Faulds
8663dba37c
remove unused EditorController.getListOfDocPaths
2017-12-20 15:14:56 +00:00
Alasdair Smith
b1f656826e
Remove unnecessary & incorrect title
2017-12-20 14:10:05 +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
731cd57250
Make intermediate argument signature clearer
2017-12-19 13:59:06 +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
8311101ec0
Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps
2017-12-19 13:58:47 +00:00
James Allen
50b12e88a2
Add HistoryV2Manager alongside existing HistoryManager
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
56ec81bb3e
Change 'oveleafPlanCode' to 'v1PlanCode'
2017-12-18 13:52:37 +00:00
Alasdair Smith
4a9c9c563a
Merge branch 'master' into as-autocompile-rollout-60
2017-12-13 14:44:31 +00:00
Alasdair Smith
60b00d2b94
Merge pull request #196 from sharelatex/as-clean-up-failed-import
...
Add unsupported file type error
2017-12-13 10:31:02 +00:00
Alasdair Smith
5c62ac4f8a
Change error type for consistency
2017-12-12 12:59:10 +00:00
James Allen
53dc8cddfc
Refactor captcha into middleware and angular service
2017-12-11 12:58:55 +00:00
James Allen
83086e4a79
Add recaptch to share endpoint
2017-12-11 11:57:59 +00:00
Henry Oswald
314dcd1901
added null checks to mandrill
2017-12-11 11:48:31 +00:00
Alasdair Smith
89bdb6eff9
Increase autocompile rollout to 60%
2017-12-11 11:45:53 +00:00
Henry Oswald
bd7e2d956d
add mandrill as email option
2017-12-11 11:05:04 +00:00
Shane Kilkelly
eefe56d0f7
Fix up error handling in SubscriptionUpdater
2017-12-08 11:37:24 +00:00
Alasdair Smith
6198491e5f
Add unsupported file type error
2017-12-08 11:31:44 +00:00
Shane Kilkelly
a675e774b8
Fix how the getOverleafPlanCode integration is done
2017-12-08 11:29:11 +00:00
Shane Kilkelly
3adbc52089
Add a method to explicitely refresh subscription feature
2017-12-07 16:28:07 +00:00
Shane Kilkelly
4e86a03b46
Fix a problem with the order of module initialization
2017-12-07 15:06:32 +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
Shane Kilkelly
a1f1c25294
Merge branch 'master' into sk-account-sync
2017-12-07 11:51:41 +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
ab6830976e
Merge branch 'master' into as-show-v1-warnings
2017-12-05 11:13:25 +00:00
Shane Kilkelly
e7d8848a6a
Include possible overleaf subscription in feature setting
2017-12-04 15:12:26 +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
9736513f59
fix ProjectEntityHandler.replaceFile
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
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
62f88402e8
fix DocumentUpdaterHandler casing
2017-12-04 09:42:09 +00:00
Hayden Faulds
acda4c2295
remove inline requires from ProjectEntityHandler
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
Alasdair Smith
7d58427485
Show warnings on project list for some V1 data
2017-11-30 16:59:13 +00:00
Alasdair Smith
dba0ab003c
Merge pull request #166 from sharelatex/as-autocompile-rollout-20
...
Increase autocompile rollout to 20%
2017-11-30 10:08:55 +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
Shane Kilkelly
cc9986cefd
Remove the obsolete update-billing-details page
2017-11-28 11:52:14 +00:00
Shane Kilkelly
22c163c60a
Move the recurly-billing-details link up to main subscription page
2017-11-28 11:40:48 +00:00
Alasdair Smith
bbaacb4db4
Increase autocompile rollout to 20%
2017-11-28 10:52:46 +00:00
Alasdair Smith
c5f459a531
Merge pull request #159 from sharelatex/as-show-v1-owner
...
Show v1 project owner's name in project list
2017-11-28 09:51:04 +00:00
Alasdair Smith
099305d909
Show v1 project owner name
2017-11-23 17:10:42 +00:00
Shane Kilkelly
c121653dc4
Add error-handling to attempt to get user subscription
2017-11-23 16:22:57 +00:00
Shane Kilkelly
caa65dddc1
Send user to hosted recurly billing-details page.
...
And remove our update-billing-details form, the APIs for which will be
deprecated soon.
2017-11-23 16:16:13 +00:00
Brian Gough
bb2d1321d4
Merge pull request #91 from sharelatex/bg-add-project-history-flag
...
route history requests based on project
2017-11-23 15:36:45 +00:00
Brian Gough
98fe352a8c
use a separate flag for reading from history
...
the overleaf.history object controls writing to the project history
service, we need a separate flag to determine whether to read from it or
from track changes.
2017-11-23 15:14:33 +00:00
Alasdair Smith
e1fa196de5
Merge pull request #153 from sharelatex/as-remove-old-onboarding
...
Remove unused onboarding
2017-11-23 10:28:50 +00:00
Alasdair Smith
e61b82c452
Remove unused link sharing rollout, but keep onboarding popup
2017-11-22 17:07:50 +00:00
