Alberto Fernández Capel
57775e60b1
Merge remote-tracking branch 'origin/master' into afc-update-user-references
2018-06-08 11:28:58 +01:00
Timothée Alby and GitHub
7cdcd725fd
Revert "Use Multiple Emails"
2018-06-07 18:44:59 +02:00
Hugh O'Brien and GitHub
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 and GitHub
f422b7242d
Merge pull request #603 from sharelatex/ta-use-multi-emails
...
Use Multiple Emails
2018-06-07 15:40:43 +02:00
James Allen and GitHub
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
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
613c9193e3
implement multi emails logic
2018-06-05 16:42:12 +02: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
James Allen
cfbb5c8f24
Remove some dead code
2018-06-01 14:55:07 +01:00
Hugh O'Brien and GitHub
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
Brian Gough
c4f3a12ce5
add missing locking to copyFileFromExistingProject
2018-05-31 14:51:32 +01:00
hugh-obrien
d47e845367
add v1 template tests
2018-05-31 13:26:54 +01:00
hugh-obrien
7f86ddc72c
extract v1 templates code to web
2018-05-31 11:12:31 +01:00
Shane Kilkelly and GitHub
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
James Allen
e0e88b25fe
Make agrument checking more robust
2018-05-30 12:48:08 +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
Alberto Fernández Capel
b52fbdbfa4
Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups
2018-05-29 15:37:04 +01: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
c8a8fe6af7
Use Agent.handleError in case checkAuth produces an error
2018-05-25 16:01:11 +01:00
Hayden Faulds and GitHub
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 and GitHub
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
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
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
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
Shane Kilkelly
7d8c7bebe2
Remove commented-out code
2018-05-21 10:17:00 +01:00
Alberto Fernández Capel