Commit graph

2538 commits

Author SHA1 Message Date
Shane Kilkelly
fbf5d35fa5 Merge branch 'master' into sk-tpr 2016-04-15 09:46:16 +01:00
Shane Kilkelly
9d027b88ba Bug fix: re-introduce the project-too-large error message 2016-04-15 09:45:48 +01:00
Henry Oswald
ffa04c7b55 add project url onto query string for compile hashing 2016-04-13 15:38:04 +01:00
Shane Kilkelly
939d7cd042 Merge branch 'master' into sk-tpr 2016-04-11 16:41:34 +01:00
Shane Kilkelly
749d2aa013 Merge branch 'sk-safari-freeze-fix' 2016-04-11 14:47:03 +01:00
Shane Kilkelly
76697599ae Use the _ide version of browserIsSafari 2016-04-11 14:45:26 +01:00
Shane Kilkelly
e3b2ec9977 Add a ide.browserIsSafari boolean flag. 2016-04-11 14:35:59 +01:00
Shane Kilkelly
8d6003dcc5 Add commentary 2016-04-11 09:58:37 +01:00
Shane Kilkelly
4fd4a0372c In Safari, limit iterations of the command-parsing loop. 2016-04-11 09:55:53 +01:00
Henry Oswald
010bb61baf add michael pic 2016-04-11 08:26:06 +01:00
Henrique Dias
ae79ce75b7 Update settings.defaults.coffee 2016-04-06 11:32:08 -03:00
Henrique Dias
38c8eb868a Update package.json 2016-04-06 11:30:26 -03:00
Henry Oswald
424e09ec05 getGroupSubscriptionMemberOf gets plan code 2016-04-05 16:03:46 +01:00
Henry Oswald
bd54218cc9 added grunt as depenency 2016-04-05 14:17:36 +01:00
Damien
77eba3ea22 Correct alignment for word count dialog
on less than `md` sized screen
2016-04-04 23:47:40 +02:00
Henry Oswald
633839c98b for support tickets include browser/os and hide email address if
set already. This way we know who they are logged in with which has
caused condfusion.
2016-04-04 16:05:42 +01:00
Shane Kilkelly
a686d187ad Pull refProviders into user model 2016-04-01 11:36:19 +01:00
Henry Oswald
3d719af71e if subscription is downgraded don't use plan code on subscription, use default instead 2016-03-31 18:04:20 +01:00
Henry Oswald
81cd2adfd3 member_ids != members_id 2016-03-31 17:36:06 +01:00
Henry Oswald
d80191c03b added more logging and missing err handler in subscription updater 2016-03-31 17:28:03 +01:00
Shane Kilkelly
0ce514a5a6 Add features to the user object in ide. 2016-03-31 17:10:49 +01:00
Henry Oswald
5a201153c7 refactored subscription updater again adding _setUsersMinimumFeatures
single place you can call and the users minimum features are set
2016-03-31 16:58:16 +01:00
Henry Oswald
cb3eb88af2 Merge branch 'subscriptionimprovements' 2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5 fixed change payment details page
also increased size of year field for firefox users
and removed unnded options in new plan page
2016-03-31 11:54:52 +01:00
Shane Kilkelly
059d3432c2 Allow citations like -parencite[page 6]{ to work. 2016-03-30 11:28:56 +01:00
Henry Oswald
c7da9f1eef added different check to contact-us modal 2016-03-29 14:25:59 +01:00
Henry Oswald
1a651b38f4 added sendgrid as email option 2016-03-29 14:15:33 +01:00
Henry Oswald
e2dffdf722 when user contact us put project url at bottom of message 2016-03-24 14:23:18 +00:00
Henry Oswald
e9478e0843 Merge branch 'templatessearch' 2016-03-24 12:06:41 +00:00
Henry Oswald
6662d4c2cd wired up modal for learn and added translations 2016-03-24 12:05:54 +00:00
James Allen
63c183402c Style active and focus states of search results too 2016-03-24 11:42:48 +00:00
James Allen
9b84e1b164 Improve styling of wiki search 2016-03-24 11:38:56 +00:00
Henry Oswald
ce2cfeaa5b don't show search bar in templates if its not configured 2016-03-24 09:52:19 +00:00
Henry Oswald
6a4e13d3c8 added templates angular file forgoten in last commit 2016-03-24 09:35:11 +00:00
Henry Oswald
7634fcf3af added missing page button (not wired up) to /learn 2016-03-23 18:23:09 +00:00
Henry Oswald
90092a0c61 improved styling, not perefect still 2016-03-23 16:05:38 +00:00
James Allen
3fe0674462 Revert "Add error handling in mkdir_p"
This reverts commit c2458cd19018fe05199ce3b33fd4e9230d1cf319.

Apparently mkdirp needs errors to be ignored to work...
2016-03-23 15:33:01 +00:00
James Allen
4d0fe3bf5d Add error handling in mkdir_p 2016-03-23 15:18:10 +00:00
James Allen
ae5467894b Standardise on one Errors file 2016-03-23 15:14:49 +00:00
James Allen
a95c941cb9 Fix FileStore unit tests 2016-03-23 15:13:32 +00:00
James Allen
bad9a0282d Add missing error handler 2016-03-23 14:38:11 +00:00
James Allen
c827407a99 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-23 11:29:59 +00:00
James Allen
3d8ac9f292 Add in a few null checks
These were discovered by using a project that was messed up with the moving
folder bug where the folder ended up without an id, docs or fileRefs array
2016-03-23 10:54:36 +00:00
Henry Oswald
de0aa1035d pulled tempaltes search into its own file 2016-03-22 22:29:18 +00:00
Henry Oswald
9cfbbfa504 template search works nicely, needs styling 2016-03-22 22:16:38 +00:00
Henry Oswald
cf45b8bd74 Merge branch 'master' into templatessearch 2016-03-22 21:35:36 +00:00
Henry Oswald
c554b0630d if user has subscription before joining group is given option to cancel personal one 2016-03-22 16:59:47 +00:00
Shane Kilkelly
62ececeef8 show logs on failure. 2016-03-22 16:59:40 +00:00
Henry Oswald
a6859e22b3 if user is member of group on downgrade use the group subscription 2016-03-22 16:05:46 +00:00
Shane Kilkelly
2c321a4803 If the compile request errors out, set view to 'errors'. 2016-03-22 15:51:05 +00:00
Shane Kilkelly
b212f33505 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 15:21:00 +00:00
James Allen
9706585d21 Fix translate in delete modal confirm button 2016-03-22 14:44:13 +00:00
Shane Kilkelly
12b0e982c8 Don't raise an error if output.blg cannot be found. 2016-03-22 14:42:00 +00:00
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
Henry Oswald
c980382196 make calls to learn wiki run in parallel,
only saves about 150ms but ever little helps
2016-03-17 12:55:28 +00:00
Shane Kilkelly
d655e99439 Parse existing begin commands too. 2016-03-17 12:07:21 +00:00
Shane Kilkelly
eebd25351d Add the custom environments to the list of snippets 2016-03-17 11:23:53 +00:00
Shane Kilkelly
c25c2b676a Parse \newenvironment{} commands. 2016-03-17 11:14:05 +00:00
Shane Kilkelly
115734f82e Rename Snippets -> SnippetManager 2016-03-17 10:04:14 +00:00
Shane Kilkelly
7cc3f7613e Move the getCompletions call for Snippets into the Snippets module. 2016-03-17 10:00:07 +00:00
Shane Kilkelly
2985a0b0b2 Account for later commands on the same line. 2016-03-16 11:42:30 +00:00
Shane Kilkelly
027c82ed6b Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-15 16:02:54 +00:00
Shane Kilkelly
cff00c09b0 Add a '}' at the end of citation autocomplete if required. 2016-03-15 16:02:48 +00:00
James Allen
60a39f82c1 Fix off by one bug in moving folders from using an out of date project structure 2016-03-15 15:14:54 +00:00
James Allen
75d9912449 Use _.defaults to simplify assigning default features 2016-03-15 14:44:06 +00:00
James Allen
b7d226f434 Make privilege level check in EditorHttpController more explicit 2016-03-15 14:39:27 +00:00
James Allen
261466b042 Convert privilege levels to an enum 2016-03-15 14:35:01 +00:00
James Allen
398d43e2d1 Add missing ? check 2016-03-15 14:15:25 +00:00
James Allen
724e6b5263 Require explicit value of true for ENV variables in config 2016-03-15 14:14:33 +00:00
James Allen
fe1f71413e Use ProjectGetter, not Project, in ProjectController.loadEditor 2016-03-15 14:12:43 +00:00
James Allen
d09705142e Add in missing error checks 2016-03-15 14:07:34 +00:00
James Allen
5781894453 Do array null check in callback args 2016-03-15 14:05:59 +00:00
Henry Oswald
76b3a78988 added lock around move element 2016-03-15 12:29:41 +00:00
Henry Oswald
d07e084446 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-15 11:34:46 +00:00
Henry Oswald
ba9bc3a2e8 check that element being inserted has an _id 2016-03-15 11:29:59 +00:00
James Allen
b556d57f40 Remove missed console.log debugging lines in AuthenticationController.coffee 2016-03-14 17:11:23 +00:00
James Allen
71ef045728 Implement authorization guards in Authorization{Manager,Controller} 2016-03-14 17:06:57 +00:00
Shane Kilkelly
2d4ced6a1c If user is not project owner, ask them to ask the owner to upgrade. 2016-03-14 16:19:08 +00:00
Henry Oswald
f24bc2c501 log out error when can't send to tpds worker 2016-03-14 14:44:45 +00:00
Henry Oswald
1b39b01114 check err on _putElement for file in project 2016-03-14 14:42:13 +00:00
Henry Oswald
8be55f760f swallow error if tpdsworker can not be comunicated with on addFile 2016-03-14 10:49:28 +00:00
Henry Oswald
3fc357a343 Merge branch 'master' into projectsizelimit 2016-03-14 10:31:07 +00:00
Henry Oswald
086875d50c added logging 2016-03-14 10:08:47 +00:00
Henry Oswald
15c6e49d1a if user changes email then check if they have a site licence 2016-03-13 22:31:14 +00:00
Henry Oswald
88f8b701c8 Merge branch 'fschecks' 2016-03-13 15:52:13 +00:00
Henry Oswald
8812ff445e change zip size check to spawn 2016-03-12 15:43:16 +00:00
Henry Oswald
f11ba97389 check stat.isFile and isDirectory rather then symlink 2016-03-12 15:05:29 +00:00
Henry Oswald
6664b67fba check size of zip files 2016-03-12 12:38:21 +00:00
Henry Oswald
da242d90e6 added extra isSymLink checks into reading files 2016-03-12 12:01:36 +00:00
Henry Oswald
7e216391b7 wip 2016-03-12 10:55:17 +00:00
Shane Kilkelly
3ba5808074 Merge branch 'master' into sk-biber-errors 2016-03-11 13:54:06 +00:00
Shane Kilkelly
c4d49f6cf9 Update parser 2016-03-11 13:53:39 +00:00
Shane Kilkelly
5b9fa6d7d6 Upgrade parser. 2016-03-11 11:20:24 +00:00
James Allen
1bd8b8d1a3 Delete SecurityManager and replace with (unwritten) AuthorizationManager 2016-03-10 17:17:26 +00:00
James Allen
3e03164ed4 Remove dead auth_token code 2016-03-10 17:15:14 +00:00
Henry Oswald
36966f0c9b wip 2016-03-10 17:11:28 +00:00
Shane Kilkelly
170d3f646b Upgrade parser. 2016-03-10 16:01:54 +00:00
Henry Oswald
347bfe4a79 use cb for internal callbacks 2016-03-10 12:43:36 +00:00
Henry Oswald
3c4e74af4b project duplicator works and tests pass.
not so bad now.
2016-03-10 12:42:21 +00:00
Henry Oswald
d801ab623a project duplicator works, tests don't 2016-03-10 11:58:05 +00:00
James Allen
e36be96ec9 Move public access setting to its own end point 2016-03-10 11:13:57 +00:00
James Allen
d235ab22ed Add in tests for public read-only projects 2016-03-09 16:28:46 +00:00
James Allen
c46c083b31 Check write access to documents via real-time end point 2016-03-09 16:26:18 +00:00
Shane Kilkelly
9281d8029d Upgrade the bib log parser to handle bibtex errors and warnings. 2016-03-09 16:11:25 +00:00
Henry Oswald
bf8f9f6d41 change key to maxEntitiesPerProject 2016-03-09 15:53:03 +00:00
James Allen
2116d0271c Update acceptance tests for public projects 2016-03-09 15:30:23 +00:00
Henry Oswald
f108c01ea5 don't do a project rename if the name is the same
this prevents double renaming which happens when you press
enter as well as no name change
2016-03-09 14:47:57 +00:00
Henry Oswald
940586f654 sped up unit tests to improve speed
also removed some unneeded requires.
2016-03-09 12:51:19 +00:00
James Allen
4f9f255153 Extend acceptance tests to include shared projects 2016-03-09 12:31:46 +00:00
Henry Oswald
a33b480c67 added more logging to subscription group handler 2016-03-09 11:20:17 +00:00
Henry Oswald
5be05a35d8 added WithProject versions of functions
rather than project_or_id
2016-03-09 11:16:27 +00:00
Shane Kilkelly
cb28fe0891 use the renamed bib-parser. 2016-03-08 16:18:02 +00:00
James Allen
e1fa77dd72 Add beginnings of acceptance tests 2016-03-08 15:59:04 +00:00
Shane Kilkelly
6911de1149 Merge branch 'master' into sk-biber-errors 2016-03-08 14:55:19 +00:00
Henry Oswald
57f00d76bd get project name on entity move 2016-03-08 14:46:53 +00:00
James Allen
37c966ba7e Fix unit test 2016-03-08 14:42:11 +00:00
Shane Kilkelly
8f2d2cfeff Merge branch 'ja_email_tokens' of github.com:sharelatex/web-sharelatex into ja_email_tokens 2016-03-08 14:38:31 +00:00
Shane Kilkelly
3e423b8a06 Another find->findOne 2016-03-08 14:38:25 +00:00
Henry Oswald
ede159d833 changed logging for archiving projects from delete to archived 2016-03-08 14:38:23 +00:00
James Allen
e53fc5f0b6 Remove dead code (Project.findPopulatedById) 2016-03-08 14:20:53 +00:00
James Allen
76af5e5563 Don't call deprecated findPopulatedById in loadEditor 2016-03-08 14:20:00 +00:00
James Allen
359689ffea find -> findOne 2016-03-08 14:19:38 +00:00
Henry Oswald
3643f6ef4f Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-08 14:13:40 +00:00
James Allen
0882eb2a99 Don't use deprecated Project.findPopulatedById in ReferencesManager 2016-03-08 14:05:56 +00:00
Shane Kilkelly
471cb95091 Clean up a bit, and upgrade parser. 2016-03-08 14:04:42 +00:00
Shane Kilkelly
08de7b8abe Upgrade biber-log-parser.js 2016-03-08 13:56:17 +00:00
Shane Kilkelly
f6d02090d2 First pass at parsing and showing decent biber errors. 2016-03-08 13:20:23 +00:00
James Allen
b64c8e3d78 Delete dead code in User model 2016-03-08 12:07:50 +00:00
James Allen
40048d49a2 Fix unit test 2016-03-08 12:07:42 +00:00
James Allen
5f5445f625 Use TpdsUpdateSender to use CollaboratorsHandler 2016-03-08 11:54:45 +00:00
James Allen
e814dfa7a8 Proxy .gif files to the blog too 2016-03-07 16:39:16 +00:00
James Allen
a50bdaf5cc Refactor LimitationsManager to use CollaboratorsHandler 2016-03-07 15:32:04 +00:00
James Allen
bedc8a0492 Remove ProjectGetter.populateProjectWithUsers 2016-03-07 15:25:10 +00:00
James Allen
2ba2b72fd1 Refactor ProjectDeleter to use CollaboratorHandler 2016-03-07 12:27:40 +00:00
James Allen
6d93076d51 Refactor getCollaborators http method to use CollaboratorsHandler 2016-03-07 12:02:48 +00:00
James Allen
1a689aa1fd Move findAllUsersProjects from Project to ProjectGetter 2016-03-03 17:19:03 +00:00
James Allen
120a142733 Add in required abstracted functions to CollaboratorsHandler 2016-03-03 16:13:19 +00:00
Brian Gough
d89e855314 add client-side spelling cache to reduce load on server 2016-03-03 16:00:10 +00:00
Shane Kilkelly
020e1b9b34 Add styles for the references search hint. 2016-03-03 11:44:11 +00:00
Henry Oswald
4af0341e84 don't stop if add entity doens't make it to tpdsworker 2016-03-02 17:34:21 +00:00
Henry Oswald
789abe504d added random ticket number to groove tickets 2016-03-02 12:23:51 +00:00
Henry Oswald
8a4a320f4b done -> close on modal for sharing 2016-03-01 20:17:15 +00:00
Shane Kilkelly
d76e5fdbf4 Styles for references search journal 2016-03-01 16:29:19 +00:00
Henry Oswald
39c7010d72 fixed broken tests 2016-02-29 22:51:46 +00:00
Henry Oswald
76591ebb23 made ProjectGetter.getProject more robust
it can deal with multiple types of query better, including mongoose ids which are not being matched like mongojs ids.
2016-02-29 19:01:46 +00:00
Henry Oswald
6a7395a287 brought back the project_or_id style
Added functionality into project getter, its a big performance improvement for things like cloning projects. Clone a 500 element project, 1 mongo get or 500.
2016-02-29 17:34:38 +00:00
Henry Oswald
b5dd96aa71 fixed some mongo calls in project entity handler
need to specify fields you want to not get array back.
2016-02-29 16:03:22 +00:00
Shane Kilkelly
ca43d27244 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-02-29 15:52:09 +00:00
Shane Kilkelly
b005f8233e guard against null and undefined keys in \cite{} autocomplete 2016-02-29 15:52:02 +00:00
Henry Oswald
1e8523c227 don't emmit to room new entities if they errored. 2016-02-29 13:05:37 +00:00
Henry Oswald
8f0d1dc73e add in the calls to block large projects 2016-02-29 13:05:17 +00:00