github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-12-18 16:52:32 -05:00
Code Issues Projects Releases Packages Wiki Activity
2605 commits 3 branches 7 tags 206 MiB
Commit graph

1664 commits

Author SHA1 Message Date
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
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
Henry Oswald
8aec86af4e moved count element to project entity handler and added tests 2016-02-26 13:25:09 +00:00
Henry Oswald
d95526bd8b ProjectGetter.findRootDoc moved to mongojs 2016-02-26 08:35:10 +00:00
Henry Oswald
eedaa43b58 move project duplicator to mongojs 2016-02-26 08:32:00 +00:00
Henry Oswald
6ca69f88ac Move project locator to mongojs 2016-02-26 08:31:47 +00:00
Henry Oswald
586d4cbae1 replaced all mongoose Project.find with mongojs calls 2016-02-26 08:23:43 +00:00
Henry Oswald
b6d62a677b ProjectDeleter.archiveProject doesn't need to get entire project 2016-02-26 08:13:41 +00:00
Henry Oswald
447568aa91 ProjectDetailsHandler.getDetails does not need full project 2016-02-26 07:56:26 +00:00
Henry Oswald
43102e0ffc lowercase and trim add user to group email address 2016-02-25 14:15:56 +00:00
James Allen
155831c3e7 Skip top-level directory if it exists in zip upload 2016-02-24 17:21:20 +00:00
James Allen
71ca358e0e Show confirmation if upload will overwrite files 2016-02-24 16:37:03 +00:00
James Allen
c6dcb64b18 Overwrite text files from uploads 2016-02-24 16:37:03 +00:00
Henry Oswald
09ac8f8c7a move .putElement into ProjectEntityHandler with tests 2016-02-24 15:36:39 +00:00
Henry Oswald
a8060109fd spike of limit 2016-02-24 08:06:40 +00:00
Henry Oswald
1e6f5997dc use cb for internal async callbacks and inline call 2016-02-23 15:50:30 +00:00
Henry Oswald
7a28eeeaa0 ProjectEntityHandler.addFolder take only project id and 
only gets project folder structure
 2016-02-23 15:45:40 +00:00
Henry Oswald
1278081b51 mkdirp only needs folder strucutre 2016-02-23 15:36:59 +00:00
Henry Oswald
1d76850ebd copyFileFromExistingProject does not need the whole project 2016-02-23 15:34:31 +00:00
Henry Oswald
6f474d9a00 put element just needs project folder structure not docs inside 2016-02-23 15:27:55 +00:00
James Allen
2c20b7d16f Bring full screen PDF icon into scrollable div 2016-02-23 15:25:04 +00:00
James Allen
ff7632d6c7 Don't reload editor with file tree or PDF viewer hidden 2016-02-23 15:21:54 +00:00
Henry Oswald
b504732733 fixed calls to addUserToGroup and added more logging 2016-02-22 16:50:41 +00:00
Henry Oswald
103bb1c88f add more error logging to group handler 2016-02-22 16:01:26 +00:00
Henry Oswald
85a8bc97ed add leave group button for group subscriptions 2016-02-19 12:27:32 +00:00
Shane Kilkelly
b505f0d455 Merge branch 'sk-references-search' 
Conflicts:
	app/coffee/Features/References/ReferencesController.coffee
 2016-02-19 11:30:55 +00:00
James Allen
bf36413491 Improve styling of upgrade messages 2016-02-18 14:53:49 +00:00
Henry Oswald
29e4b324fd improve calls for invite notifications and auto mark as read 2016-02-18 11:43:43 +00:00
Henry Oswald
f824a3e28a kill off dead code in group handler 2016-02-18 11:42:26 +00:00
Henry Oswald
bd54cc722a fixed broken tests in AuthenticationController 2016-02-18 10:16:50 +00:00
Henry Oswald
fc4bd94a6e don't create notification if user is already part of group 2016-02-18 10:06:21 +00:00
Henry Oswald
c8084406d3 user notifications auto created on login for joinging groups 2016-02-17 16:24:09 +00:00
Henry Oswald
8a417035ea remove unned debug line 2016-02-17 16:23:52 +00:00
Henry Oswald
735f7bd51e change res.send to res.sendStatus for new express 2016-02-16 12:38:27 +00:00
Henry Oswald
f5910762c1 fixed missign translation for when email is already registered 2016-02-16 12:38:27 +00:00
James Allen
b3a2d44937 next -> callback 2016-02-16 11:12:07 +00:00
Henry Oswald
87ef2cc563 Merge branch 'nodemailer2' 2016-02-15 14:52:58 +00:00
Henry Oswald
ef148da7aa remove un needed require 2016-02-12 17:15:13 +00:00
Henry Oswald
05bf048885 upgrade to nodemailer 2.0 and dynamically use either SES or SMTP depending 
on what is in settings file
 2016-02-12 17:13:45 +00:00
