github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
7357 commits 3 branches 7 tags 201 MiB
Commit graph

2524 commits

Author SHA1 Message Date
Alberto Fernández-Capel
10da4fc5f7 Merge pull request #585 from sharelatex/afc-team-overleaf-id 
Add overleaf id to the Subscription (team) schema
 2018-06-08 11:27:15 +01:00
Alberto Fernández Capel
5159f6f33d Check the subscription is in a group plan before adding new members 2018-06-08 09:58:51 +01:00
Timothée Alby
7cdcd725fd Revert "Use Multiple Emails" 2018-06-07 18:44:59 +02:00
Alberto Fernández Capel
85f4a31585 Proper coffee syntax 2018-06-07 16:49:17 +01:00
Jessica Lawshe
484ee9ad61 Should not AB test when signed up before 2018-06-06 2018-06-07 10:30:21 -05:00
Alberto Fernández Capel
a3bb99d755 Honour invited_emails for the team being 
We'll remove them soon, but we want to keep them for a while so
recent invites can join their teams.
 2018-06-07 16:22:38 +01:00
Alberto Fernández Capel
670f24ef6f Simplify method name 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
30b935befd Prevent double rendering error 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
d1b1e6c299 Do not include the Licence ending in domain invites 
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
88d12b43ac Make CTA message match regular message 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
5e70825c94 Rename view variable to invite 
Makes the meaning more explicit
 2018-06-07 16:12:02 +01:00
Hugh O'Brien
6f5c777163 Merge pull request #622 from sharelatex/hb-take-emis-names-as-input 
Take user entered first and last names for EMIS
 2018-06-07 15:52:33 +01:00
Timothée Alby
f422b7242d Merge pull request #603 from sharelatex/ta-use-multi-emails 
Use Multiple Emails
 2018-06-07 15:40:43 +02:00
James Allen
c2ef93b212 Merge pull request #610 from sharelatex/ja-sync-from-v2 
Tell v1 when refreshing features in v2
 2018-06-07 13:30:34 +01:00
hugh-obrien
c684fc3383 fix first/last name check bug 2018-06-07 12:57:01 +01:00
Alberto Fernández Capel
959db80177 Check all emails to prevent invite duplicates 2018-06-07 12:49:46 +01:00
Alberto Fernández Capel
566c41cafd Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-07 11:40:03 +01:00
Alberto Fernández Capel
1fc047d08e Fix invitation resend 2018-06-06 17:11:25 +01:00
Alberto Fernández Capel
553878064b Resend email if the user has already been invited 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
16cb5e0d35 Propagate the error further up the stack 
Useful for error reporting and metrics.
 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
8a317b5bfe Better wording 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
e753ef3af5 Invite users in the invited_emails array 
We'll remove that attribute soon, but for the time being we want
users to still be able to join the team.
 2018-06-06 15:36:53 +01:00
Tim Alby
3cb499a3c2 add comment 2018-06-06 15:46:41 +02:00
Tim Alby
e4da748257 add filter to query on emails attribute 2018-06-06 14:52:09 +02:00
Tim Alby
813289f5de use multiple emails when relevant 2018-06-06 11:45:01 +02:00
Tim Alby
c5530163f5 add emails attribute on user creation 2018-06-06 11:45:01 +02:00
Tim Alby
1f6fcafce6 remove default emails attribute on user model 2018-06-06 11:11:57 +02:00
Alberto Fernández Capel
6fb6119ca8 Merge remote-tracking branch 'origin' into afc-email-tokens 2018-06-05 15:42:17 +01:00
Tim Alby
613c9193e3 implement multi emails logic 2018-06-05 16:42:12 +02:00
Jessica Lawshe
b63384cbf1 Merge pull request #537 from sharelatex/jel-pricing-plans 
Plans and pricing variant
 2018-06-05 09:30:43 -05:00
Paulo Reis
8e5032fb34 Merge branch 'master' into pr-v2-history-ui 2018-06-05 10:55:42 +01:00
Jessica Lawshe
10cf5825a5 Add plans variant 
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “

Also, move repeated elements to partials
 2018-06-04 14:42:26 -05:00
hugh-obrien
54ce196500 test custom first and last name for exports 2018-06-04 13:16:21 +01:00
hugh-obrien
4c5f186ca2 take custom first and last names from export UI 2018-06-04 13:16:21 +01:00
Alberto Fernández Capel
58c4e72b2a Update references to UserLocator 
UserLocator was refactored in another branch: UserLocator -> UserGetter
 2018-06-01 16:53:16 +01:00
Alberto Fernández Capel
25d7196570 Merge remote-tracking branch 'origin/master' into afc-email-tokens 2018-06-01 16:49:47 +01:00
Alberto Fernández Capel
b0b2546e43 Remove dead code 2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
a73a869d03 I can haz some grammar 2018-06-01 16:17:11 +01:00
Alberto Fernández Capel
7fcdf68296 Remove dead code 2018-06-01 16:05:44 +01:00
Alberto Fernández Capel
3bd18715db Add some tests 2018-06-01 15:37:09 +01:00
Alberto Fernández Capel
89735f4b8e Keep method name for compatibility 2018-06-01 15:36:00 +01:00
James Allen
cfbb5c8f24 Remove some dead code 2018-06-01 14:55:07 +01:00
Hugh O'Brien
a79c9b94a8 Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web 
Extract v1 templates code to web
 2018-06-01 11:29:36 +01:00
Alberto Fernández Capel
9b18e58b68 Choose a better method name 
This method is now only notifying users about a potential domain
licence
 2018-06-01 11:28:06 +01:00
Alberto Fernández Capel
385fec1914 Clean up code that uses invited_emails 2018-06-01 11:23:25 +01:00
Alberto Fernández Capel
1c485c1884 Improve error handling 2018-05-31 16:42:09 +01:00
Alberto Fernández Capel
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Brian Gough
fef667a738 Merge pull request #614 from sharelatex/ja-restrict-restore 
Don't allow read-only users to restore
 2018-05-31 15:52:40 +01:00
Brian Gough
c4f3a12ce5 add missing locking to copyFileFromExistingProject 2018-05-31 14:51:32 +01:00
Alberto Fernández Capel
39c8595c27 Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin 
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
 2018-05-31 14:25:47 +01:00
James Allen
f5367985c3 Don't allow read-only users to restore 2018-05-31 13:44:37 +01:00
hugh-obrien
d47e845367 add v1 template tests 2018-05-31 13:26:54 +01:00
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