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

418 commits

Author SHA1 Message Date
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
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
0ff5f54bf6 fix unit test for build parameter 2015-03-02 15:33:45 +00:00
Brian Gough
0315954b47 Merge branch 'master' into support-cached-pdfs 2015-03-02 09:20:00 +00:00
Brian Gough
a64b8724bd include the build parameter in the compile unit tests 2015-02-26 16:21:44 +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
James Allen
8e13ded360 Regenerate the session id after logging in or registering 2015-02-13 11:18:17 +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
001a5d751b Pull out templates logic into its own module 2015-02-10 11:24:34 +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
e35d80211e Log when rate limit is hit 2015-02-05 09:52:40 +00:00
James Allen
4235c90623 Add in rate limit to opening projets 2015-02-04 15:05:35 +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
Henry Oswald
00810eaf21 Merge branch 'recurlyv3' 2015-01-19 13:51:02 +00:00
Henry Oswald
7e64b88fcf fix cancel subscription on delete user 2015-01-02 10:37:59 +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
Brian Gough
79b560f96b update tests for new pdf viewer server fixes 2014-12-16 09:44:25 +00:00
Brian Gough
d3b38c8dc2 Revert "Revert test changes for proxied headers when requesting pdfs from clsi" 
This reverts commit ab31d2c3fdc00a38f6444248011a3871b83dbec2.
 2014-12-12 15:43:21 +00:00
Brian Gough
f005c5e8dc Revert test changes for proxied headers when requesting pdfs from clsi 2014-12-11 13:42:51 +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
35b6abe79c fix tests for pdf header passing 2014-12-02 16:36:19 +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
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
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
393a637673 remove a couple of required coffee-scritps which are not required 2014-11-26 15:37:53 +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
bd841b4795 coppied the lock manager over from doc updater 2014-11-25 16:52:27 +00:00
Henry Oswald
3bae278c92 Revert "increased timeout for geoip to 3 seconds" 
This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.
 2014-11-25 13:10:00 +00:00
Henry Oswald
d91064a369 increased timeout for geoip to 3 seconds 2014-11-25 11:51:03 +00:00
James Allen
afca9ba0cb Fix unit tests 2014-11-24 14:26:51 +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
James Allen
6d10e45135 Fix unit test 2014-11-07 12:35:10 +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
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
1a2411d4c2 removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter 2014-11-06 12:07:50 +00:00
Henry Oswald
30100f2a07 fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync 2014-10-31 12:41:06 +00:00
James Allen
f1ddff4061 Only ignore hidden files from Dropbox, not GitHub 2014-10-27 14:39:20 +00: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
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
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
Henry Oswald
d8cc3b7b61 fixed leaky test 2014-10-16 16:02:31 +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
941f550d6c Remove all traces of soa-req-id 2014-10-15 14:11:02 +01:00
Henry Oswald
19a08f82a6 default to USD if there is no match 2014-10-14 12:14:03 +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
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
3ca04e25fd add 1 second timeout to geoiplookup 
response times generally seem to be around 0.05s from our servers
 2014-10-13 13:15:48 +01:00
Henry Oswald
2e6c2c1926 default to USD in geo ip lookup. 
Decided to put default logic in the GeoIpLookup.getCurrencyCode as
we are going to want this default everywhere we use it.
 2014-10-13 13:08:11 +01:00
Henry Oswald
e78e4d46b0 use first ip passed though in string for ip lookup 2014-10-13 13:04:20 +01:00
Henry Oswald
259871cbdd added geoip lookup feature 2014-10-13 00:45:45 +01:00
Henry Oswald
b90003b11e added custom user dashboard page 2014-10-10 15:44:53 +01:00
Henry Oswald
3ba3a91043 if its a custom account redirect to /user/subscription/custom_account 2014-10-10 15:11:22 +01:00
Henry Oswald
e5ab40c911 added example session invalidation code 2014-10-09 18:10:01 +01:00
Henry Oswald
e7984a90d7 unlink dropbox when a user cancels 2014-10-09 17:05:41 +01:00
James Allen
4743b460f5 Only show rename or deleted message once 2014-10-09 09:13:38 +01:00
James Allen
accd8207b2 Show password reset expired message rather than server error if that's what has happened 2014-10-08 17:18:24 +01:00
James Allen
128c672edd Merge branch 'github-sync' 
Conflicts:
	package.json
 2014-10-08 12:13:37 +01:00