James Allen
e4960e782f Merge branch 'ja-multi-select' 2016-02-12 11:56:10 +00:00
Henry Oswald
0538ca2de5 added box shadow to notifications alert and made it info 2016-02-11 12:34:38 +00:00
Henry Oswald
8e5907f79e have null array as default for notifications 2016-02-11 12:10:30 +00:00
Henry Oswald
5c5888b5dc Merge branch 'pr/221' 2016-02-11 11:44:45 +00:00
James Allen
506d2224aa Allow Cmd+Clicking to multi select entries in the file tree 2016-02-09 15:13:58 +00:00
Shane Kilkelly
326d9e59f8 Refactor ReferencesSearch* to just References*. 2016-02-08 17:04:27 +00:00
James Allen
b978171e0c Fix "cannot set headers after sent" in setting doc end point 
If somehow a project ends up with the same doc/file in two locations in the
file tree, then projectLocator.findElement will return the callback for
both entries. This then tries to end the request multiple times. Of course
this should never be a state the project is in, but if it is we should catch it.
 2016-02-05 15:39:26 +00:00
Henry Oswald
de0589b051 added notifications calls for sending to api and mark as read 
not creating it yet
 2016-02-05 14:13:38 +00:00
James Allen
a6793be3cf Improve presentation of hotkeys and add bold+italics 2016-02-04 15:52:38 +00:00
Henry Oswald
f136486f4b cleanup layout of notifications 2016-02-04 14:28:31 +00:00
James Allen
6143b2218c Send user_id on Dropbox requests through to doc updater 2016-02-04 14:27:00 +00:00
James Allen
8a095a5144 Upgrade to PDF 1.3.91 2016-02-04 14:27:00 +00:00
Henry Oswald
9d61a58710 slighly change layout of notifications & insert html via angular 2016-02-04 12:11:45 +00:00
Henry Oswald
47eebb1840 add null check and default empty object for subscirption dashboard 2016-02-03 17:41:05 +00:00
Henry Oswald
8af9aa6396 move wufoo form on plans page to groovehq 2016-02-03 16:50:34 +00:00
Henry Oswald
7994528c92 make site licence regex more specific 2016-02-03 16:08:29 +00:00
James Allen
4c626f23e7 Merge pull request #224 from sharelatex/ja_draft_mode 
Draft mode for compiles
 2016-02-02 15:04:21 +00:00
James Allen
425a9b9db2 Add in option to compile in draft mode 2016-02-02 14:50:48 +00:00
Henry Oswald
6cd66c7304 allow rate limiter to work on api router where session does not exist 2016-02-02 12:31:54 +00:00
Henry Oswald
1f6b43e1b1 added universties site angular controler 2016-02-01 14:33:50 +00:00
James Allen
3d9f326219 Update translation strings for tags 2016-02-01 10:18:57 +00:00
James Allen
b32178182d Explicitly create tags and get their id 2016-02-01 10:18:56 +00:00
James Allen
77cc6af35e Update add tag end point to use tag_id 2016-02-01 10:18:56 +00:00
James Allen
f1e65cc776 Use tag_id for deleting tags from project 2016-02-01 10:18:56 +00:00
James Allen
1bd5aef85f Allow renaming of tags 2016-02-01 10:18:56 +00:00
James Allen
1a86e69d1f Allow tags to be deleted 2016-02-01 10:18:56 +00:00
Shane Kilkelly
50a451970b Merge branch 'master' into sk-references-2 2016-01-28 10:06:41 +00:00
Shane Kilkelly
cc818695ef Split References.index into index and indexAll. 2016-01-27 16:00:53 +00:00
Shane Kilkelly
ec8a12d445 Flush changes to mongo before sending request to references service 2016-01-27 13:33:42 +00:00
Shane Kilkelly
fed10280ab Use docstore url rather than going through web api. 2016-01-27 09:58:54 +00:00
Shane Kilkelly
d1e53f0cb8 Test ReferencesSearchHandler.index 2016-01-26 16:14:17 +00:00
Shane Kilkelly
8a991b0d06 Start testing ReferencesSearch feature 2016-01-26 14:29:23 +00:00
Henry Oswald
690b195f1a move login success to .json as it sends json over 2016-01-25 17:35:57 +00:00
Shane Kilkelly
a3cee72663 Remove old routes and debug prints. 2016-01-25 13:56:07 +00:00
Henrique Santos
9429e49cf8 finishing frontend 2016-01-22 18:08:39 -02:00
Shane Kilkelly
c911b7d6a3 Broadcast references-key changes back to connected clients. 2016-01-22 15:59:43 +00:00
Shane Kilkelly
af75bb8a60 wip: change how indexing of references works. 2016-01-22 14:23:59 +00:00
Henrique Santos
2d11705837 fix issues in first commit 2016-01-22 03:41:22 -02:00
Henrique Santos
476eaa8b84 add notification backend and unit test 
add notification init frontend
 2016-01-21 18:42:50 -02:00
