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 |
|
Christopher Hoskin
|
a6ab549d29
|
Update build_scripts to 1.1.4 (draft)
|
2018-05-29 15:39:52 +01:00 |
|
Alberto Fernández Capel
|
b52fbdbfa4
|
Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups
|
2018-05-29 15:37:04 +01:00 |
|
Christopher Hoskin
|
e396b6b79e
|
Update to Build Script 1.1.4 (draft 2)
|
2018-05-29 15:30:45 +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 |
|
Christopher Hoskin
|
ff9e67c87d
|
Update to Build Script 1.1.4 (draft)
|
2018-05-29 13:59:19 +01: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 |
|
Henry Oswald
|
e8ec175bf1
|
Merge branch 'ho-dockerise' of github.com:sharelatex/clsi-sharelatex into ho-dockerise
|
2018-05-25 15:33:08 +01:00 |
|
Henry Oswald
|
b2fa2e7d55
|
bumped timeout to 30 seconds
|
2018-05-25 15:30:26 +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 |
|
henry oswald
|
0e2603e4be
|
change synctex binary and added it to mounted volumes in docker config
|
2018-05-25 13:45:07 +00:00 |
|
henry oswald
|
1101763f50
|
all but the sync tests should pass
|
2018-05-25 12:43:12 +00: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 |
|
Henry Oswald
|
c3ae6b5d23
|
log settings on startup
|
2018-05-25 12:01:16 +01:00 |
|
Henry Oswald
|
64f01a125f
|
set user to tex for tests run on ci box
|
2018-05-25 11:51:34 +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 |
|
Henry Oswald
|
f769765923
|
added --exit to unit tests
|
2018-05-24 21:59:02 +01:00 |
|
Henry Oswald
|
91bd54cff9
|
update to 1.1.3 build scripts
|
2018-05-24 19:03:57 +01:00 |
|
Shane Kilkelly
|
0cb5beb689
|
Merge branch 'master' into sk-linked-files-from-project
|
2018-05-24 13:47:28 +01:00 |
|
Henry Oswald
|
fca95b5b27
|
dockerise app
- 1.1.3 build scripts
- add env vars for configuring s3
- add docker file
|
2018-05-24 12:02:27 +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 |
|