James Allen
dbd85a05f1 Send user features and features switches to views where needed 2014-10-07 13:31:13 +01:00
Henry Oswald
8789a4bde1 server rejects rename of entitys over 150 chars 2014-10-07 11:16:26 +01:00
Henry Oswald
b01b05e49b server rejects project names over 150 chars 2014-10-07 11:14:02 +01:00
James Allen
6c7c09075c Treat paths properly in project content update methods 2014-10-03 11:33:18 +01:00
James Allen
13a96c925b Add in endpoints to allow updating project files when the project id is know 2014-10-02 14:15:30 +01:00
Henry Oswald
7f2df4bbd3 renamed rate limiter tests 2014-09-29 11:42:46 +01:00
Henry Oswald
0d056434e6 fixed tests 2014-09-26 17:49:31 +01:00
Henry Oswald
558b6cdfde remove test which isn't really that important 2014-09-18 14:41:30 +01:00
Henry Oswald
1b02dc72a3 destroy session on dropbox webhook 2014-09-10 14:19:44 +01:00
James Allen
971afb7342 Treat large text files as binary 2014-09-04 13:00:51 +01:00
Henry Oswald
e740e4913d if user is already annual tell them so on the annual upgrade page 2014-08-29 14:13:05 +01:00
Henry Oswald
416f41e59d stopped using proper settings inside of a test 2014-08-29 13:06:50 +01:00
Henry Oswald
aa83b5ca5d fixed tests whoops 2014-08-29 12:41:42 +01:00
Henry Oswald
350b95a0a5 annual upgrade page works, needs a bit of copy love now 2014-08-28 18:14:31 +01:00
Henry Oswald
f5618e9d9c added confirm you want to change plan modal 
added page and corisponding endpoint to migrate to annual plan
 2014-08-27 17:51:10 +01:00
James Allen
894024ba29 Don't allow folders to be moved into their child folders 2014-08-22 14:38:52 +01:00
James Allen
456d194dbb Merge branch 'james_tmp' 2014-08-22 12:51:35 +01:00
James Allen
f093c99b96 Remove deprecated background dropbox polling logic 2014-08-21 13:01:27 +01:00
James Allen
d0eee7a1e5 Refactor template settings 2014-08-20 14:47:27 +01:00
James Allen
9be7228247 Delay Dropbox polling by 5 seconds and dispatch only a single request 2014-08-14 13:48:23 +01:00
James Allen
670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
James Allen
b7ed3bab8f Merge branch 'redis-queue' 2014-08-11 12:10:25 +01:00
James Allen
b20934e579 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-08 11:42:02 +01:00
James Allen
10021986c5 Don't error on password reset if no email found, and translate error messages 2014-08-08 11:41:54 +01:00
Henry Oswald
66ba6e612d Revert "send 401 when login fails" 
This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.
 2014-08-08 10:21:17 +01:00
Henry Oswald
7976f2f0fe send 401 when login fails 2014-08-07 16:28:00 +01:00
James Allen
b367c4a968 Show group subscription status on subscription dashboard page 
Conflicts:
	app/views/subscriptions/dashboard.jade
 2014-08-07 15:51:43 +01:00
James Allen
0a44aa9e71 Push into doc updater queue rather than pub/sub for updates 2014-08-07 13:19:10 +01:00
Henry Oswald
d047d44079 Changed the error messages which are sent down to the client to be translated first 
fixed up tests from titles we check when rendering, deleted them as they never
catch anything important, more hastle than they are worth imo.
 2014-08-01 14:03:38 +01:00
