Commit graph

9251 commits

Author SHA1 Message Date
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
7cb4280a4d Remove commented-out code. 2018-05-30 15:18:15 +01:00
Paulo Reis
66d7bdb26b Change buttons copy. 2018-05-30 15:03:22 +01:00
Paulo Reis
aec4ea79ad Make history file tree more like the editor file tree in SL. 2018-05-30 15:00:20 +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
9e65e5e813 Fix loading of Rich Text page in Test Controls 2018-05-29 10:46:22 +01:00
Shane Kilkelly
14898acd7f Update linked-file acceptance tests 2018-05-29 10:40:38 +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
ce147b012f Cleaner unpacking of data from scope 2018-05-25 16:03:45 +01: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
Shane Kilkelly
0802403ee5 Merge pull request #597 from sharelatex/sk-add-waitfor-function-to-ide
Add a `waitFor` helper to the ide
2018-05-25 15:16:50 +01:00
Jessica Lawshe
868083676f Move contact form 2018-05-25 08:50:38 -05:00
Shane Kilkelly
2a11a70cd3 Use smaller border-radius on textarea inputs, on v2 2018-05-25 14:48:37 +01:00
Shane Kilkelly
c4da8701c8 On v2, use smaller (default) border radius on select inputs 2018-05-25 13:38:19 +01:00
Hayden Faulds
09ddc75126 Merge pull request #583 from sharelatex/ta-create-unit-test-app-task
Add test_unit_app task
2018-05-25 13:22:25 +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
105d858155 Move waitFor into an angular service 2018-05-25 13:02:58 +01:00
Shane Kilkelly
cfc17d56e8 Use a promise (with Angular's $q) in waitFor 2018-05-25 11:42:13 +01:00
Shane Kilkelly
8be4279165 Fix a broken if-else-if statement 2018-05-25 10:56:32 +01:00
Shane Kilkelly
f5f253ad01 Add an optional pollInterval parameter to waitFor 2018-05-25 10:56:08 +01:00
Shane Kilkelly
e33b7b1a49 Use waitFor when restoring a file in v2 history 2018-05-25 10:37:04 +01:00
Shane Kilkelly
19d8700947 Use waitFor when refreshing the binary file view 2018-05-25 10:36:39 +01:00
Shane Kilkelly
3849bcfb40 Add a waitFor helper to the ide object 2018-05-25 10:36:20 +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
73a45b15ce Make string replace op safer 2018-05-24 11:35:55 +01:00
Shane Kilkelly
de1f33a720 Remove 'private' methods from the controller scope 2018-05-24 11:32:44 +01:00
Shane Kilkelly
16419847ae Fix linked-file-types check when opening modal 2018-05-24 11:32:20 +01:00
Shane Kilkelly
656d40ac39 Better view refresh after refreshing linked file 2018-05-24 11:31:50 +01:00