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
Henry Oswald
1a651b38f4
added sendgrid as email option
2016-03-29 14:15:33 +01: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
bad9a0282d
Add missing error handler
2016-03-23 14:38:11 +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
c554b0630d
if user has subscription before joining group is given option to cancel personal one
2016-03-22 16:59:47 +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
Henry Oswald
7fb0249b2b
null check subscription for custom accounts page
2016-03-22 14:19:46 +00:00
James Allen
f182fbf396
Convert 'anonymous-user' from real-time api in 'null' internally
2016-03-22 09:53:47 +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
James Allen
9a0ec9c292
Don't throw fatal error when recently compiled
2016-03-21 13:54:45 +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
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
James Allen
e7d67668e9
Improve error reporting and show 404 when project ids are malformed
2016-03-18 15:59:12 +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
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
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
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
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
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
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
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
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
Henry Oswald
bf8f9f6d41
change key to maxEntitiesPerProject
2016-03-09 15:53:03 +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
Henry Oswald
57f00d76bd
get project name on entity move
2016-03-08 14:46:53 +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
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
James Allen
0882eb2a99
Don't use deprecated Project.findPopulatedById in ReferencesManager
2016-03-08 14:05:56 +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
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
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
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
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
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
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
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
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
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
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
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
Henry Oswald
47eebb1840
add null check and default empty object for subscirption dashboard
2016-02-03 17:41:05 +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
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
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
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
a181905ab8
removed console.log
2016-01-04 11:42:54 +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
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
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
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
Henry Oswald
aafdeb031e
wip - downgrade options it all works, need unit tests & translations
2015-12-08 18:23:28 +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
8590af3e49
added rate limit on server side for file uploads
2015-12-01 13:08:49 +00:00
Henry Oswald
91a84cb232
increase compile throttle limit
2015-11-25 11:07:53 +00:00
Henry Oswald
61182451f1
removed SubscriptionDomainHandler from user controller
2015-11-23 15:12:30 +00:00
Henry Oswald
ba58509a67
increased length rate limit is in effect for
2015-11-16 12:21:06 +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
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
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
16b7bf222a
Merge branch 'contacts'
2015-11-05 10:14:25 +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
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
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
d996ed6e47
Refactor addUserToProject for better access by groups
2015-10-14 17:29:58 +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
b69ec9768d
bonus allocater does not need to check if user has subscription any more.
2015-10-05 16:50:34 +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
Henry Oswald
9a72667e91
added word count UI feature.
2015-09-14 15:28:19 +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
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
a0142d4415
added inactive and reactivate project logic
2015-08-13 22:40:28 +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
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
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
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
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
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
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
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
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
Henry Oswald
a7640b5bbd
changed authentication controller to use req.parsedUrl.pathname as query strings on req.url were breaking the whitelist
2015-04-30 11:57:40 +01:00
Henry Oswald
6669884f44
Merge branch 'tpds-cleanup'
2015-04-23 10:06:26 +01:00
Brian Gough
396644d314
proposed fix to delete tpds dump files after use
2015-04-15 14:41:38 +01:00
James Allen
5c30a7de67
Add in option for global login requirement (defaults to on)
2015-04-15 11:14:53 +01:00
James Allen
893ff85521
Don't allow password resets for holding accounts
2015-04-14 13:11:49 +01:00
James Allen
8483f249ee
Actually proxy websocket connections
2015-03-20 19:08:48 +00:00
James Allen
393169bc2a
Create a grunt task to create the admin user
2015-03-19 17:36:50 +00:00
James Allen
e2d515f957
Allow public registration module to hook into email system
2015-03-19 17:19:56 +00:00
James Allen
9b8cf7bcfa
Remove public registration and require that a user be registered by an admin
2015-03-19 14:22:48 +00:00
James Allen
93a088618a
Return proper error from registration handler
2015-03-18 16:19:48 +00:00
James Allen
cb948fede2
Move email sending into registration controller
2015-03-18 15:57:01 +00:00
James Allen
0f69ee0f22
Add in proxy for /socket.io so that we don't need to faff with real-time service location
2015-03-09 14:09:09 +00:00
Henry Oswald
97f0fad525
add vat number option to payment form
2015-03-04 18:08:06 +00:00
Henry Oswald
80dc2f9224
send coupon code server side to be applied to users subscription
2015-03-04 17:50:24 +00:00
Henry Oswald
fe3b9bf07a
clients can not rename docs/files/folders to blank name.
...
Client and server side checks added
2015-03-04 11:10:59 +00:00
Brian Gough
c1cde643ef
use send build identifier to clsi only for new pdf viewer
...
old pdf viewer will continue to use the main ouput.pdf file
2015-03-02 14:59:53 +00:00
Brian Gough
0315954b47
Merge branch 'master' into support-cached-pdfs
2015-03-02 09:20:00 +00:00
Brian Gough
5b9f2e8fc1
pass build id through to clsi when requesting pdf
2015-02-26 16:21:44 +00:00
Henry Oswald
161f24ffdf
add flag which requires login for /learn
2015-02-24 22:07:36 +00:00
Henry Oswald
8638b531a5
fire off register to newsletter on user registration as it can be slow
2015-02-23 16:03:45 +00:00
Henry Oswald
c33956c0af
fix jade warnings about missing space, need to escape the module html
...
insertions a different way. != func rather than !{func}
2015-02-23 10:18:48 +00:00
Henry Oswald
4eed88c1ab
broken a err and null check into 2 lines
2015-02-19 10:54:28 +00:00
Henry Oswald
a9660a3a07
add err and null project test for locating project element
2015-02-18 21:57:21 +00:00
Henry Oswald
f8e3fa6308
increase the auto compile limit a little
2015-02-18 21:57:21 +00:00
Henry Oswald
21a01d94d4
check that content exists before adding it to getAllDocs.
...
causing error which I think is blowing up the mongo driver elsewhere
2015-02-18 21:57:21 +00:00
James Allen
000f01fbeb
Remove unneeded uid module
2015-02-17 11:21:50 +00:00
James Allen
8e13ded360
Regenerate the session id after logging in or registering
2015-02-13 11:18:17 +00:00
Henry Oswald
65859468de
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-12 09:21:48 +00:00
Henry Oswald
216c9cefe3
don't error on subscription dashboard page if there is no subscription.taxRate
2015-02-12 09:21:45 +00:00
James Allen
50048a53b5
Don't throw an exception if there is an error with unzip
2015-02-11 11:34:49 +00:00
James Allen
e4b77a2563
Merge branch 'dropbox-module'
2015-02-10 11:38:32 +00:00
James Allen
001a5d751b
Pull out templates logic into its own module
2015-02-10 11:24:34 +00:00
Henry Oswald
7030d5f822
change plan shows price including tax
2015-02-06 16:19:52 +00:00
Henry Oswald
86f963a7ec
recurly tax updates
...
- get all accounts does get all of them by looping through all pages
- creating coupons requires which plan the coupon is for
- fixed the total price shown to people so it includes tax
2015-02-06 16:19:52 +00:00
James Allen
6c387edbe2
Remove Dropbox front end logic from main sharelatex repo
2015-02-05 18:20:34 +00:00
James Allen
d7afb4e513
Clean up unused real-time code in web
2015-02-05 16:37:37 +00:00
James Allen
5a922e2356
Include email address explicitly in welcome email to avoid any confusion
2015-02-05 12:52:50 +00:00
James Allen
e35d80211e
Log when rate limit is hit
2015-02-05 09:52:40 +00:00
Henry Oswald
7fdb8009a0
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-02-04 20:20:16 +00:00
Henry Oswald
e4a54cbdfc
added recurly subscription null checks
...
this deals with a user who has an expired old subscription then
is added to a group subscription.
2015-02-04 20:17:55 +00:00
James Allen
4235c90623
Add in rate limit to opening projets
2015-02-04 15:05:35 +00:00
James Allen
860de1528f
Load default coupon code if provided in query string
2015-02-02 17:42:27 +00:00
Henry Oswald
ee83ed6e81
started using underscore.string to check domain emails
2015-02-02 11:15:04 +00:00
Henry Oswald
0a64c1c8ac
on register try and auto allocate a group licence if one exists
2015-01-27 18:22:51 +00:00
Henry Oswald
3360b3c35a
added basic domain allocation feature
2015-01-27 18:09:56 +00:00
Brian Gough
58750140f4
enable new pdf viewer by default for newly created users
2015-01-21 15:26:01 +00:00
Henry Oswald
00810eaf21
Merge branch 'recurlyv3'
2015-01-19 13:51:02 +00:00
Henry Oswald
17fe30ca0f
sanitise the ref for universities site. and remove unneeded sanitise
2015-01-19 10:49:40 +00:00
Henry Oswald
4bcc9fb5c9
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-01-07 16:51:15 +00:00
Henry Oswald
7ec0264fe2
added missing currency symbols to subscription formatter
2015-01-07 16:51:05 +00:00
James Allen
923fbfc574
Correctly handle quote characters in template name when downloading
2015-01-07 13:16:38 +00:00
Henry Oswald
f9843b3709
tax auto updates on change of address now. Is also preset based on users ip address
2015-01-07 13:16:19 +00:00
Henry Oswald
aaaf28f916
added some helper methods into recurly wrapper which can be used by
...
our one time scripts
2015-01-07 12:02:07 +00:00
Henry Oswald
7e64b88fcf
fix cancel subscription on delete user
2015-01-02 10:37:59 +00:00
Henry Oswald
baa0a42825
coupon field is shown if query string scf is shown
2014-12-28 17:51:36 +00:00
Henry Oswald
a7eb836c79
redirect to /thank-you on success and fix broken unit test from a few commits ago
2014-12-22 16:37:09 +00:00
Henry Oswald
5305cbfd3e
got more correct details making it to recurly and improved form.
2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b
can add account just about into recurly
2014-12-18 18:59:29 +00:00
Brian Gough
79b560f96b
update tests for new pdf viewer server fixes
2014-12-16 09:44:25 +00:00
Brian Gough
660bb75df4
add query string parameters for compileGroup= and pdfng=
...
compileGroup will bypass mongo check for compileGroup priority
pdfng will pass pdf Range: headers through from user request to CLSI
2014-12-12 16:47:43 +00:00
Brian Gough
fbf9111d80
Revert "revert to original CLSI proxy call"
...
This reverts commit 99b1b0d6598562b6346921504d1d1d37efe3be86.
2014-12-12 15:43:36 +00:00
Henry Oswald
0561adde4b
added more logging
2014-12-12 12:21:14 +00:00
Henry Oswald
bd77d0e020
add null check in on project
2014-12-12 10:27:14 +00:00
Henry Oswald
5c7d77a853
added logging around docstore setting
2014-12-11 16:22:00 +00:00
Brian Gough
8a77d619a8
revert to original CLSI proxy call
...
due to problems with cost of authentication when byte-serving
2014-12-11 13:15:13 +00:00
Brian Gough
265ad4439c
Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng
2014-12-05 14:43:01 +00:00
Brian Gough
a4ddfd5725
whitelist proxied headers when requesting pdfs from clsi
2014-12-03 15:09:46 +00:00
Brian Gough
138170be60
pass headers through when proxying request to allow for byte-range/etag handling
2014-12-02 14:53:46 +00:00
James Allen
c70c048aae
Send clear cache requests to the correct CLSI group
2014-12-01 12:19:01 +00:00
James Allen
e0178b17b5
Pass compile group correctly to Clsi._buildRequest
2014-12-01 10:28:09 +00:00
Henry Oswald
a570d05132
fixed bug with setting root doc which would fail if the document class isn't on the top line
2014-12-01 01:07:03 +00:00
James Allen
175dfae085
Look up compile group and features from project owner, not current user
2014-11-28 14:26:21 +00:00
Henry Oswald
20a5ad6e27
fixed where project to large code is passed from
2014-11-27 16:22:39 +00:00
Henry Oswald
fa755c6521
added project to long check from clsi2 (bit of a punt)
2014-11-27 15:42:37 +00:00
Henry Oswald
0bc76b6d92
mkdir p changed so it does not get entire project, now without doc lines
2014-11-27 12:07:49 +00:00
Henry Oswald
63deb0a508
Revert "added lock to update merger"
...
This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.
2014-11-27 11:46:17 +00:00
Henry Oswald
280895bdf5
added lock to update merger
2014-11-27 10:46:52 +00:00
Henry Oswald
ca8a21c425
change async to series
...
no real gain from parallel, series might reduce the cpu load if it finds the doc early
2014-11-26 21:53:57 +00:00
Henry Oswald
5e570d52a0
modfied setRootDocAutomatically to work async
...
was causing cpu to block for along time on big projects
2014-11-26 17:19:21 +00:00
Henry Oswald
857d867191
added locks into editor controller for new/move/deletes
...
filesystem import manager uses the unlocked version
2014-11-26 15:32:23 +00:00
Henry Oswald
dbecadcaea
Merge branch 'master' into multicurrency
2014-11-25 11:35:59 +00:00
Henry Oswald
6c0f03e9c7
added ab test to show collar plan to people in editor
2014-11-24 16:21:03 +00:00
James Allen
b8fdbdb406
Handle errors in request pipes
2014-11-24 13:58:41 +00:00
James Allen
970125b7a8
Check for null project in joinProject
2014-11-24 13:43:08 +00:00
James Allen
3578e41c9c
Add null check into FileTypeManager isDirectory check
2014-11-24 13:39:07 +00:00
James Allen
d4af0fe36d
Wrap smoke test in domain to catch errors
2014-11-24 13:36:10 +00:00
Henry Oswald
6c746d9aec
added redis health check in
2014-11-19 23:18:20 +00:00
Henry Oswald
cd8c233c05
Revert robust redis connection code
2014-11-19 15:06:05 +00:00
James Allen
8b9a26d6f3
Add in http health check end points for redis subscription channels
2014-11-19 14:12:37 +00:00
James Allen
d6532c63f8
Use new robust subscription model
2014-11-19 11:09:42 +00:00
Henry Oswald
804bc16bc8
redirect users to /register when coming from templates or share url
...
redirect to /login when going anywhere else (/project /project/1234)
2014-11-13 17:12:39 +00:00
Henry Oswald
f5d3801bfb
changed findElementByPath to not call cb more than once & deal with nulls
2014-11-11 14:44:44 +00:00
Henry Oswald
ae897cb41d
try catch encodeURIComponent
2014-11-10 16:30:02 +00:00
Henry Oswald
c920874872
added null check to compile features
2014-11-10 11:26:40 +00:00
Henry Oswald
29ae816432
added next into controller for error
2014-11-10 11:23:07 +00:00
Henry Oswald
e9232eb197
try catch converting id to object id
2014-11-09 23:08:23 +00:00
James Allen
84c08edcf3
Factor out common joinProject logic to provide and HTTP end point for the real-time API
2014-11-07 12:31:47 +00:00
James Allen
218f5fedf8
Fix broken template creation route
2014-11-07 11:21:55 +00:00
James Allen
9c5ae5adf4
Remove unused old update method
2014-11-07 09:39:17 +00:00
James Allen
d27af25bc9
Convert template publishing to use HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
7b6ec86cef
Access Dropbox status via HTTP end points
2014-11-06 14:39:40 +00:00
James Allen
e596b60af0
Move collaborator HTTP end points into the Collaborators feature
2014-11-06 14:39:40 +00:00
James Allen
5c3e8e6d88
Add and remove collaborators with HTTP requests, not websockets
2014-11-06 14:39:40 +00:00
Henry Oswald
b9dd2d826e
added null check on subscription for group plans
2014-11-04 10:53:03 +00:00
Henry Oswald
edf715919d
send user to 404 if templates returns 404
2014-11-03 11:48:56 +00:00
Henry Oswald
4c7293f8c2
remove lang from page title in wiki article
2014-11-03 11:48:43 +00:00
Henry Oswald
30100f2a07
fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync
2014-10-31 12:41:06 +00:00
Henry Oswald
aeb956c8a4
wiki will try and get spanish version of page then fall back to english if it is not there
2014-10-31 12:15:03 +00:00
Henry Oswald
e0aae65050
added file ref null check
2014-10-31 10:50:20 +00:00
Henry Oswald
d428e7e5b4
handle a null in the file refs list
...
this seems to happen now and then when there is networking issues
2014-10-31 10:34:21 +00:00
Henry Oswald
56efefd6d4
renamed variable
2014-10-30 08:33:18 +00:00
James Allen
ca664e0063
Get subscription status correctly for showing upgrade/bonus link
2014-10-27 15:00:46 +00:00
James Allen
f1ddff4061
Only ignore hidden files from Dropbox, not GitHub
2014-10-27 14:39:20 +00:00
Henry Oswald
011bdc4617
explicitly set the file types to delete
...
the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents
2014-10-24 12:01:52 +01:00
Henry Oswald
0a123418ac
insert ref data into uni page
2014-10-23 14:13:40 +01:00
Henry Oswald
8097e6ad71
made 7 day free trial the default
2014-10-21 13:48:46 +01:00
Henry Oswald
4bd0708029
put the compile group on the session so proxied requests are sent to the correct place
...
I know this is premature optimisation however we do make a lot of requests
to the clsi for each compile and this will save mongo a lot of calls
2014-10-21 09:34:58 +01:00
Henry Oswald
fb53be7ce4
Revert "priority compiles are proxyed to the priority servers"
...
This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.
2014-10-21 09:16:23 +01:00
Henry Oswald
250606472d
priority compiles are proxyed to the priority servers
2014-10-20 17:48:00 +01:00
Henry Oswald
9be31a2ac1
removed type: from log lines
2014-10-20 14:24:39 +01:00
Henry Oswald
3cf64ce34f
pass new compile features to client side, don't show timeout upgrade for premium users
2014-10-20 12:21:40 +01:00
Henry Oswald
b9d6d5bbf1
set the request timeout to a few mins for the compile
2014-10-17 13:23:29 +01:00
Henry Oswald
e7906f7018
timeout option passed to clsi
2014-10-16 18:43:48 +01:00
Henry Oswald
7293ccf06d
if user has premium compile send them to a different server set
2014-10-16 17:52:21 +01:00
Henry Oswald
5a4a90924b
added default opts for users compile features
2014-10-16 16:57:51 +01:00
Henry Oswald
1506f86a5f
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2014-10-16 16:34:25 +01:00
Henry Oswald
d97e42a959
get users features for compile options i.e. timeout and which compiler
2014-10-16 16:34:21 +01:00
James Allen
8fa8a64c6f
Update email templates
2014-10-16 12:46:38 +01:00
James Allen
f3a1ba93a4
Fix argument signature of mergeUpdate and deleteUpdate
2014-10-16 11:43:54 +01:00
James Allen
46ecaf9f6c
Fix broken argument signature of addFolder
2014-10-16 11:27:10 +01:00
James Allen
9f1a7c7396
Send source of update to doc updater and allow external updates to be ignored in UI
2014-10-16 11:27:10 +01:00
James Allen
7e9318814d
Send source of update to doc updater on setDocument request
2014-10-15 15:36:08 +01:00
James Allen
6800c1a15e
Track the source of updates through the system on adding/updating of docs and files
2014-10-15 15:18:31 +01:00
James Allen
4f2ab51ebd
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2014-10-15 14:11:11 +01:00
James Allen
941f550d6c
Remove all traces of soa-req-id
2014-10-15 14:11:02 +01:00
Henry Oswald
af769c7871
allow ip to set via query string for plans page
2014-10-15 11:58:35 +01:00
James Allen
b32375530c
Refactor card css for use in new subscription page
2014-10-14 15:46:44 +01:00
Henry Oswald
b2b13ef9a7
pass plan to payment page to get the number of collaborators
2014-10-14 12:14:24 +01:00
Henry Oswald
4a774981cf
Merge branch 'master' into multicurrency
2014-10-14 11:52:03 +01:00
Henry Oswald
3bac4dc39f
increase auto compile limit
2014-10-14 11:50:06 +01:00
Henry Oswald
6437f74cd3
use req.ip not x-forwarded-for to get ip address for multi currency
2014-10-13 17:55:18 +01:00
Henry Oswald
5a0d74753f
plans page will auto redirect to best guess currency
2014-10-13 17:39:44 +01:00
Henry Oswald
2bf34bba4d
added currency to subscription view model
2014-10-13 16:14:13 +01:00
Henry Oswald
7964616f02
changing email address should lowercase the email
2014-10-13 15:44:45 +01:00
Henry Oswald
36264706f6
hooked the plans page up to the geo ip lookup
2014-10-13 14:10:15 +01:00
Henry Oswald
b90003b11e
added custom user dashboard page
2014-10-10 15:44:53 +01:00