Shane Kilkelly
307f78b831 WIP: send multiple bib files and get back keys 2016-01-21 17:01:24 +00:00
Shane Kilkelly
d5d5ba9066 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-01-20 14:02:24 +00:00
Shane Kilkelly
0b28e7e964 send a fullIndex flag along to references service. 2016-01-20 13:53:28 +00:00
James Allen
bcb9e1180b Add jobs page 2016-01-20 11:56:08 +00:00
James Allen
38876a9d4c Don't show publish buttons when showing free trial for templates 2016-01-19 16:10:50 +00:00
James Allen
ed5872702a Pass image to wordcount end point in CLSI 2016-01-19 14:17:01 +00:00
James Allen
5125aa0089 Make templates a premium feature 2016-01-19 13:37:22 +00:00
Shane Kilkelly
41aaefc1f6 Enable pre-indexing of references 2016-01-18 11:41:30 +00:00
Shane Kilkelly
2a7894f6e4 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-01-15 14:41:12 +00:00
Shane Kilkelly
20757b11b8 Add code to automatically index bib files on project load. 2016-01-15 14:41:05 +00:00
James Allen
03d75944b0 Allow image name to be configured 2016-01-15 10:26:36 +00:00
Shane Kilkelly
b49ed15c14 Fix missing comma 2016-01-14 15:13:19 +00:00
Shane Kilkelly
ca0a625dcc Begin work on indexing the references when project is opened. 2016-01-14 14:53:08 +00:00
Shane Kilkelly
1e904e6ab7 Merge branch 'master' into sk-references-ac 2016-01-13 11:31:58 +00:00
Henry Oswald
d202538504 added ng-cloak to successful subscription page 2016-01-04 12:22:31 +00:00
Henry Oswald
a181905ab8 removed console.log 2016-01-04 11:42:54 +00:00
Henry Oswald
5f66dbebf4 2015 -> 2016 2016-01-04 11:12:10 +00:00
Shane Kilkelly
77333c923b Merge branch 'master' into sk-references-ac 2016-01-04 09:37:10 +00:00
Shane Kilkelly
a63028bad3 Test the ReferencesSearchHandler 2015-12-31 10:28:19 +00:00
Shane Kilkelly
d9ca9fc06d Fix comically long lines. 2015-12-31 09:22:35 +00:00
Shane Kilkelly
86d69f3275 Start testing ReferencesSearch. 2015-12-30 15:08:12 +00:00
Henry Oswald
134e733b01 change succesful subscription message 2015-12-21 10:31:22 +00:00
Shane Kilkelly
8c9c476dd7 Fetch the list of keys from references index. 2015-12-18 16:00:24 +00:00
Shane Kilkelly
c9db11edbe Change to using project_id rather than user_id in references index. 2015-12-18 14:57:36 +00:00
Shane Kilkelly
e684968a59 Add ability to request the doc as plain text, rather than a json object. 
This makes it much easier to stream-parse the document.
 2015-12-18 13:36:25 +00:00
