Alberto Fernández Capel
11edfde153
Accept & revoke team invites
2018-05-31 11:54:50 +01:00
hugh-obrien
7f86ddc72c
extract v1 templates code to web
2018-05-31 11:12:31 +01:00
Shane Kilkelly
d3ae276091
Merge pull request #579 from sharelatex/sk-linked-files-from-project
...
Linked Files from Project
2018-05-31 11:08:08 +01:00
Henry Oswald
a747480425
add references host into settings
2018-05-30 15:28:59 +01:00
Alberto Fernández Capel
9aa95cb0d5
Show team invites
2018-05-30 13:06:27 +01:00
James Allen
e0e88b25fe
Make agrument checking more robust
2018-05-30 12:48:08 +01:00
Alberto Fernández Capel
7e09c0e0b1
First stab at email token invites (WIP)
2018-05-30 11:29:21 +01:00
Paulo Reis
637c492e6e
Merge branch 'master' into pr-v2-history-ui
2018-05-30 11:24:33 +01:00
James Allen
c5b553d4a6
Notify v1 by default
2018-05-29 17:31:15 +01:00
James Allen
301ae80f99
Allow refreshFeatures to notify v1 to update its features
2018-05-29 17:21:42 +01:00
Timothée Alby
6db3bf59a6
Merge pull request #586 from sharelatex/ta-refactor-user-getter
...
Canonical Way to Get Users by Email
2018-05-29 17:56:59 +02:00
Timothée Alby
eeff32bf4f
Merge pull request #584 from sharelatex/ta-remove-deprecated-method
...
Remove getUserOrCreateHoldingAccount Function
2018-05-29 17:56:42 +02:00
Alberto Fernández Capel
b52fbdbfa4
Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups
2018-05-29 15:37:04 +01:00
Jessica Lawshe
85ee5a36c8
Merge pull request #587 from sharelatex/jel-contact
...
Move contact form to modules
2018-05-29 09:20:05 -05:00
Alberto Fernández Capel
259d690f7c
Add method to update user references
2018-05-29 12:00:22 +01:00
Shane Kilkelly
dccac6302e
Use a decorateLinkedFileData function on server to add project name
2018-05-29 10:07:31 +01:00
Shane Kilkelly
92fb83e665
Use the correct linkedFileData var
2018-05-29 10:05:50 +01:00
Tim Alby
5fbe5c5537
remove UserLocator
...
Use UserGetter instead
2018-05-28 14:11:13 +02:00
Tim Alby
bbaca91e57
add UserGetter#getUserByMainEmail
...
Use only that method to find users by email.
2018-05-28 14:11:09 +02:00
Tim Alby
5a590aa021
remove getUserOrCreateHoldingAccount function
...
The function is deprecated
2018-05-28 14:09:13 +02:00
Shane Kilkelly
bc7d6a64ed
Add a trailing comma
2018-05-25 16:01:37 +01:00
Shane Kilkelly
c8a8fe6af7
Use Agent.handleError in case checkAuth produces an error
2018-05-25 16:01:11 +01:00
Jessica Lawshe
868083676f
Move contact form
2018-05-25 08:50:38 -05:00
Hayden Faulds
29f7ce0bbf
Merge pull request #576 from sharelatex/mm-handle-export-error
...
Handle error in ExportsController
2018-05-25 13:22:18 +01:00
Shane Kilkelly
0cb5beb689
Merge branch 'master' into sk-linked-files-from-project
2018-05-24 13:47:28 +01:00
Shane Kilkelly
b2a68cb911
Merge pull request #582 from sharelatex/sk-add-test-controls-panel
...
Add a "Test Controls" section to the left-panel
2018-05-24 11:41:10 +01:00
Shane Kilkelly
8766b5d487
DRY up writing to dump-folder in FileWriter
2018-05-24 11:30:29 +01:00
Shane Kilkelly
b5e8ed81b9
Better sanitization and validation for project-linked-file
2018-05-24 11:30:03 +01:00
Shane Kilkelly
1cbc901492
Add a checkAuth function to linked-file agents
2018-05-24 11:29:37 +01:00
Shane Kilkelly
3181f624a7
Remove obsolete auth check
2018-05-24 10:22:17 +01:00
James Allen
7bcd285bb1
Add Dropbox test for Front widget too
2018-05-24 09:51:29 +01:00
Alberto Fernández Capel
8a55994f64
Ensure a team overleaf id is unique
2018-05-23 16:11:28 +01:00
Alberto Fernández Capel
c8977ab9d6
Add overleaf id to user schema
2018-05-23 15:23:46 +01:00
Shane Kilkelly
ba9143fc3c
Show test-controls for admin users by default
2018-05-23 12:55:49 +01:00
Shane Kilkelly
561b62f7db
Add a hidden 'Test Controls' section to the left-menu.
...
This is to be used for hidden features that are not yet ready to ship,
and would otherwise be hidden behind a console command.
Append `?tc=true` to the project url to reveal this panel.
2018-05-23 12:37:42 +01:00
Shane Kilkelly
295425e791
Check that user can read a project on entities-json route
2018-05-23 11:34:55 +01:00
Shane Kilkelly
6a5af88e12
Remove stray comment
2018-05-23 11:32:00 +01:00
Shane Kilkelly
4daf062be9
Add unit test for ProjectController.projectEntitiesJson
2018-05-22 16:40:39 +01:00
Shane Kilkelly
691eec48ba
Merge branch 'master' into sk-linked-files-from-project
2018-05-22 15:39:09 +01:00
Shane Kilkelly
73184c063e
Be more specific about the source-file-not-found error case
2018-05-22 11:36:35 +01:00
James Allen
1d0be569a6
Fix SubscriptionUpdater -> FeaturesUpdater miscall
2018-05-22 10:05:08 +01:00
James Allen
50bd60dd51
Split FeaturesUpdater out of SubscriptionUpdater
2018-05-22 10:05:08 +01:00
James Allen
0830c473ad
Update unit tests and refactor to make more testable
2018-05-22 10:05:08 +01:00
James Allen
4deaf7865d
Guard against no apis.v1 setting
2018-05-22 10:05:08 +01:00
James Allen
b1f378208d
Properly merge subscriptions from different places
2018-05-22 10:05:08 +01:00
Paulo Reis
2a52eab8d6
Proxy history filetree requests through web.
2018-05-21 15:10:46 +01:00
Shane Kilkelly
7d8c7bebe2
Remove commented-out code
2018-05-21 10:17:00 +01:00
Shane Kilkelly
ee1b32eee1
Check for case where the source file is not found
2018-05-21 10:12:41 +01:00
Hugh O'Brien
346f37011f
Merge pull request #546 from sharelatex/ns-allow-latexmkrc
...
Allow for latexmkrc files in project zip upload
2018-05-21 09:03:40 +01:00
Michael Mazour
19e07485bc
Handle error in ExportsController
2018-05-18 15:08:33 +01:00
Shane Kilkelly
94a599d530
Fix the reloading of file view after refreshing linked file
2018-05-18 10:35:02 +01:00
Hugh O'Brien
24b4f9c46f
Merge pull request #436 from sharelatex/mm-project-export
...
Project exports spike
2018-05-18 10:31:15 +01:00
James Allen
e7a4aeaf79
Merge pull request #560 from sharelatex/ja-enable-v2-for-all
...
Enable the v2 banner for everyone if showV2Banner is set
2018-05-17 11:55:21 +01:00
Shane Kilkelly
2345b77ea7
Validate project-linked-file data before doing import
2018-05-17 10:51:58 +01:00
Michael Mazour
e34dd90a1f
Add project export route and controller
2018-05-16 14:58:34 +01:00
Michael Mazour
a661084485
Add ExportsHander for project exports performed via v1
2018-05-16 14:58:34 +01:00
Shane Kilkelly
33b4a1768b
Merge branch 'master' into sk-linked-files-from-project
2018-05-15 10:53:59 +01:00
Shane Kilkelly
06c0b45ef7
Merge branch 'master' into sk-fix-references-full-index
2018-05-14 13:45:12 +01:00
Shane Kilkelly
43d00a2e5f
Account for the new referencesSearch flag when deciding to do fullIndex
2018-05-14 11:31:59 +01:00
Hayden Faulds
3fb3daaee7
Merge pull request #529 from sharelatex/sk-remove-templates-from-v2
...
Add `templates` to the `Features.hasFeature` function
2018-05-14 10:57:28 +01:00
James Allen
58b5d67bdd
Enable the v2 banner for everyone if showV2Banner is set
2018-05-14 10:29:42 +01:00
Nate Stemen
d108b11bc0
Add latexmkrc in FileTypeManager
2018-05-10 16:59:58 -04:00
James Allen
dee96920b0
Allow font family and line height to be user configurable
2018-05-10 18:03:54 +01:00
Hayden Faulds
9ccdf073c4
accept attributes rather than projectHistoryId to ProjectCreationHandler
2018-05-10 11:39:23 +01:00
James Allen
78aefc2871
Merge pull request #542 from sharelatex/ja-match-front-to-v1
...
Update font and line spacing in Ace to match OL v1
2018-05-09 12:24:37 +01:00
Brian Gough
2bb2d9615f
added comment about using a project entity iterator
2018-05-08 13:37:33 +01:00
Brian Gough
f34ce5b12b
rename _updateProjectStructure to _updateProjectStructureWithDeletedEntity
2018-05-08 13:37:33 +01:00
Brian Gough
1278e2da45
fix project structure version when deleting folder
2018-05-08 13:37:33 +01:00
Brian Gough
24764f66ff
Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager
...
improve locking in web
2018-05-08 11:11:32 +01:00
Hugh O'Brien
57f07fb5fe
Merge pull request #518 from sharelatex/hob-publish-modal-qs
...
Publish modal accessible from query string
2018-05-08 09:40:41 +01:00
Brian Gough
afd4a10a19
retry lock with exponential backoff
2018-05-04 15:02:36 +01:00
James Allen
1aadd7d369
Configure line height and font family separately for v2
2018-05-04 14:05:20 +01:00
Brian Gough
e414100c41
add support for unique lock values
2018-05-04 13:22:33 +01:00
Shane Kilkelly
30beb098ab
Sort the project entities by path
2018-05-04 11:06:59 +01:00
Shane Kilkelly
08263180fa
Add project_id to the entities payload
2018-05-04 11:03:54 +01:00
Shane Kilkelly
3c3ce2010a
Add endpoint to list entities within a project
2018-05-04 10:45:13 +01:00
Shane Kilkelly
4925bfe536
Add an endpoint to get users projects as json
2018-05-04 09:44:13 +01:00
Shane Kilkelly
87fb226c3e
Fix invocation of getFileStream
2018-05-03 15:30:44 +01:00
Shane Kilkelly
5cb85c0332
WIP: Add ProjectFileAgent
2018-05-03 14:29:03 +01:00
Hayden Faulds
ba0e06d0fe
add V1HistoryNotSyncedError
2018-05-02 13:18:43 +01:00
Shane Kilkelly
af70ef0dc4
Add templates to the hasFeature function
2018-05-01 14:01:52 +01:00
James Allen
4c7364fd01
Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits
...
Re-order compile rate limits
2018-05-01 08:48:22 +01:00
James Allen
d454be8053
Bring down proportion to 10%
2018-04-30 17:19:21 +01:00
James Allen
6399621d1f
Show front widget for paid and sampled free users
2018-04-30 17:13:57 +01:00
hugh-obrien
157efa6d96
make publish modal accessible from query string
2018-04-27 15:50:11 +01:00
Alasdair Smith
ad1df3532f
Merge pull request #490 from sharelatex/hof-deleted-project-history
...
Pass project history id with updates
2018-04-23 10:05:07 +01:00
James Allen
d9a7b1248a
Re-order compile rate limits to do project/user check before everyone check
2018-04-17 14:43:54 +01:00
James Allen
9e525702c1
Merge branch 'master' into ja-restore-files
2018-04-16 16:14:31 +01:00
Alasdair Smith
3af10733cc
Replace hard coded rich text hashed file path with registration system
2018-04-16 14:14:49 +01:00
Hayden Faulds
7755a7cc1f
add overleaf to projections for project structure updates
2018-04-13 13:45:07 +01:00
Hayden Faulds
9ef40902ca
send projectHistoryId with resync requests
2018-04-13 13:45:03 +01:00
Hayden Faulds
3006d018d9
send projectHistoryId with project structure updates
2018-04-13 13:45:03 +01:00
Hayden Faulds
e5f3c472e3
return projectHistoryId in DocumentController.getDoc
2018-04-13 13:45:02 +01:00
Hayden Faulds
50686090c8
push doc pathname logic into DocController
2018-04-12 16:16:44 +01:00
Hugh O'Brien
2d3f169c49
Merge pull request #473 from sharelatex/hob-publish-modal-setup
...
Publish modal web setup
2018-04-12 14:01:18 +01:00
Brian Gough
4115a35773
Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking
...
replace files and separate uploads and locking (connects to overleaf/sharelatex#422 )
2018-04-12 09:52:02 +01:00
Alasdair Smith
60a28f7173
Fix hashed file path for rich text
2018-04-11 12:00:36 +01:00
hugh-obrien
a250004036
initial publish modal setup
2018-04-10 15:59:24 +01:00
Alasdair Smith
35cc5bf19c
Add defensive check for req.query, fixing tests
2018-04-10 10:38:40 +01:00
Brian Gough
882b555433
create new file on replace
2018-04-09 12:05:08 +01:00
Brian Gough
1a68f768d4
rename internal method uploadFile to _uploadFile
2018-04-09 12:05:08 +01:00
Brian Gough
38dab1c82c
clean up whitespace
2018-04-09 12:05:08 +01:00
Brian Gough
e29c657c8a
preserve original callback signature for addFile
2018-04-09 12:05:08 +01:00
Brian Gough
b551f3c7e9
fix indentation
2018-04-09 12:05:08 +01:00
Brian Gough
61b192fb2c
fix indentation of comment
2018-04-09 12:05:07 +01:00
Brian Gough
fe8897d757
refactor addFile and addFileWithOutUpdatingHistory
2018-04-09 12:05:07 +01:00
Brian Gough
d949338ed4
separate out file uploads
2018-04-09 12:05:07 +01:00
Brian Gough
cdfa2de68d
add comment about upsert and locking
2018-04-09 12:05:07 +01:00
Brian Gough
baec4eb195
move uploads outside the lock
2018-04-09 12:05:07 +01:00
Alasdair Smith
eb05be6eb3
Remove unused feature flag
2018-04-06 17:00:27 +01:00
Alasdair Smith
d433a88158
Pass rich text flag if query string is set
2018-04-06 16:58:12 +01:00
James Allen
2c0bd94fa7
Use mkdirp when restoring a file if the folder doesn't exist
2018-04-06 15:20:51 +01:00
James Allen
1e8439a2c6
Fix restore of docs from old deleted docs
2018-04-06 10:30:13 +01:00
James Allen
b4fa47d664
Add unit tests for RestoreManager
2018-04-06 10:30:13 +01:00
James Allen
0a1c543841
Hook up front end to restore documents
2018-04-06 10:30:13 +01:00
James Allen
075db1e5b9
Remove stray console.log
2018-04-06 10:30:13 +01:00
James Allen
3832850be6
Implement restore end point with acceptance tests
2018-04-06 10:30:13 +01:00
James Allen
beee86f1ce
First pass at restore end point
2018-04-06 10:30:13 +01:00
James Allen
0a00dea610
Merge pull request #469 from sharelatex/ja-feature-flag-rename
...
Split references feature flag into mendeley and referencesSearch
2018-04-03 11:53:58 +01:00
Paulo Reis
bd3c12cf90
Make sure the layout lib knows about the resizer width in v2.
2018-03-29 10:35:17 +01:00
James Allen
f80962b74b
Split references feature flag into mendeley and referencesSearch
2018-03-28 17:11:41 +01:00
James Allen
f13c7fd573
Revert "Replace references feature flag with mendeley and referencesSearch"
...
This reverts commit 12fdff37f9fd5d47e8446eebc576d8bb9e045aa4.
2018-03-28 13:47:34 +01:00
James Allen
e0facd40da
Merge pull request #461 from sharelatex/ja-feature-flag-rename
...
Replace references feature flag with mendeley and referencesSearch
2018-03-28 11:16:56 +01:00
James Allen
dc2d7a9c7e
Replace references feature flag with mendeley and referencesSearch
2018-03-27 16:20:21 +01:00
Henry Oswald
3b3b404288
Update LoggerSerializers.coffee
2018-03-27 14:45:47 +01:00
Henry Oswald
eeb76441c0
null check map on files and docs inside logger
2018-03-27 14:41:56 +01:00
Paulo Jorge Reis
8f7228d26e
Merge pull request #437 from sharelatex/pr-v2-splitters
...
Improve v2 splitters
2018-03-27 10:08:05 +01:00
Alasdair Smith
5e2f838af4
Instead of loading script directly use requirejs config so it can be lazy loaded
2018-03-23 13:52:48 +00:00
James Allen
0c89f488bd
Merge pull request #440 from sharelatex/afc-fix-read-announcements-count
...
Fix read announcements count
2018-03-23 12:06:49 +00:00
James Allen
45c853d30a
Merge pull request #425 from sharelatex/ja-disable-beta-program
...
Disable beta program pages
2018-03-23 11:51:46 +00:00
Alberto Fernández Capel
fef7601433
Early return only applies to fault tolerant request
...
We need to return the data to other requests like getLastOccurrence.
2018-03-23 10:02:11 +00:00
Paulo Reis
906f4899aa
Only use custom togglers in v2.
2018-03-22 12:10:34 +00:00
Shane Kilkelly
135854a0e0
Merge branch 'master' into ta-add-publisher-hub-analytics-proxy
2018-03-21 10:32:04 +00:00
Tim Alby
643f687640
Add recentV1TemplateIdsActivity proxy to AnalyticRouter
2018-03-20 17:32:45 -05:00
Shane Kilkelly
e50fef151f
Add uniExternalCollaboration proxy to AnalyticRouter
2018-03-20 13:19:51 +00:00
James Allen
161d7b1d9d
Disable beta program pages
2018-03-20 12:03:48 +00:00
Alberto Fernández-Capel
f9ba4ea467
Merge pull request #414 from sharelatex/afc-retries-with-exp-backoff
...
Use exponential backoff in request retries to analytics
2018-03-20 09:55:07 +00:00
Alasdair Smith
e9ba73138e
Fix webpack config so that it's more consistent
2018-03-19 14:47:25 +00:00
Alberto Fernández Capel
132b31c39f
Increase timeout
2018-03-19 14:46:18 +00:00
Alberto Fernández Capel
f2fc999ce4
Extract method to add common params
2018-03-19 10:30:06 +00:00
Alberto Fernández Capel
07b0f37579
Log errors in requests to analytics
2018-03-19 09:56:44 +00:00
Hayden Faulds
57de597e60
404 when resyncing deleting projects
2018-03-16 15:26:19 +00:00
Hayden Faulds
482d140716
add overleaf to projection
2018-03-16 13:29:22 +00:00
Alberto Fernández Capel
6609c10d36
Use exponential backoff to retry request to analytics
2018-03-15 17:14:50 +00:00
Hayden Faulds
d22d8324af
disable history resync when project-history is not enabled
2018-03-15 16:57:39 +00:00
Alasdair Smith
2e0804c728
Fix opts not passed to buildJsPath
2018-03-15 12:15:00 +00:00
Alasdair Smith
408c195c6a
Instead of using webpack chunk hashing, use existing system
2018-03-15 09:42:26 +00:00
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
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
7918232757
Merge pull request #240 from sharelatex/pr-v2-styling-fixes
...
v2 styling fixes
2018-01-03 11:30:39 +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
Paulo Reis
0484b46027
Redundancy.
2017-12-21 13:52:34 +00:00
Paulo Reis
484d34e296
Only render announcements in SL.
2017-12-21 12:57:07 +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
Paulo Reis
0a0c6c6c0c
Merge branch 'master' into pr-style-v2-chatpane
2017-12-20 09:50:49 +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
0a4febfce6
Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only
...
only hash the static content when minified is on
2017-12-19 15:00:15 +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
James Allen
4691a6e85c
Get diffs showing in client
2017-12-19 13:58:47 +00:00
Henry Oswald
70298ba65c
only hash the static content when minified is on
2017-12-19 13:13:31 +00:00
Paulo Reis
cb83e2c1b2
Tone down chat colors.
2017-12-19 10:52:23 +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
Henry Oswald
7aaf08da48
added no-cache endpoint
2017-12-15 13:38:34 +00:00
Henry Oswald
7693d274b7
Merge pull request #209 from sharelatex/ho-hash-static
...
Main.js Ide.js and libs.js (now libraries.js) use hash in file name when minified
2017-12-15 09:52:23 +00:00
Henry Oswald
bf276b0814
ripped file fingerprinting out
2017-12-14 12:11:13 +00:00
Henry Oswald
cbf656518f
remove versioned files from fingerprinting
2017-12-14 11:24:47 +00:00
Paulo Reis
36c79979bd
More color adjustments.
2017-12-14 11:24:06 +00:00
Paulo Reis
c03ce6fdf7
Configure chat messages colors per brand.
2017-12-14 11:24:05 +00:00
Paulo Reis
e47b20390b
Add per brand UI specific chat message styles.
2017-12-14 11:24:05 +00:00
Henry Oswald
288af6772a
write hashes for all files we fingerprint
2017-12-14 10:59:46 +00:00
Henry Oswald
490c56c692
libs -> libraries
...
don't use hash in non minjs version
2017-12-13 17:15:44 +00:00
Henry Oswald
716b309208
remove todo statments
2017-12-13 16:50:18 +00:00
Alasdair Smith
4a9c9c563a
Merge branch 'master' into as-autocompile-rollout-60
2017-12-13 14:44:31 +00:00
Henry Oswald
dd6bd3b91e
Merge branch 'master' into ho-hash-static
2017-12-13 14:25:32 +00:00
Henry Oswald
88334959d7
added remove extension
2017-12-13 14:13:45 +00:00
Henry Oswald
65efbbce53
seems to work now.
2017-12-13 13:06:38 +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
Henry Oswald
80e6a660be
wip, this does not work minified yet
...
for some reason lib.js is not being requested no, console errors or network errors
2017-12-12 17:21:01 +00:00
Alasdair Smith
5c62ac4f8a
Change error type for consistency
2017-12-12 12:59:10 +00:00
Paulo Reis
59e675797e
Merge branch 'master' into pr-style-v2-resizers
2017-12-11 15:55:50 +00:00
Paulo Reis
0652fc62a0
Configure resizer cursors for v2.
2017-12-11 15:33:00 +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
Paulo Reis
7c5a7880b0
Merge branch 'master' into pr-style-v2-resizers
2017-12-06 15:49:18 +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
James Allen
52b414498c
Merge branch 'master' into as-show-v1-warnings
2017-12-04 10:03:38 +00:00
James Allen
158b0d56cf
Merge branch 'master' into pr-style-v2-resizers
2017-12-04 10:01:45 +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
