Commit graph

23625 commits

Author SHA1 Message Date
Henry Oswald
885915916a check if user exists on recurly callback 2015-10-21 11:27:13 +01:00
Henry Oswald
069220dcc8 increased cache time to 1.5 days 2015-10-21 10:02:30 +01:00
Henry Oswald
d9734953a6 don't archive project in track changes for moment 2015-10-20 17:36:37 +01:00
Henry Oswald
79a694b5c8 for spelling attach error handler first 2015-10-20 09:55:12 +01:00
Henry Oswald
f61d97a4f6 added null check on user when checking permissions 2015-10-19 22:29:36 +01:00
Henry Oswald
2b8dd7248a added subscription handler null check 2015-10-19 22:29:11 +01:00
Henry Oswald
d80179ecc6 added missing null check in 2015-10-19 22:14:52 +01:00
Henry Oswald
a94a03fc3e added missing stubbed module call breaking tests 2015-10-19 15:48:59 +01:00
Henry Oswald
0c74673e04 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-10-19 15:44:54 +01:00
Henry Oswald
2c32126f68 archive in track changes as well as docstore 2015-10-19 15:44:50 +01:00
Brian Gough
c44d5b1b3d added healthcheck 2015-10-19 10:59:39 +01:00
Henry Oswald
29c812cece moved the build opts down 2015-10-16 12:57:05 +01:00
James Allen
36678301e6 Try to put a new doc in the docstore first so that if it fails it doesn't leave a broken doc_id in the project 2015-10-16 12:34:33 +01:00
James Allen
bafd3a1cb4 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-10-16 12:31:21 +01:00
Henry Oswald
4f5669591a add timeout to health check requests and always try the delete 2015-10-16 12:30:53 +01:00
Brian Gough
ad144371d0 gracefully handle updates marked as broken
set update.broken == true to allow the user to view history without a
crash
2015-10-16 11:24:50 +01:00
Henry Oswald
de9a24f7bb pulled health check into its own file and use project_id from settings 2015-10-16 10:13:54 +01:00
Henry Oswald
491d4c69b1 Merge branch 'master' of https://github.com/sharelatex/docstore-sharelatex 2015-10-15 22:22:44 +01:00
Henry Oswald
9826d125e3 added basic health check to docstore 2015-10-15 22:22:20 +01:00
James Allen
144f1396b7 Fix problem with pasting multiple emails 2015-10-15 17:03:22 +01:00
James Allen
fb42489803 Improve formatting of users, groups and tags 2015-10-15 16:43:53 +01:00
James Allen
b0895cc6aa Support adding groups to projects via share modal 2015-10-15 13:53:46 +01:00
Henry Oswald
bbe510099e change auto disconnect to 24 hours and expose it publicly for easier testing 2015-10-15 11:38:23 +01:00
Henry Oswald
2f48568f76 fix free trial button on timeout view 2015-10-15 11:38:01 +01:00
Henry Oswald
9eb4dd1b3b on firefox don't show retrying connected message if the user clicked to change page
it creates a bit of worry for the user as it looks like the connection was not there.
2015-10-14 18:07:12 +01:00
James Allen
d996ed6e47 Refactor addUserToProject for better access by groups 2015-10-14 17:29:58 +01:00
Henry Oswald
a1f57f220b inline ng-clock as it does not work for firefox in base.less quickly enough 2015-10-14 16:22:32 +01:00
Henry Oswald
aba8f164fc copy right 2015 not 2014 2015-10-14 14:44:48 +01:00
Brian Gough
8961e23954 enhance LockManager to avoid accidental unlocking 2015-10-14 14:42:17 +01:00
Henry Oswald
f5162d424f if a user is inactive for 12 hours disconect them. 2015-10-14 14:28:24 +01:00
Henry Oswald
28e507b007 Revert "A tiny cache-busting change"
This reverts commit 1241b397d32cf982c9bb92865c725ce1e431e409.
2015-10-09 10:12:08 +01:00
Henry Oswald
ea5046ef20 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-10-09 10:11:57 +01:00
Henry Oswald
e593b3f717 append string to ide.js min which we can use for testing via status cake 2015-10-09 10:11:38 +01:00
Shane Kilkelly
8676ce9538 A tiny cache-busting change 2015-10-09 08:45:50 +01:00
James Allen
c4e4f2c77a Add modules hook for contacts and support groups in auto complete 2015-10-08 18:17:53 +01:00
James Allen
78c5741d06 Add contact when adding collaborator 2015-10-08 16:42:23 +01:00
Brian Gough
b6dae59655 fix callback logic in compressAndSaveRawUpdates 2015-10-08 16:39:13 +01:00
Brian Gough
8226bf3be4 increase lock time to 5 minutes 2015-10-08 16:11:39 +01:00
James Allen
d11d536994 Refactor adding and removing collaborators to not go through EditorController 2015-10-08 14:15:36 +01:00
Brian Gough
add6a68fe1 add missing callback in compressAndSaveRawUpdates 2015-10-08 10:53:25 +01:00
James Allen
5fef2a82b8 Acceptance tests no longer run on Travis 2015-10-07 18:40:12 +01:00
James Allen
f723b1699b Mongo/redis no longer needed without acceptance tests 2015-10-07 18:39:47 +01:00
James Allen
9b40d34b2a Acceptance tests no longer run on Travis 2015-10-07 18:39:24 +01:00
James Allen
8cc7869b03 Pull in contacts from contacts api and send to tag-input for autocomplete 2015-10-07 17:32:35 +01:00
James Allen
3959cba071 add in acceptance tests 2015-10-07 14:20:30 +01:00
James Allen
b6106697a0 Don't look up user details in this api 2015-10-07 14:07:54 +01:00
Henry Oswald
f1d07811df update the entire users features on assign bonus bu don't update
the user features if there is nothing to update when assigning bonus
2015-10-07 13:50:51 +01:00
James Allen
5a58c8247e API/service layout deprecation warning 2015-10-07 13:44:57 +01:00
James Allen
1a4b8f4269 API/service layout deprecation warning 2015-10-07 13:44:40 +01:00
Henry Oswald
a73b2ceb37 Merge branch 'connect-failed' 2015-10-07 11:30:48 +01:00