Shane Kilkelly
1ea13a74dd Refresh the references when the bib file is closed. 2015-12-17 15:13:02 +00:00
Shane Kilkelly
249dd638ec experimental: update references index from fronted. 2015-12-17 11:51:14 +00:00
Henry Oswald
1ad27bb6ed changed left menu test to show random benefit to users 2015-12-16 12:40:34 +00:00
Henry Oswald
501763bb4e changed add doc to use ligher mongo call (folders only) 2015-12-15 13:27:41 +00:00
Henry Oswald
763f16f43c Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-12-12 11:39:54 +00:00
James Allen
e8f21986dd Refactor registration so it can be called from modules 2015-12-11 17:11:20 +00:00
James Allen
c0dfdb3bd8 Use translations for activation page 2015-12-11 14:25:17 +00:00
James Allen
c40b882ee2 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-12-11 11:30:20 +00:00
James Allen
1e8ab5357b Improve pre-registered account activation process 2015-12-11 11:30:06 +00:00
Henry Oswald
13af9b7b56 find project by name should only find active projects 2015-12-10 17:06:00 +00:00
Brian Gough
ba6c361afa decrease sentry sample rate to 1% 2015-12-10 14:18:20 +00:00
Henry Oswald
297e33f1a0 remove unneeded hide on cancelation basic 2015-12-09 14:44:26 +00:00
Henry Oswald
d5cf8f6886 simplified cancelation logic 2015-12-09 13:58:26 +00:00
Henry Oswald
7a88afc953 make button for downgrade centered and lower 2015-12-09 12:09:17 +00:00
Henry Oswald
bdc2206ef1 yes_please != yes_please! 2015-12-09 12:03:18 +00:00
Henry Oswald
db8349351d escape html in cancel message 2015-12-09 12:01:55 +00:00
Henry Oswald
e6f92c181f ill_take_it != ill_take_it! 2015-12-09 12:00:31 +00:00
Henry Oswald
56fa51f9b2 got translations done for subscription dashboard 2015-12-09 11:24:14 +00:00
Henry Oswald
aafdeb031e wip - downgrade options it all works, need unit tests & translations 2015-12-08 18:23:28 +00:00
Henry Oswald
8fb1f9e00b wip: downgrade to student if they are a collab monthly 2015-12-08 15:45:52 +00:00
Henry Oswald
5c05d02840 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-12-08 11:38:29 +00:00
Henry Oswald
fc7ca5ef74 tried changing a couple of sentry ignore to regex's 2015-12-08 11:38:21 +00:00
Brian Gough
cd4ab35fbc only send a 5% sample of sentry errors 2015-12-08 11:34:11 +00:00
Henry Oswald
7e31851949 fix margin for modal alerts on upload 2015-12-08 08:50:11 +00:00
Henry Oswald
156f646613 increase number of files that can be uploaded & limit 1 concurent 2015-12-07 16:50:09 +00:00
Henry Oswald
88799fc881 add help link when user needs to refresh page 2015-12-04 08:43:55 +00:00
Henry Oswald
25411189a7 redirect to login if session expired in file upload 2015-12-02 15:40:14 +00:00
Henry Oswald
6738fdd1fc added translation for rate limit message to client 2015-12-01 13:11:19 +00:00
Henry Oswald
8590af3e49 added rate limit on server side for file uploads 2015-12-01 13:08:49 +00:00
Henry Oswald
a6aea41fb1 added max of 20 files which can be uploaded at same time to client 2015-12-01 12:55:35 +00:00
Henry Oswald
69734c20c0 added heapdump endpoint 2015-11-30 16:16:16 +00:00
Henry Oswald
4fa38178be ignore some common errors in sentry 2015-11-30 13:49:46 +00:00
Henry Oswald
91a84cb232 increase compile throttle limit 2015-11-25 11:07:53 +00:00
Henry Oswald
8ca962b734 added missing convert handler 2015-11-24 14:17:40 +00:00
Henry Oswald
89b2cd8477 added secure banner to both payment forms 2015-11-23 17:10:53 +00:00
Henry Oswald
61182451f1 removed SubscriptionDomainHandler from user controller 2015-11-23 15:12:30 +00:00
Henry Oswald
333c1be68f added dropbox and github promo on left hand side 2015-11-23 15:12:17 +00:00
Henry Oswald
003cdc01fc consolidated 2 options in payment left menu 2015-11-18 15:21:48 +00:00
Henry Oswald
5a9174b1de use user_id for client side six pack. also change name of editor free trial test 2015-11-17 15:54:59 +00:00
Henry Oswald
b1c0dfb0e4 show discount rate on pricing page 2015-11-17 12:23:27 +00:00
Henry Oswald
264839e27d don't show tax or subtotal if there is no info on it 2015-11-17 11:44:31 +00:00
Henry Oswald
d959a51f36 show normal price if there is a discount 2015-11-17 11:42:03 +00:00
Henry Oswald
471b285ad7 changed plan choice using ab sixpack not ga 2015-11-16 16:40:14 +00:00
Henry Oswald
f7854649e2 added 20% off option 2015-11-16 15:58:04 +00:00
Henry Oswald
05c45cd658 changed upgrade to list features 2015-11-16 14:36:59 +00:00
Henry Oswald
3ef18a09eb removed finished sixpack test 2015-11-16 12:21:24 +00:00
Henry Oswald
ba58509a67 increased length rate limit is in effect for 2015-11-16 12:21:06 +00:00
Henry Oswald
56635d2221 set timeout for sixpack server dynamically, needs to be longer for local dev 2015-11-12 12:43:55 +00:00
Henry Oswald
8a6c3b5838 covert payment-left-menu test 2015-11-12 09:57:06 +00:00
Henry Oswald
377cc11c3b added sixpack to server side 2015-11-12 09:29:44 +00:00
Henry Oswald
3a61f48068 added payment page with security seal 2015-11-11 17:59:35 +00:00
Henry Oswald
e4b36e6c5c moved where ask_proj_owner_to_upgrade_for_history shows up in rendering issue 2015-11-11 17:25:28 +00:00
Henry Oswald
cf6998cac3 added ab test into payment page left hand feature list 2015-11-11 16:42:04 +00:00
Henry Oswald
453415ff7c fixed tab index on payments page 2015-11-11 16:22:07 +00:00
Henry Oswald
4e8eebb482 increase rate limit threshold on pdf downloads 2015-11-11 09:00:38 +00:00
Henry Oswald
16670cb3e3 only rate limit full pdf downloads 2015-11-10 16:23:55 +00:00
Henry Oswald
da9535f442 fix an alignment issue 2015-11-10 15:38:05 +00:00
Henry Oswald
b6b252b1f8 only participate in track changes test if they are shown view 2015-11-10 15:14:27 +00:00
Henry Oswald
23fd12c67d dropped throttle for full pdf download to 30 over 5 mins 
1 download every 10 seconds which seems ample
 2015-11-10 11:53:11 +00:00