Henry Oswald
bf56e083cf removed a load of console.logs 2014-07-25 13:14:19 +01:00
James Allen
1128b45b17 Add in system messages 2014-07-24 13:24:08 +01:00
Henry Oswald
17962426ea blog returns 404's if the page does not exist in blog 2014-07-23 12:16:52 +01:00
James Allen
1c68ea7328 Don't care if user key has expired when we receive a cursor update 2014-07-21 13:16:07 +01:00
Henry Oswald
554fd7c7d0 change client connection timeout to 15 mins expire in redis 2014-07-17 16:03:53 +01:00
James Allen
37a12e88c1 Show who is online 2014-07-17 15:25:22 +01:00
James Allen
e0f1ed3c10 Use internal url for chat 2014-07-17 11:43:12 +01:00
Henry Oswald
abc4306e06 merge 2014-07-16 13:35:15 +01:00
James Allen
fce271f827 Fix unit tests 2014-07-16 12:01:15 +01:00
Henry Oswald
6982ec63ae changed get template details to findOne 2014-07-16 11:56:22 +01:00
Henry Oswald
cd60817592 made getting templates details parallel 2014-07-16 11:37:17 +01:00
Henry Oswald
91ca726e66 get template details now includes the markdown description of the project 2014-07-16 11:27:47 +01:00
James Allen
2a3ff3c523 Fix unit tests 2014-07-15 18:33:59 +01:00
Henry Oswald
d39b8a0a05 fixed broken chat test 2014-07-15 14:28:39 +01:00
Henry Oswald
9f82e63a8f changed :project_id to :Project_id 2014-07-14 22:11:41 +01:00
Henry Oswald
4a71b38721 added route for getting connected users 2014-07-14 16:16:01 +01:00
Henry Oswald
e6dfef6225 added getting connected users controller 2014-07-14 16:01:58 +01:00
Henry Oswald
b0cf0666fa changed the redis stuf to multi 2014-07-14 15:38:55 +01:00
Henry Oswald
d13676dab2 cursor data is stored in redis 2014-07-14 15:30:55 +01:00
Henry Oswald
61b7bea203 added ttl to the users set to keep redis clean from inactive projects 2014-07-14 13:20:29 +01:00
Henry Oswald
13aaf042d9 connected user manager logic works correctly 2014-07-14 12:41:06 +01:00
Henry Oswald
d737197e95 marksUserAsDisconnected -> markUserAsDisconnected 2014-07-10 17:01:42 +01:00
Henry Oswald
01ad313133 hooked up editor controller to connected users manager 2014-07-10 17:01:19 +01:00
Henry Oswald
e1dd58aca8 fixed algolia settings and removed some console.logs 2014-07-10 16:05:18 +01:00
Henry Oswald
4ccc56723f added disconnect funtion in connected users manager 2014-07-10 16:05:05 +01:00
Henry Oswald
c0a6f0b7ad Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee
	public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
	public/coffee/ide/online-users/OnlineUsersManager.coffee
	public/coffee/ide/track-changes/directives/infiniteScroll.coffee
 2014-07-10 15:15:18 +01:00
Henry Oswald
1be8dadbcf fixed chat tests 2014-07-10 15:12:28 +01:00
Henry Oswald
025d3147ec blog intergration works 2014-07-10 14:53:53 +01:00
James Allen
6d10c186ad Sort out escaping issues 2014-07-09 11:05:00 +01:00
James Allen
8c56a46594 Merge branch 'master' into master-redesign 2014-07-08 13:24:48 +01:00
James Allen
2553f51e44 Remove unused subscription downgrade logic 2014-07-08 12:55:29 +01:00
Henry Oswald
581d9ec925 - hooked up chat throughout the stack 
- removed lots of console.logs
- working on the auto scrol, doesn't quite work yet
 2014-07-08 10:08:38 +01:00
Henry Oswald
d1f907cee5 first simple version of tracking who is active in the editor 2014-07-04 16:18:46 +01:00