Commit Graph
3991 Commits
Author SHA1 Message Date
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
Alasdair Smith 57c56a0853 Merge pull request #565 from sharelatex/as-dash-action-btns
Add action buttons to v2 dash
2018-05-31 10:11:20 +01:00
Alasdair Smith cc9d18d991 Merge pull request #600 from sharelatex/as-refactor-rt-load
Refactor loading rich text
2018-05-31 10:11:01 +01:00
Alasdair Smith 5ec238cae8 Switch archive button with restore button for archived projects 2018-05-31 10:05:39 +01:00
Alasdair Smith 7dffc56804 Clone project action button 2018-05-31 10:05:04 +01:00
Alasdair Smith 2354f4156b Download project action button 2018-05-31 10:04:59 +01:00
Alasdair Smith ffc06f2a3b Archive project action button 2018-05-31 10:04:50 +01:00
Alasdair Smith a2dff4bfbb Right align actions header 2018-05-31 09:59:35 +01:00
Alasdair Smith 83c62c8ab1 Only show action buttons on v2 2018-05-31 09:58:39 +01:00
Alasdair Smith 20cca0fcd4 Add action buttons to project list 2018-05-31 09:58:18 +01:00
James Allen 4f5148e668 Wrap text like normal 2018-05-30 17:55:47 +01:00
Paulo Reis 6e7e76a3ce Margin and padding adjustments. 2018-05-30 17:34:46 +01:00
Henry Oswald a747480425 add references host into settings 2018-05-30 15:28:59 +01:00
Paulo Reis 66d7bdb26b Change buttons copy. 2018-05-30 15:03:22 +01:00
Paulo Reis 4c4a4f10c1 Rename history file tree and move it around. 2018-05-30 14:21:01 +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
Alasdair Smith d0b160d9a2 Rename flag for clarity 2018-05-30 11:55:09 +01:00
Alasdair Smith c6d2b4f1e7 Use single rich text include instead of split toolbar & body includes 2018-05-30 11:44:27 +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
Paulo Reis 8d2189f843 Support using both point-in-time and compare modes. 2018-05-29 16:50:15 +01: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