Henry Oswald
615e4b448a fix search on project list page. ng-if breaks it but ng-show does not for some reason 2015-11-10 11:36:11 +00:00
Henry Oswald
c8ba7b72ab Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-10 10:36:06 +00:00
James Allen
a153c6682a Put in client side check for document getting too long 2015-11-06 12:51:43 +00:00
James Allen
9dcc251017 Copy header values so they can be modified by modules each request 2015-11-05 16:52:50 +00:00
James Allen
16b7bf222a Merge branch 'contacts' 2015-11-05 10:14:25 +00:00
James Allen
21f702a42e Fix bug with click on share button registering 2015-11-04 14:33:27 +00:00
Henry Oswald
77d349dd8f added more long form list of features on track changes upgrade 2015-11-02 18:44:26 +00:00
Henry Oswald
0ef8d77ce3 project list minimal to work with projects 2015-11-02 18:44:12 +00:00
Henry Oswald
79c4c6e26b added split test for on boarding, doing cut down view 2015-11-02 16:15:56 +00:00
James Allen
c46f62cfc1 Ensure that a user can only be added to project once 2015-11-02 15:21:41 +00:00
Henry Oswald
cf48c94725 rate limit pdf downloads 2015-10-30 11:56:01 +00:00
Henry Oswald
730088b6ab set button colour to red for free trial 2015-10-27 23:35:13 +00:00
Henry Oswald
2d03410c42 removed some editor actions sent to google analytics as we are sending too much data 2015-10-27 23:28:54 +00:00
Henry Oswald
6c75a6dbe5 change six pack key and add into default settings 2015-10-27 11:37:11 +00:00
Henry Oswald
b9187ebd08 added test to wording for datajoy popup 2015-10-27 10:58:51 +00:00
Henry Oswald
8f1d09beea added six pack to web 2015-10-27 10:58:27 +00:00
Henry Oswald
5e19d710ba change error handling on spelling 2015-10-22 20:15:50 +01:00
Henry Oswald
1c91de0395 added function to get project with only folders for quicker adding of files to large projects 2015-10-21 16:56:06 +01:00
Henry Oswald
885915916a check if user exists on recurly callback 2015-10-21 11:27:13 +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
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
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
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
Henry Oswald
2f48568f76 fix free trial button on timeout view 2015-10-15 11:38:01 +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
f5162d424f if a user is inactive for 12 hours disconect them. 2015-10-14 14:28:24 +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
James Allen
d11d536994 Refactor adding and removing collaborators to not go through EditorController 2015-10-08 14:15:36 +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
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
Henry Oswald
a73b2ceb37 Merge branch 'connect-failed' 2015-10-07 11:30:48 +01:00
Henry Oswald
b69ec9768d bonus allocater does not need to check if user has subscription any more. 2015-10-05 16:50:34 +01:00
James Allen
64ffcde3df Namespace subscription groups as SubscriptionGroup 2015-10-05 16:37:03 +01:00
Henry Oswald
fae7d431f4 after subscription is updated always check bonus 2015-10-05 16:33:13 +01:00
Henry Oswald
9a60617162 change referral allocated to only upgrade features and to find highest level 
i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.
 2015-10-05 12:30:03 +01:00
