Commit graph

2508 commits

Author SHA1 Message Date
Shane Kilkelly
d566ce3fd2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 14:38:56 +00:00
Shane Kilkelly
d5c280dc4d Show the pdf if it was already loaded.
This ensures the pdf will be visible if the user switches to fullscreen-view.
2016-03-22 14:38:48 +00:00
Henry Oswald
a89edde139 subscription tests fixed 2016-03-22 14:27:05 +00:00
Henry Oswald
cc84aaf834 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-22 14:19:54 +00:00
Henry Oswald
7fb0249b2b null check subscription for custom accounts page 2016-03-22 14:19:46 +00:00
James Allen
a597ebfd90 Only show deleted files in track changes view 2016-03-22 14:13:50 +00:00
Henry Oswald
fbfd160c6d default message to empty string 2016-03-22 14:02:15 +00:00
Shane Kilkelly
b8c3b427ee Merge branch 'sk-pdf-error-display' 2016-03-22 14:00:12 +00:00
Shane Kilkelly
2dd9aa9424 Merge branch 'sk-environment-autocomplete' 2016-03-22 13:55:41 +00:00
Henry Oswald
cacb3bf39e Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-22 12:30:52 +00:00
Henry Oswald
69a7a1508b modal != modal instance 2016-03-22 12:28:37 +00:00
James Allen
7637c858c8 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 12:14:18 +00:00
James Allen
4595c90363 Use translations for action in project delete modal 2016-03-22 12:12:11 +00:00
James Allen
aa1f2cc8a9 Remove #s in href on project list buttons 2016-03-22 12:11:59 +00:00
Henry Oswald
c777f498ad Merge branch 'groove2' 2016-03-22 11:58:04 +00:00
James Allen
49bb4f07ea Move delete docs into view in file-tree element 2016-03-22 11:15:52 +00:00
Shane Kilkelly
45077cfba9 Merge branch 'master' into sk-pdf-error-display 2016-03-22 10:56:59 +00:00
Shane Kilkelly
723031f7f3 un-show logs on successful run. 2016-03-22 10:32:55 +00:00
Shane Kilkelly
293cb3c73e fix typo 2016-03-22 10:32:44 +00:00
Shane Kilkelly
4f3755318f Clean up. 2016-03-22 10:24:58 +00:00
James Allen
f182fbf396 Convert 'anonymous-user' from real-time api in 'null' internally 2016-03-22 09:53:47 +00:00
Shane Kilkelly
59b131f251 First pass at refactoring the output panel views. 2016-03-22 09:39:33 +00:00
James Allen
2af2dd694e Use null to represent anonymous user, as AuthorizationManager expects 2016-03-22 09:39:25 +00:00
James Allen
7791805949 Allow admin access to projects 2016-03-21 17:03:41 +00:00
Henry Oswald
840d3b75bb listen for close not exit when working with unzip command
sometimes the command will fail because stout has not finished yet
2016-03-21 16:37:29 +00:00
Henry Oswald
4d7ed1cb17 improved logging from unzip command 2016-03-21 16:00:12 +00:00
Shane Kilkelly
f58f1c3795 Account for the new too-recently-compiled error. 2016-03-21 15:16:17 +00:00
Shane Kilkelly
53dfa841cc Add the beginnings of a clsi-maintenance-mode message 2016-03-21 15:00:25 +00:00
Shane Kilkelly
3b35605edc Show logs, even if the compile timed out. 2016-03-21 14:05:26 +00:00
James Allen
9a0ec9c292 Don't throw fatal error when recently compiled 2016-03-21 13:54:45 +00:00
James Allen
8bfc613bb3 Log client side errors as warns so they don't show in Sentry 2016-03-21 13:29:34 +00:00
James Allen
6beb29f449 Don't treat no root resource as a fatal error 2016-03-21 13:28:53 +00:00
James Allen
8fb3e629e8 Require logins for all uploads to projects 2016-03-21 13:23:14 +00:00
Shane Kilkelly
9b22efbd98 split errors into normal error, and renderingError. 2016-03-21 13:20:03 +00:00
James Allen
0ba70e7ccc Remove missing parameter in log lines 2016-03-21 13:15:57 +00:00
James Allen
2a9e451876 Refine error page to in all situations, and don't send sentry errors on not found errors 2016-03-21 11:55:59 +00:00
Henry Oswald
4e78e34cdf finished contact us with groove
for settings file:

<a ng-controller="ContactModal", ng-click="contactUsModal()", href>Contact</a>
2016-03-21 11:41:05 +00:00
Shane Kilkelly
a704289099 Show the error view, even when the pdf is in an error state. 2016-03-21 10:26:39 +00:00
James Allen
e7d67668e9 Improve error reporting and show 404 when project ids are malformed 2016-03-18 15:59:12 +00:00
James Allen
88b8ce1f80 Enable working settings acceptance tests 2016-03-18 15:59:12 +00:00
Henry Oswald
882297c353 working framework. not happy with groove. Can't set mailbox 2016-03-18 12:55:35 +00:00
Shane Kilkelly
35b5d3cc05 Update ReferencesHandlerTests. 2016-03-18 11:43:39 +00:00
Henry Oswald
209c8ebbfc wip 2016-03-18 11:31:50 +00:00
Shane Kilkelly
f3db114654 Use the mongojs based apis to get Project and User information. 2016-03-18 11:20:33 +00:00
James Allen
de02928454 Merge branch 'master' into ja_email_tokens 2016-03-17 17:01:26 +00:00
Shane Kilkelly
11d77df898 Fix weird tab behaviour 2016-03-17 16:18:46 +00:00
Shane Kilkelly
020fd2e88d De-dupe autocomplete entries 2016-03-17 15:58:57 +00:00
Shane Kilkelly
53b46e42cd Refactor, take indentation into account. 2016-03-17 15:27:20 +00:00
Shane Kilkelly
229ced6f2f Remove Indentation. 2016-03-17 14:43:34 +00:00
Shane Kilkelly
95a6e1900e Add autocomplete entries for the end{} commands 2016-03-17 14:09:45 +00:00