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
Alberto Fernández Capel
6fb6119ca8
Merge remote-tracking branch 'origin' into afc-email-tokens
2018-06-05 15:42:17 +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
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
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
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
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
Alberto Fernández Capel
7e09c0e0b1
First stab at email token invites (WIP)
2018-05-30 11:29:21 +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
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
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