Shane Kilkelly
15847f8921 Add the 'release' attribute to Sentry configuration. 2015-09-29 15:41:25 +01:00
Shane Kilkelly
b4c7209a11 Try to reconnect either on editor-cursor move, or when any thing in the page is clicked. 2015-09-29 10:23:21 +01:00
Shane Kilkelly
30a63d1e42 Remove ng-click on output files, which was causing a double-request for download. 2015-09-22 10:11:03 +01:00
Henry Oswald
24007affa7 change admin link to /admin/user 
this is the page for the admin panel, if the panel is installed
then it will load, otherwise a redirect to register users has been
added in.
 2015-09-16 12:17:58 +01:00
Henry Oswald
70611da833 added a null check to getRequestUserAndProject 2015-09-15 12:47:48 +01:00
Henry Oswald
5ffd76c670 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-09-14 15:36:08 +01:00
Henry Oswald
9a72667e91 added word count UI feature. 2015-09-14 15:28:19 +01:00
Shane Kilkelly
5e157bcd16 Fix a case where a null user would cause displayName to crash. 2015-09-14 12:27:27 +01:00
Shane Kilkelly
77ac6c1baf Merge branch 'master' of github.com:sharelatex/web-sharelatex 2015-09-14 12:08:11 +01:00
Shane Kilkelly
7bc9218b3c Fix up a bunch of issues with the track-changes list view. 
- not crash when a user is null
- fix alignment of user color square
- if first and last name are absent, display email instead
- truncate overly long display name with '...'
 2015-09-14 12:08:05 +01:00
Henry Oswald
507e8d13a6 Merge pull request #200 from heukirne/wordcount 
Wordcount hook
 2015-09-11 16:22:15 +01:00
Shane Kilkelly
778f588741 Merge pull request #199 from sharelatex/sk-missing-users 
When a user is null in track-changes UI, display them as "Anonymous".
 2015-09-11 14:24:08 +01:00
Henrique Dias
d228fd88ab add worcount file param 2015-09-11 09:53:06 -03:00
Henrique Dias
77c2162872 add wordcount clsi handler 2015-09-10 12:41:48 -03:00
James Allen
662050b3f9 Only show services header if we have some services to render 2015-09-10 16:01:12 +01:00
Shane Kilkelly
4a315a0474 When a user is null in track-changes UI, display them as "Anonymous". 2015-09-10 14:35:09 +01:00
James Allen
5fdb50958e Fix logs dropdown to work with Angular 1.3 2015-09-03 13:13:28 +01:00
James Allen
95db287fef Fix more dropdown menu in project list for new Angular 2015-09-03 13:02:43 +01:00
James Allen
c64891a61b Fix folder dropdown to work with new Angular 2015-09-03 12:54:11 +01:00
James Allen
aa06eb55b7 Merge branch 'master' into angular_1.3.15 2015-09-03 12:52:08 +01:00
James Allen
7446572ed9 Group online users into dropdown menu when more than 3 2015-09-02 14:33:51 +01:00
James Allen
34c8f22dd7 Allow multiple collaborators to be added at once with a list of emails 2015-09-02 14:33:43 +01:00
James Allen
639424f664 Don't error on project clone if not root doc is set 2015-09-02 14:32:21 +01:00
James Allen
40704b486e Don't lock up on very long lined documents 2015-08-28 16:52:09 +01:00
Shane Kilkelly
0aaeb6671e Keep password reset token in session, and strip it from reset page url. 
This fixes an issue where the reset token was leaked in the referrer header
when navigating away from the password reset page to an external site.

Now we get the token from the query string, store it in the session,
then redirect to the bare url of the password reset page, which then
uses the stored token to render the reset form.
 2015-08-24 11:53:33 +01:00
Henry Oswald
a53e3b80cf if blog or universities site is down don't crash, send 500 2015-08-20 16:55:16 +01:00
Shane Kilkelly
aab7a8713e Catch the case where filename is shorter than the extension length. 2015-08-20 15:56:30 +01:00
Shane Kilkelly
2dd56d0b32 If we're sending a html file to mobile-safari, do so as plain text. 
This prevents safari from trying to render the page,
which it does because it ignores the "Content-Disposition" header.
 2015-08-20 12:02:43 +01:00
Henry Oswald
63580f6a79 remove useClsi2 flag in project collection 2015-08-19 11:58:41 +01:00
Henry Oswald
a777fcc5a6 changed post to deactivate projects to set params via body rather than query params 2015-08-19 11:55:35 +01:00
Henry Oswald
50fc886c94 changed inactive to active as its more effienct query in mongo 2015-08-19 11:54:30 +01:00
Henry Oswald
d3499acd7b pass options through stating how long ago want to archive from and limit 2015-08-14 14:11:53 +01:00
Henry Oswald
70b825fd2a fixed call to ProjectUpdateHandler.markAsOpened and made it async 2015-08-14 11:27:11 +01:00
Henry Oswald
66b87df17c added deactivate project endpoint 2015-08-14 11:26:11 +01:00
Henry Oswald
bec9bf5c87 replace lodash with underscore in this project 2015-08-14 09:42:27 +01:00
Henry Oswald
21a67ddab4 added deactivate old projects endpoint 2015-08-13 22:50:39 +01:00
Henry Oswald
a0142d4415 added inactive and reactivate project logic 2015-08-13 22:40:28 +01:00
James Allen
ec5e03bd01 Fix subscription currency dropdowns 2015-08-04 15:58:31 +01:00
Henry Oswald
53dc0b63c8 v1 of enago 2015-08-04 10:45:19 +01:00
Henry Oswald
3e55aef25a show error if socket io fails to connect. Not tested yet. 2015-07-31 15:42:47 +01:00
Henry Oswald
417fd4f5f5 add logging to tell us how long since a project that is being opened was last updated 2015-07-22 10:38:48 +01:00
Henry Oswald
c12213b46b added logging around load editor times 2015-07-22 10:38:28 +01:00
Henry Oswald
a786b623a8 added logging to help debug slow project list page loading 2015-07-22 01:06:23 +01:00
Henry Oswald
3ecf201eda send -> sendStatus 2015-07-08 16:56:38 +01:00
Henry Oswald
9028bcf830 set body parser limit to 2mb 2015-07-08 14:35:03 +01:00
Henry Oswald
39df8964cf added route that got lost in merge 2015-07-08 13:29:10 +01:00
Henry Oswald
9a49ce4a0e removed extra req.session.destroy 2015-07-08 12:58:02 +01:00
Henry Oswald
8020cd8f47 removed tpds from settings.defaults.coffee, if not set updates are now not queued 2015-07-02 12:09:08 +01:00
Henry Oswald
56346ad88c remove analytics router and fixed bad package.json 2015-07-01 15:48:23 +01:00
Brian Gough
e6a670533d added default mongoose connection 2015-07-01 15:36:50 +01:00
Henry Oswald
7fd29b18a8 destroy users session before creating a new one for them after login 
session changed to prevent against fixation attacks
 2015-07-01 15:29:02 +01:00
Henry Oswald
4f0b922a5d changed name used when project or file uploaded, this changed when 
we started using https://github.com/expressjs/multer

* originalname - Name of the file on the user's computer
* name - Renamed file name
 2015-07-01 15:28:49 +01:00
Henry Oswald
3ab57f6830 put express locals on webRouter, this prevents problem with accessing sessions in locals, they should also only be used on web routes not api routes 2015-07-01 15:28:30 +01:00
Henry Oswald
941d407231 added saveUninitialized option to session which is now required 2015-07-01 15:26:17 +01:00
Henry Oswald
15a57f5dc4 removed req.session.destorys from endpoints now on the api router which are not needed 2015-07-01 15:26:05 +01:00
Henry Oswald
1cc0cbe8fc split site into 2 routers, webRouter and apiRouter 
web router has things like sessions etc added onto it. Api router is minimal, doesn't include things like csrf
 2015-07-01 15:23:18 +01:00
Henry Oswald
665bdcf538 v1 of express4 conversion 2015-07-01 15:17:43 +01:00
Brian Gough
3de841dd71 added event loop monitor 2015-06-23 13:50:42 +01:00
Henry Oswald
84bf0dd9a3 added timeout and logging for tpdsworker queing via http 2015-06-23 11:19:23 +01:00
Henry Oswald
b83fe4dcf9 put tpdsworker url in from settings 2015-06-23 11:13:05 +01:00
Henry Oswald
2ec925b45e fairy removed from web, makes http request to tpds worker now 2015-06-22 22:33:04 +01:00
James Allen
30eb79dfdc Add link to DataJoy that shows randomly 50% of the time 2015-06-09 15:36:16 +01:00
James Allen
0eec715bb5 Upgrade to Angular 1.3.15 and latest ui-bootstrap 2015-06-09 14:59:12 +01:00
Henry Oswald
aaa902cca9 fixed bug with subscriptions where if an old user had a subscription and was in a group they would get a confusing page 2015-06-01 14:38:09 +01:00
Henry Oswald
33aa5c732f if a domain licence link has expired render a nice message explaining they need to retry 2015-06-01 12:43:42 +01:00
Henry Oswald
cb48242b74 changed email expire to 1 day for verifying account 2015-06-01 12:22:46 +01:00
Henry Oswald
6727c3ee00 changed ShareLaTeX thoughts to go into type form 2015-05-29 16:27:35 +01:00
Henry Oswald
d3f6c0c614 Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv 2015-05-29 12:17:54 +01:00
Henry Oswald
e4011b9ba1 Merge branch 'emailverification' 2015-05-29 12:10:02 +01:00
Henry Oswald
702fdc1480 improved views for domain licence invites 2015-05-29 12:09:28 +01:00
Henrique Dias
f50eb0398f add export csv group feature 2015-05-28 16:54:41 -03:00
Henry Oswald
43c4531e51 kill off CollaboratorsHandler. changeUsersPrivilegeLevel as it is not used anywhere 2015-05-28 13:02:08 +01:00
Henry Oswald
e454d2f059 don't allow renaming in client if user is not owner 2015-05-28 12:59:02 +01:00
Henry Oswald
ca28d8ee70 changed views to use translations 2015-05-27 22:15:46 +01:00
Henry Oswald
b657c5207e cleaned up the views a bit 2015-05-27 21:45:29 +01:00
Henry Oswald
22b94e9246 renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler 2015-05-27 20:57:54 +01:00
Henry Oswald
4773d6d22f added tests around new endpoints for joining groups 2015-05-27 20:50:16 +01:00
Henry Oswald
f27c072ae1 pull logic checking if user is already part of a group out of controller into handler 2015-05-27 16:33:47 +01:00
Henry Oswald
72e528e9d1 if you are alread in the group show the custom group page 2015-05-27 15:50:28 +01:00
Henry Oswald
79fa49a43d if a user is elelable to be part of a group subscription and they go to 
/user/subscription it should redirect them to the group subscription invite
 2015-05-27 15:35:31 +01:00
Henry Oswald
1d21bddcf5 fix Onetime token handler path 2015-05-27 15:06:36 +01:00
Brian Gough
a5d14f4ffb handle unexplained case where smokeTestModule is undefined 2015-05-26 16:33:02 +01:00
Henry Oswald
481bd67fbd changed paths to use hyphens and add succesfull join page 2015-05-26 15:26:45 +01:00
Henry Oswald
841231dbf8 make PasswordResetTokenHandler generic so it can be used for invites 2015-05-26 15:24:09 +01:00
Brian Gough
e51cdb81bd port leak fixes from smoke-test-sharelatex module 2015-05-26 10:54:55 +01:00
Henry Oswald
cad8d8a23b v1 basic invite works, not pretty or tested 2015-05-22 13:57:15 +01:00
Henry Oswald
f5c39efcac patched xss hole with messages not setting the content type correctly 2015-05-19 11:04:52 +01:00
Brian Gough
3ad517e1c2 Merge pull request #177 from sharelatex/fix-ace-extension-errors 
prevent loading error for ace language tools extension in development
 2015-05-05 14:47:44 +01:00
Brian Gough
6014085e8e prevent loading error for ace language tools extension in development 2015-05-05 14:33:18 +01:00
Henry Oswald
72af6748c9 Merge pull request #157 from oskanberg/patch-1 
Rename 'javscript' to 'javascript'
 2015-05-05 14:28:27 +01:00
Henry Oswald
9764ab258b added complex password validation to password resets 2015-04-30 12:05:46 +01:00
Henry Oswald
312c56a24e allow password resets to be performed when site is not public by adding routes into white list 2015-04-30 11:58:26 +01:00