github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity
2179 commits 3 branches 7 tags 221 MiB
Commit graph

783 commits

Author SHA1 Message Date
Henry Oswald
259871cbdd added geoip lookup feature 2014-10-13 00:45:45 +01:00
Henry Oswald
40c3c3e1ce added customAccount to subscription model 2014-10-10 15:57:27 +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
Henry Oswald
9924882b59 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-10-09 16:45:26 +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
Henry Oswald
c2c29bb282 university site renders via prozy ok 2014-10-08 16:07:44 +01:00
James Allen
82dc3cf654 Don't reload module views each request by default 2014-10-08 12:39:36 +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
10732d112d Hook module system into project list page 2014-10-03 11:32:59 +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
81307324fc v2, seems to work... 2014-09-26 17:04:33 +01:00
Henry Oswald
f73629f8d9 v1 of sentinal support 2014-09-26 14:52:00 +01:00
Henry Oswald
2376d0a188 added generic error logging 2014-09-18 14:37:23 +01:00
Henry Oswald
9c98e95ca4 send cancelation email after 1 hour 2014-09-16 14:25:12 +01:00
Henry Oswald
6efda9cf1c push currency default to seperate var 2014-09-11 11:45:00 +01:00
Henry Oswald
20f0c648e5 default to USD 2014-09-11 11:35:39 +01:00
Henry Oswald
1b02dc72a3 destroy session on dropbox webhook 2014-09-10 14:19:44 +01:00
Henry Oswald
c08a568664 removed session logging 2014-09-10 10:09:25 +01:00
Henry Oswald
d961b48857 imporved logging for session debug 2014-09-10 08:20:36 +01:00
Henry Oswald
ca402a3061 added some logging in for sessions 2014-09-08 17:45:37 +01:00
James Allen
db9632f8f2 Allow modules to inject parts of views 2014-09-08 15:40:46 +01:00
James Allen
374c0f3d65 Add existence check for modules dir 2014-09-08 14:23:47 +01:00
James Allen
becb294c5c Create basic module loading system 2014-09-08 14:19:24 +01:00
Henry Oswald
93b4c5f4f8 thank you page displays the correct currency 2014-09-08 10:59:12 +01:00
Henry Oswald
aee0dda243 added currency to signiture 2014-09-08 10:36:30 +01:00
Henry Oswald
eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +01:00
Henry Oswald
8762297158 touch the session rather than setting the expires, same result 2014-09-04 18:07:31 +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
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
Henry Oswald
27b9cad8ca make ga experiements per page 2014-08-24 17:07:40 +01:00
James Allen
894024ba29 Don't allow folders to be moved into their child folders 2014-08-22 14:38:52 +01:00
Henry Oswald
c91e95d593 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-22 14:22:12 +01:00
Henry Oswald
6c131b1084 - removed free trial on annual accounts 
- added setting val for google analytics experiments to be added in head
- added 14 day free trial variation to plans page
 2014-08-22 14:20:39 +01:00
James Allen
c8ab1bd394 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-08-22 12:52:31 +01:00
James Allen
dc5e1f71bd Remove console.log debug line 2014-08-22 12:52:27 +01:00
James Allen
456d194dbb Merge branch 'james_tmp' 2014-08-22 12:51:35 +01:00
Henry Oswald
fd8221b869 make it possible to hide a lng 2014-08-21 17:58:25 +01:00
Henry Oswald
4a19d6731a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-21 13:03:54 +01:00
Henry Oswald
9bcf979e8a changed title for restricted to use translations key 2014-08-21 13:03:51 +01:00
Henry Oswald
b9372e6dcd added key for your projects 2014-08-21 13:02:28 +01:00
James Allen
f093c99b96 Remove deprecated background dropbox polling logic 2014-08-21 13:01:27 +01:00
Henry Oswald
04e50f8ba6 changed cookie name from hard coded to be config option, defaults to sharelatex.sid 2014-08-20 18:01:21 +01:00
James Allen
d0eee7a1e5 Refactor template settings 2014-08-20 14:47:27 +01:00
Henry Oswald
ca5b1e7422 cleaned up smoke tests 2014-08-19 14:35:20 +01:00
Henry Oswald
83d8c48dc6 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-19 11:20:06 +01:00
Henry Oswald
523694c4ff changed smoke tests to work with curl 
this was needed as there is a bug with request/tough cookie with
multi subdomain cookies ie .sharelatex.com

https://github.com/goinstant/tough-cookie/issues/16

moving it to request in the future is probably a good idea, if we do move to
request then with the current issues we would we need to set

jar._jar.rejectPublicSuffixes = false
 2014-08-19 11:17:51 +01:00
Henrique Dias
e0e9949da5 dynamic template menu by config settings 2014-08-18 14:26:47 -03:00
Henry Oswald
aa4f748608 Merge branch 'master' into i18n 2014-08-14 15:42:54 +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
7816810249 Add in poll dropbox endpoint back into admin 2014-08-14 10:12:01 +01:00
Henry Oswald
02cdfb4d09 lng dropdown at bottom in footer works nicely, needs few style tweeks 2014-08-13 23:06:15 +01:00
James Allen
604505131b Convert integer dropbox id to string when searching mongo 2014-08-13 17:34:45 +01:00
James Allen
670e8e5cb9 Use Dropbox Real-time polling 2014-08-13 17:26:18 +01:00
Henry Oswald
2222b32321 added message at top of page offering redirect to local lng 2014-08-13 12:31:14 +01:00
James Allen
3348249dcd Download template PDF and zip file with good file names 2014-08-12 12:02:09 +01:00
James Allen
b7ed3bab8f Merge branch 'redis-queue' 2014-08-11 12:10:25 +01:00
Henry Oswald
4c073ff285 render template name in CanonicalPage 2014-08-08 14:43:07 +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
Henry Oswald
9c6f0faff6 Merge branch 'i18n' 
Conflicts:
	app/coffee/Features/User/UserPagesController.coffee
	app/views/layout.jade
	app/views/project/editor/dropbox.jade
	app/views/project/editor/file-tree.jade
	app/views/project/editor/pdf.jade
	app/views/project/list/project-list.jade
	app/views/user/settings.jade
 2014-08-07 14:46:17 +01:00
Henry Oswald
ecd5d5274c Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-07 13:56:17 +01:00
Henry Oswald
c961cea514 fixed some bits 2014-08-07 13:56:04 +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
673def4f90 added different lang links to head for google 2014-08-06 15:05:13 +01:00
James Allen
a7cf8d6b0a Sort out title of wiki 2014-08-05 17:08:38 +01:00
Henry Oswald
377acfaa56 added default lang of en-US and translations package does the set lang based on subdomain 2014-08-05 11:15:17 +01:00
Henry Oswald
2be22d7ca7 cookies work accross different subdomains, added translations middlewear into stack to render based on domain 2014-08-04 16:47:14 +01:00
Henry Oswald
1e0652888a removed console.log 2014-08-04 12:21:38 +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
1b8c8b8c48 sorted out titles 2014-08-01 13:47:14 +01:00
James Allen
55ad2ce78d Include contents page down side of wiki 2014-07-31 16:26:02 +01:00
James Allen
13c6fcb8d9 Handle encoded parameters in request URL to wiki 2014-07-31 13:12:24 +01:00
James Allen
94bcfc0eac Only store host, not path in wiki URL setting 2014-07-30 15:56:27 +01:00
James Allen
49258fe3dd Proxy to wiki 2014-07-30 15:44:03 +01:00
Henry Oswald
bdf1fed462 jquery translations work 2014-07-30 14:22:36 +01:00
Henry Oswald
39173fe583 Merge branch 'i18n' 
Conflicts:
	app/coffee/infrastructure/Server.coffee
	app/views/project/list.jade
	package.json
 2014-07-29 13:44:10 +01:00
Henry Oswald
f906d63067 added some logging around dropbox update 2014-07-29 10:32:11 +01:00
Henry Oswald
344d32d4e8 fixed email logo link 2014-07-29 10:29:40 +01:00
Henry Oswald
2267a484f4 added /home so in dev can easily see home page when logged in 2014-07-28 17:04:17 +01:00
Henry Oswald
b7c6af1341 /home goes to home page, so can look at it when logged in 2014-07-25 14:17:40 +01:00
Henry Oswald
7255231abc Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 
updated upstream into a topic branch.
 2014-07-24 13:57:49 +01:00
James Allen
06ca7c904e Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign 2014-07-24 13:24:20 +01:00
James Allen
1128b45b17 Add in system messages 2014-07-24 13:24:08 +01:00
Henry Oswald
67cba0dfd2 killed info controller and setup features.less for dropbox and feature pages 
also moved dropbox to external pages
 2014-07-24 12:15:54 +01:00
Henry Oswald
a8deac697c Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-24 11:29:11 +01:00
Henry Oswald
a7b678a2c0 removed dropbox template that is not needed 2014-07-24 11:29:05 +01:00
Henry Oswald
49f356b38f removed advisor and themes page 2014-07-24 11:23:53 +01:00
James Allen
fbd36d8b07 Sort of style of admin panel and trim functionality 2014-07-24 11:22:22 +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
Henry Oswald
83b94f987c cleaned up few small things with templates 2014-07-23 12:16:31 +01:00
Henry Oswald
a4b02558dc 'carded' the templates page, top search area still needs doing 2014-07-22 17:24:32 +01:00
Henry Oswald
46027128a4 change notifications email top header to the grey we use on the site 2014-07-21 15:52:55 +01:00
Henry Oswald
1322f3e183 Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign 2014-07-21 14:18:43 +01:00
Henry Oswald
375669cd3b changed emails to adams design. Does not render brilliantly in gmail, but overall not bad. 2014-07-21 14:18:11 +01:00
James Allen
a3a5aa1c0d Remove server-side santization of project name, it's all escaped client side now 2014-07-21 13:34:25 +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
James Allen
462403bb4f Finger print Ace files 2014-07-18 12:08:56 +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
f4b0dec1b8 changed api-key to read-only-api-key for angolia 2014-07-16 16:37:58 +01:00
Henry Oswald
abc4306e06 merge 2014-07-16 13:35: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
James Allen
8f08823d34 Sort out fingerprints and pdf.js worker path 2014-07-16 11:28:52 +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
b9f2b02594 Sort out scroll in chat 2014-07-15 18:25:12 +01:00
Henry Oswald
9f82e63a8f changed :project_id to :Project_id 2014-07-14 22:11:41 +01:00
Henry Oswald
0aa6a206e7 added name and email to connected user data and example get request for chat 2014-07-14 16:23:31 +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
2b2b995340 refactored updateClientPosition to use async 2014-07-14 12:58:55 +01:00
Henry Oswald
5093820a5f Merge branch 'master-redesign' into master-redesign-templates-and-blog 2014-07-14 12:42:03 +01:00
Henry Oswald
13aaf042d9 connected user manager logic works correctly 2014-07-14 12:41:06 +01:00
James Allen
e4d9d03f55 Improve feedback on login/register forms 2014-07-11 17:08:19 +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
025d3147ec blog intergration works 2014-07-10 14:53:53 +01:00
Henry Oswald
5cf756969e blog wip 2014-07-09 19:49:39 +01:00
James Allen
16e382bef2 Update Ace and fix autocomplete 2014-07-09 17:59:04 +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
6dc9d32104 Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	public/coffee/app/main.coffee
 2014-07-08 11:14:56 +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
James Allen
068d88ec0b Style bonus page 2014-07-07 15:54:40 +01:00
James Allen
452098ca68 Redirect to register if not registered on plans page 2014-07-07 14:05:07 +01:00
James Allen
7947eb28ad Remove ab test from plans page 2014-07-07 12:30:19 +01:00
Henry Oswald
d1f907cee5 first simple version of tracking who is active in the editor 2014-07-04 16:18:46 +01:00
Henry Oswald
de010cf971 added error logging 2014-07-04 13:29:59 +01:00
Henry Oswald
0d02241b46 linked chat into the editor real time contorller 2014-07-04 13:20:30 +01:00
Henry Oswald
9c35cfd693 very start of chat controllers done 2014-07-04 13:05:55 +01:00
Henry Oswald
77246b2a07 added query string support onto get requests for limit and before 2014-07-02 17:37:30 +01:00
Henry Oswald
8670b543b9 added basic chat handler 2014-07-02 17:28:05 +01:00
Henry Oswald
8f6dac77d0 added asset proxying from templates in, used for old images etc which people linked to 2014-07-01 16:00:42 +01:00
Henry Oswald
978e3262b5 added redirects from config file in, used for old template paths 2014-07-01 15:44:12 +01:00
Henry Oswald
000be22f16 Merge branch 'master-redesign' into master-redesign-templates-and-blog 
Conflicts:
	app/views/project/editor.jade
 2014-07-01 15:23:05 +01:00
Henry Oswald
17537b0d7a client side js for templates loads and works 2014-07-01 14:27:20 +01:00
James Allen
be48ab2a30 Add in basic share modal 2014-07-01 14:12:28 +01:00
Henry Oswald
53fa15d3db added basic error handling around templates rendering 2014-06-30 17:27:13 +01:00
Henry Oswald
27a97b7fa8 build titles for tempaltes page in web 2014-06-30 17:19:25 +01:00
Henry Oswald
b80f751cb2 templates works basically, needs error handling and few little improvments 2014-06-30 17:08:54 +01:00
James Allen
afb953a489 Display cursor name labels 2014-06-26 11:19:05 +01:00
James Allen
9dfbb36a83 Update project settings over http 2014-06-25 13:51:02 +01:00
James Allen
d214b5dc5e Merge branch 'master' into master-redesign 2014-06-25 12:14:26 +01:00
James Allen
341570d85d Be more verbose with ip debug output 2014-06-25 11:06:04 +01:00
James Allen
5aa7daa951 Fix password reset rate limit to work on ip, not email which changes every request 2014-06-25 10:46:58 +01:00
James Allen
cb682ac584 Add in more robust support for being behind a proxy 2014-06-25 10:34:23 +01:00
James Allen
d2ac9a1e9f Add in auto complete 2014-06-24 21:09:20 +01:00
James Allen
f154f17704 Wire up fontSize and mode settings 2014-06-24 20:46:00 +01:00
James Allen
5cef41fdbd Allow selecting of theme 2014-06-24 20:28:53 +01:00
James Allen
84ac77795f Delete files 2014-06-22 20:49:58 +01:00
James Allen
242a866bce Rename files 2014-06-22 20:08:56 +01:00
James Allen
f931df6084 Allow creation of folders 2014-06-22 14:39:38 +01:00
James Allen
f41534ee4d Add in creating of files to editor 2014-06-22 12:10:42 +01:00
James Allen
6d0053e709 Start rebuilding editor 2014-06-21 22:20:37 +01:00
James Allen
e5ca033538 Add in configurable headings/footers 2014-06-20 21:35:42 +01:00
James Allen
a64b9eb82e Create and style external pages 2014-06-20 17:17:24 +01:00
James Allen
a2bb89b579 Merge branch 'master' into master-redesign 2014-06-20 11:18:43 +01:00
James Allen
81845dec32 Wire up account settings forms 2014-06-20 11:15:25 +01:00
James Allen
0ef7e54ad3 Allow partial updates to user settings 2014-06-20 09:42:43 +01:00
James Allen
1bcc0a4554 Send 204 rather than redirect when leaving a project 2014-06-19 13:11:01 +01:00
Henry Oswald
85befe0d57 listen on stdout when unzipping, unsticks some zips for some reason... 2014-06-18 18:18:49 +01:00
James Allen
2b349039c3 Add in backend multiple project downloading 2014-06-18 16:37:18 +01:00
James Allen
b837a4e9f3 Merge branch 'master' into master-redesign 2014-06-18 15:26:09 +01:00
James Allen
70c51cb947 Merge branch 'master' into master-redesign 2014-06-18 10:56:30 +01:00
Henry Oswald
e0be5ef01b added timeouts to email and newsletter as after a few days there are a few open connections still 2014-06-17 18:18:45 +01:00
James Allen
750b524771 Don't get user id from possibly deleted session 2014-06-17 17:45:07 +01:00
Henry Oswald
426b699865 links in emails use site url 2014-06-17 16:28:52 +01:00
James Allen
aa8969c652 Merge and fix external forms 2014-06-17 16:19:40 +01:00
James Allen
012371333f Wrap project list code in require.js 2014-06-17 12:43:42 +01:00
Henry Oswald
2d55f080d6 get algolia to pull app id and api key from settings file 2014-06-17 12:25:49 +01:00
Henry Oswald
cc1b9472b2 don't show the user details area on project list if algolia instituions has not be setup 2014-06-17 11:59:57 +01:00
James Allen
c56648ab80 Merge branch 'master' into master-redesign 
Conflicts:
	app/views/project/list.jade
	public/coffee/list.coffee
	public/stylesheets/less/list.less
	public/stylesheets/less/style.less
 2014-06-17 11:54:29 +01:00
Henry Oswald
3350b99ccf removed a couple of annoying console.log logs 2014-06-17 10:26:56 +01:00
James Allen
65a1f03768 Send project owner details to client 2014-06-16 13:34:38 +01:00
James Allen
9c5f63817e Send accessLevel info to client 2014-06-16 12:47:39 +01:00
James Allen
6305ac16f4 Work in progress of doing project list with Angular 2014-06-12 15:22:49 +01:00
Henry Oswald
6dc1e54dc7 basic example using angular done 2014-06-11 17:45:09 +01:00
James Allen
067d343928 Display list of tags 2014-06-11 16:32:56 +01:00
Henry Oswald
e099a4a100 added default of empty string to user details, fixed route as well 2014-06-11 15:14:07 +01:00
James Allen
1eaba59df0 Use Ember to load project list 2014-06-11 14:52:23 +01:00
Henry Oswald
473da4fa4c endpoint for user details is written 2014-06-11 12:46:28 +01:00
James Allen
99705ebb4f Merge branch 'master' into master-redesign 2014-06-11 12:38:59 +01:00
Henry Oswald
3aff131428 added controller endpoint for updating user personal info 2014-06-10 22:26:43 +01:00
Henry Oswald
560288348a moved delete project inside the editor to the http endpoint 2014-06-10 18:28:45 +01:00
Henry Oswald
dabed896be lowercase password reset email 2014-06-10 17:54:29 +01:00
James Allen
d3221f1cf1 Style login and register forms 2014-06-09 10:19:02 +01:00
James Allen
b6217c401e Merge branch 'master' into master-redesign 
Conflicts:
	public/stylesheets/less/trackchanges.less
 2014-06-06 15:10:57 +01:00
James Allen
521befddd3 Merge pull request #76 from dfelder/patch-1 
Ignore commented lines when setting root doc #52
 2014-06-06 14:53:03 +01:00
James Allen
5c27ff4430 Don't show diffs of deleted docs (much simpler) 2014-06-06 14:43:45 +01:00
James Allen
02f48be825 Allow docs to be restored 2014-06-06 14:43:45 +01:00
James Allen
cabaf1ae1a Show deleted documents when viewing history 2014-06-06 14:43:45 +01:00
Daniel Felder
1d12b88b09 Ignore commented lines when setting root doc #52 
Same code I used in public/coffee/pdf/CompiledView.coffee. I didn't test it locally though.
 2014-06-05 18:00:07 +02:00
Henry Oswald
22c467c231 Merge pull request #75 from dfelder/master 
compile current file if top level document #42
 2014-06-05 16:42:10 +01:00
James Allen
43684fda3a Move to bootstrap 3 (site barely functional) 2014-06-04 16:14:35 +01:00
James Allen
2fb8620ba0 Allow deleting of projects forever 2014-06-04 12:45:04 +01:00
James Allen
b95c9e1d0a Find file path and act on it one after the other to avoid race condition 2014-06-04 11:46:01 +01:00
James Allen
015fd6873f Allow projects to be restore after being deleted 2014-06-03 17:35:44 +01:00
Daniel Felder
4320b790bd adjusting unit tests 2014-06-01 19:26:33 +02:00
Daniel Felder
5ad0ca08f9 adjusting unit tests 2014-06-01 18:16:05 +02:00
Daniel Felder
f03b2df461 compile current file if top level document #42 2014-06-01 16:43:52 +02:00
James Allen
80c58bb718 Remove deprecated versioning code 2014-05-27 12:56:23 +01:00
James Allen
c1afbc66d9 Don't error if user is not logged in when compiling 2014-05-27 12:33:56 +01:00
James Allen
8f41c6dcb2 Don't automatically clear the cache 2014-05-21 15:20:25 +01:00
Henry Oswald
fd53cf0124 tell tpds sender to use pub url for docstore 2014-05-21 09:15:50 +01:00
James Allen
063f6c7680 Only auto clear CLSI cache on hard error, otherwise prompt user 2014-05-21 08:04:52 +01:00
Henry Oswald
57eb0e2006 Revert "Revert "changed docstore url to /raw for tpds updates"" 
This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.
 2014-05-20 13:19:02 +01:00
Henry Oswald
ed9e25450a Revert "Revert "change send doc lines using tpds to work with stream and doc store"" 
This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.
 2014-05-20 13:18:59 +01:00
James Allen
93d418b716 Revert "change send doc lines using tpds to work with stream and doc store" 
This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.
 2014-05-20 11:14:06 +01:00
James Allen
22c577f9b5 Revert "changed docstore url to /raw for tpds updates" 
This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.
 2014-05-20 11:13:57 +01:00
Henry Oswald
2398b34f28 changed docstore url to /raw for tpds updates 2014-05-20 08:32:39 +01:00
Henry Oswald
d32fe588b7 change send doc lines using tpds to work with stream and doc store 2014-05-19 20:32:48 +01:00
James Allen
a45200dfe3 Automatically clear CLSI cache when compile fails 2014-05-19 16:10:52 +01:00
James Allen
7fed2155be Differentiate between timeouts, server errors, and LaTeX failures in client 2014-05-19 16:10:52 +01:00
James Allen
6c5a2c2740 Reconfigure internal CLSI call to understand more than just success/failure 2014-05-19 16:10:52 +01:00
Henry Oswald
a53d767eca changed 412 status code to 400 2014-05-19 14:02:54 +01:00
Henry Oswald
de38cbf595 destroy session when getting project details 2014-05-19 12:01:05 +01:00
Henry Oswald
af2de3cdeb finished off change email 2014-05-19 11:50:32 +01:00
Henry Oswald
7437115967 added controler t change user email 2014-05-16 17:45:48 +01:00
Henry Oswald
c4a420bd7f writen function to set the user email safely 2014-05-16 17:29:54 +01:00
James Allen
a62bff5052 USe parallel limit on zip file streaming 2014-05-16 11:50:15 +01:00
Henry Oswald
50df82697a Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-05-16 11:27:09 +01:00
James Allen
2104c69cb9 Stream files into zip in series 2014-05-16 11:26:58 +01:00
Henry Oswald
9419d3a0e5 hooked up the frount end ui to show the email can not be found, 
added client side valdidation on password, removed server side min
length check. Just check that it is not 0 len
 2014-05-16 11:26:29 +01:00
James Allen
240dc2e319 Use crypto.randomBytes 2014-05-16 10:52:31 +01:00
Henry Oswald
9c3c57f2a8 renamed TokenGenerator to PasswordResetTokenHandler and added Expire to function name 2014-05-16 10:43:55 +01:00
Henry Oswald
bf1bb22afd added rate limiting to password reset endpoint 2014-05-16 10:31:33 +01:00
Henry Oswald
133c4759f8 fix tests, whoops 2014-05-15 18:26:00 +01:00
Henry Oswald
e1b3f3542c added some logging 2014-05-15 18:14:05 +01:00
Henry Oswald
24c50189b6 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-05-15 18:01:49 +01:00
Henry Oswald
f7245f32d0 cleaned up old password reset cruft 2014-05-15 18:01:43 +01:00
Henry Oswald
96d98329f1 token based reset works 2014-05-15 17:58:25 +01:00
Henry Oswald
1ffd19099b writen getUserIdFromToken 2014-05-15 17:20:42 +01:00
Henry Oswald
9f901fb1ba added the token generator and its getNewToken function 2014-05-15 17:16:20 +01:00
Henry Oswald
64688e661d written password reset controller 2014-05-15 16:50:38 +01:00
James Allen
e72dd50089 Use configurable uploads folder location 2014-05-15 16:32:17 +01:00
Henry Oswald
551e1d465a written password reset handler 2014-05-15 16:20:23 +01:00
James Allen
93883c7a03 Fix calling of updateDoc 2014-05-15 15:43:04 +01:00
James Allen
f6e85c4140 Don't proxy version number to/from docstore 2014-05-15 12:44:08 +01:00
James Allen
4a27342b01 Merge branch 'docstore_integration' 2014-05-12 14:23:41 +01:00
James Allen
0bddc5552e Use docstore for updating documents 2014-05-08 15:47:50 +01:00
James Allen
8315de58c7 Proxy get doc requests to the docstore 2014-05-08 13:42:30 +01:00
Henry Oswald
9a81f85b41 added gauge metrics for number of open socket.io http and https 
connections
 2014-05-08 11:33:46 +01:00
Henry Oswald
a8571653db added timeouts to filestore handler 2014-05-08 10:55:44 +01:00
James Allen
b29e94b4d5 Use new metrics package 2014-05-07 15:29:04 +01:00
James Allen
c73b7fae69 Use docstore when creating a new doc 2014-05-07 14:31:46 +01:00
James Allen
628fb65bc3 Work with ObjectId's passed to ProjectGetter 2014-05-06 13:34:37 +01:00
James Allen
2fb8b0e807 Get project without doc lines in getAllFolders 2014-05-06 13:15:18 +01:00
James Allen
6a2370b5be Use docstore for CLSI request building 2014-05-06 12:54:26 +01:00
James Allen
ca6be52fa0 Revert "Revert "Get doclines from docstore when cloning project"" 
This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.
 2014-05-06 12:36:00 +01:00
James Allen
8af372aff3 Revert "Revert "Get doc lines from docstore when performing batch operations"" 
This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.
 2014-05-06 12:35:27 +01:00
James Allen
9be4feaae1 Revert "Get doc lines from docstore when performing batch operations" 
This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.
 2014-05-01 17:19:21 +01:00
James Allen
fee632cfc9 Revert "Get doclines from docstore when cloning project" 
This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.
 2014-05-01 17:19:09 +01:00
James Allen
82b56d0b4f Get doclines from docstore when cloning project 2014-04-30 16:45:53 +01:00
James Allen
465b5ca9db Get doc lines from docstore when performing batch operations 2014-04-30 15:49:07 +01:00
Henry Oswald
3b1cc6e500 removed metrics from http logging but added key in 
having the key in there means its easy to analyise the logs based on the
route
 2014-04-30 13:14:41 +01:00
James Allen
355a5a020e Keep reference to deleted docs and delete via docstore 2014-04-30 11:15:29 +01:00
James Allen
0c0548ea85 Don't crash when route path is a regex 2014-04-30 09:42:20 +01:00
James Allen
f8dec76464 Add DocstoreManager 2014-04-29 17:22:37 +01:00
Henry Oswald
0b93a719f0 added statsd metrics timing for each request 2014-04-29 15:20:31 +01:00
Henry Oswald
2cdadf1a4b check for error when doing a password reset 2014-04-29 11:59:23 +01:00
Henry Oswald
bf2c60f84d added rename project to list page 2014-04-28 17:47:47 +01:00
Henry Oswald
3655e83ff9 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-28 16:27:19 +01:00
Henry Oswald
a0fb170878 updated archive module to latest version 2014-04-28 16:27:15 +01:00
James Allen
d528ac21a3 Mark projects as archived, but don't actually delete them 2014-04-28 12:53:43 +01:00
Yimin
295b438498 fix typo 2014-04-22 04:21:42 -05:00
Henry Oswald
0a093b779e fixed #100, if tags is not running you should be able to delete a project still 2014-04-16 17:44:57 +01:00
Henry Oswald
8795a8a921 if retore url is not in mongo don't blow up 2014-04-15 14:19:20 +01:00
Henry Oswald
4b11790a54 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-15 13:59:04 +01:00
Henry Oswald
aca2e5639e added referal allocator to user controller 2014-04-15 13:59:00 +01:00
James Allen
ea651ee9bd Add in restore page 2014-04-14 06:17:07 +01:00
Henry Oswald
c23f9aa056 be able to get build templates from web as well as templates 2014-04-11 15:15:32 +01:00
Henry Oswald
dbe2dd3078 fix case problem with require of newsletter manager 2014-04-10 22:21:20 +01:00
Henry Oswald
51e69392a7 cleaned up and fixed problem with open user opening pojrect 2014-04-10 17:49:39 +01:00
Henry Oswald
9355632f30 deleted user controller. The end of /controllers 2014-04-10 17:29:46 +01:00
Henry Oswald
f7ea925e67 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-10 17:26:14 +01:00
Henry Oswald
5df01acfe1 moved reset password to new controler, not tests as it will be rewritten soon. Just want to kill off /controllers 2014-04-10 17:26:09 +01:00
Henry Oswald
5760e51d6e moved password change to new user controller with tests 2014-04-10 17:15:18 +01:00
Henry Oswald
cc68fe443f Moved register function into user registration handler and new user 
controller
 2014-04-10 16:32:47 +01:00
James Allen
573c877a57 Remove unneeded/broken stream.resume() 2014-04-10 12:57:49 +01:00
James Allen
049dcc2780 Split lines on Windows line endings too 2014-04-10 12:45:42 +01:00
Henry Oswald
2ca7c344a3 reformtted reg handler tests 2014-04-10 12:39:13 +01:00
Henry Oswald
b6b30c3d37 moved logout to new user controller 2014-04-09 16:59:28 +01:00
Henry Oswald
bb7025ad6e moved user update user settings to user controller 2014-04-09 16:33:54 +01:00
Henry Oswald
bcfc1bee0c moved unsubscribe endpoint to new user controller 2014-04-09 15:41:19 +01:00
Henry Oswald
12773c26c2 moved user settings page to the user pages controller 2014-04-09 15:04:47 +01:00
Henry Oswald
823f4a5eb9 created new UserController and put delete user in it 2014-04-09 14:50:12 +01:00
Henry Oswald
37fb959b00 renamed UserController to UserInfoController 2014-04-09 14:45:46 +01:00
Henry Oswald
c55c5032b0 moved delete user to the user controller 2014-04-09 14:43:08 +01:00
Henry Oswald
5f72f13528 moved password reset to user pages controller 2014-04-09 12:26:59 +01:00
Henry Oswald
434fca8874 moved login page to new user page controller 2014-04-09 12:22:57 +01:00
Henry Oswald
fa36891faf moved register page to new UserPagesController 2014-04-09 12:17:50 +01:00
Henry Oswald
c163bba1da populate users on a project in parallelLimit 2014-04-09 11:49:28 +01:00
Henry Oswald
47fb623c4b dont call enable versioning on join project 2014-04-09 11:45:57 +01:00
Henry Oswald
cba3644777 updated building proj from template, no longer suport other domains and work in different envs 2014-04-09 08:24:23 +01:00
Henry Oswald
0668dec65e killed project controller 2014-04-08 21:24:33 +01:00
Henry Oswald
5ac1b59a78 added err check to project list page 2014-04-08 21:06:01 +01:00
Henry Oswald
811859a4a1 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-04-08 20:52:06 +01:00
Henry Oswald
71af89902d removed the buffering from update merger, shouldn't be needed in node 0.10 2014-04-08 20:52:02 +01:00
Henry Oswald
c0780f5a67 made project page load faaaaaaster 2014-04-08 18:02:16 +01:00
Henry Oswald
88ba45b9dc moved load project from old proj controller to new one 2014-04-08 17:44:31 +01:00
Henry Oswald
a6bd916fbf refactored project list, and updated sig for findAllUsersProjects to include err 2014-04-08 16:56:34 +01:00
James Allen
374cf99ef2 Double click on PDF syncs with code 2014-04-08 16:49:21 +01:00
Henry Oswald
0c921d9188 moved project list to new project controller and added tests 2014-04-08 16:40:12 +01:00
Henry Oswald
6b6c447901 clened up new project controller 2014-04-08 15:28:18 +01:00
Henry Oswald
15bddae931 moved new project from old proj controller to new one with test 2014-04-08 15:25:27 +01:00
Henry Oswald
6f84f4214f moved clone project from old proj controller to new one with test 2014-04-08 14:53:33 +01:00
Henry Oswald
5b757ac7ab moved delete project from old proj controller to new one with test 2014-04-08 14:34:03 +01:00
Henry Oswald
bc07525d71 broken dropbox endpoints for user into its own controller 2014-04-07 21:49:22 +01:00
Henry Oswald
6891d1bfb5 killed off project handler, also removed unused changeUsersPrivilegeLevel 2014-04-07 20:54:06 +01:00
Henry Oswald
430cf5cea8 created CollaboratorsHandler 2014-04-07 20:46:58 +01:00
Henry Oswald
ff88849444 added a change privlage level for user to new collab handler, won't work yet but is starting point 2014-04-07 16:54:51 +01:00
Henry Oswald
fa78db5c59 moved setPublicAccessLevel to project details handler 2014-04-07 16:07:44 +01:00
Henry Oswald
d229269a69 moved rename project to project details handler 2014-04-07 15:37:40 +01:00
Henry Oswald
9134fa7b4c moved deleteProject to the project deleter 2014-04-07 13:47:10 +01:00
Henry Oswald
5378890e57 moved rename entity to proj entity handler 2014-04-07 12:18:24 +01:00
Henry Oswald
f28bd33168 remove confirmFolder from project handler, not used. 2014-04-07 12:01:10 +01:00
Henry Oswald
439d38441f removed old getRawLogs socket.io endpoint 2014-04-07 11:59:49 +01:00
Henry Oswald
976054377d removed unused getProject from projectHandler 2014-04-07 11:59:31 +01:00
Henry Oswald
4ff8b48d85 generate random password with uuid 2014-04-07 11:14:50 +01:00
Henry Oswald
1ce1a82617 moved admin controller into different feature 2014-04-07 11:02:12 +01:00
Henry Oswald
73bbd5b495 moved info and home controller into static page feature 2014-04-07 10:55:07 +01:00
Henry Oswald
abbbdf463f Merge branch 'master' into i18n 
Conflicts:
	package.json
 2014-04-07 09:53:03 +01:00
Henry Oswald
b36ced3058 only poll dropbox users who have the dropbox feature 2014-04-05 12:14:50 +01:00
Henry Oswald
33b6626fd9 killed CollaberationManager R.I.P 2014-04-04 17:08:14 +01:00
Henry Oswald
90eac4d52c moved setRootDoc from collab manager to editor controller 2014-04-04 16:59:45 +01:00
Henry Oswald
7c10b5cd24 moved setPublicAccessLevel from collab manager to editor controller 2014-04-04 16:53:59 +01:00
Henry Oswald
08d1eeba78 moved renameProject from collab manager to editor controller 2014-04-04 16:49:44 +01:00
Henry Oswald
d684f04d4f moved moveEntity from collab manager to editor controller 2014-04-04 16:40:53 +01:00
Henry Oswald
88e47bbe12 moved renameEntity from collab manager to editor controller 2014-04-04 16:35:02 +01:00
Henry Oswald
3983e77b73 move deleteProject from collab manager to editor controller 2014-04-04 16:21:30 +01:00
Henry Oswald
68271b04f9 deleted guid manager 2014-04-04 15:58:59 +01:00
Henry Oswald
615e05cb89 moved newsletter manager into its own feature 2014-04-04 15:47:27 +01:00
James Allen
186e39c202 Remove external ShareLaTeX pages 2014-04-03 11:43:04 +01:00
Henry Oswald
479b37a48c null check user when getting user id from session 2014-04-02 15:56:54 +01:00
Henry Oswald
bd118a57c2 set compile throttle back to 10 2014-04-02 12:18:24 +01:00
Henry Oswald
6c700b1b6b updated more modules, mongojs and redis are the big ones 2014-04-01 16:23:13 +01:00
Henry Oswald
8ce13a6b1e changed xss lib to sanitize not validator 2014-03-31 16:46:28 +01:00
Henry Oswald
077266b7c9 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-31 10:55:09 +01:00
Henry Oswald
cd683cc719 check user isn't null in project controller 2014-03-31 10:54:49 +01:00
James Allen
2ca70f25f6 Make track changes default with override for old history 2014-03-31 09:47:36 +01:00
James Allen
3b079cde92 Change CLSI proxy errors to warnings 2014-03-28 16:04:44 +00:00
James Allen
6318d9ace1 Return features along with project details 2014-03-28 12:47:15 +00:00
James Allen
767b220fab Allow CLSI cache to be cleared from within the editor 2014-03-27 17:00:41 +00:00
Henry Oswald
c718535068 use github translate-sharelatex module 2014-03-26 17:30:25 +00:00
Henry Oswald
ebacf86485 changed i18n to use seperate translate module which holds the translations 2014-03-26 16:35:13 +00:00
Henry Oswald
ba1371744b deal with users who may have been deleted but are still inside a subscription group 2014-03-25 16:19:30 +00:00
Henry Oswald
116458671c callback is not defined, use next when there is an error in controller 2014-03-25 14:39:51 +00:00
Henry Oswald
76f0acd49d Merge branch 'master' of github.com:sharelatex/web-sharelatex into i18n 2014-03-25 11:27:39 +00:00
Henry Oswald
f13f036e55 add public into project public access level issue #35 2014-03-25 11:01:16 +00:00
Henry Oswald
ea9ba59371 updated google anltyics experiment code 2014-03-24 22:24:09 +00:00
Henry Oswald
a86e95c711 added bulk of translations in with qqq info about them all 2014-03-24 19:30:47 +00:00
Henry Oswald
063a583ad3 got basic i18n working in express 2014-03-24 17:18:58 +00:00
Henry Oswald
c68f2661a8 uri encode email and project names used in shared url 2014-03-24 15:23:50 +00:00
James Allen
dc2dfaa66c Flush project to track changes when leaving 2014-03-22 09:34:43 +00:00
Henry Oswald
4988fc4136 setup second plans page with free trial using google analytics experiements 2014-03-21 17:49:20 +00:00
James Allen
c0686b6592 Load entire project history into change list view 2014-03-20 16:30:52 +00:00
Henry Oswald
04bdde4d0d added logging around publishing templates and changed another templates-api -> templates 2014-03-20 12:53:23 +00:00
Henry Oswald
3c9f6e0ce0 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-18 15:09:50 +00:00
Henry Oswald
87167841d0 set holding account to false when registered 2014-03-18 15:09:44 +00:00
Henry Oswald
fc2b42400f Merge pull request #54 from cwoac/nodemailer-passthrough 
Nodemailer passthrough
 2014-03-18 13:09:14 +00:00
James Allen
ea0b0c2ec2 Fine tune logging 2014-03-17 12:50:30 +00:00
James Allen
7b2eef22a9 remove console.log debugging line 2014-03-14 12:25:25 +00:00
James Allen
498e0d4787 Fix unit tests 2014-03-14 11:56:15 +00:00
James Allen
4c76b88a2d Log out incoming and outgoing real-time updates 2014-03-14 11:51:19 +00:00
James Allen
745d112d2b Report client side ShareJs error back to server and log them out 2014-03-14 11:14:33 +00:00
James Allen
81fcafb476 Make track changes a feature flag 2014-03-13 13:58:57 +00:00
Henry Oswald
4864eeba0a check if files exist before fingerprinting them issue #75 on sharelatex 2014-03-13 12:38:16 +00:00
Henry Oswald
c237d04456 fingerprint brand/plans.css 2014-03-13 10:06:33 +00:00
Henry Oswald
f7545393f2 fix bad logging on email sender 2014-03-12 23:37:54 +00:00
Henry Oswald
fa6065b298 changed logging which was causing error, reading _id on null 2014-03-12 23:37:10 +00:00
Henry Oswald
b7104a82e9 added null check when filtering elements 2014-03-12 22:44:15 +00:00
Henry Oswald
d20286febd stop response sending twice if compile takes a long time when testing 2014-03-12 21:56:58 +00:00
Oliver Matthews
efbb17a3b9 move all parameter handling to nodemailer. 2014-03-12 15:38:40 +00:00
James Allen
be64b510e8 Support the new update format from the track changes api 2014-03-11 18:01:14 +00:00
James Allen
afb8bb6a42 Add in restore button to track changes 2014-03-11 12:14:52 +00:00
Henry Oswald
e7602321e9 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2014-03-08 19:01:21 +00:00
Henry Oswald
0e7d241fcf fixed has subscription check causing bad redirects 
subscription != recurlySubscription
 2014-03-08 19:01:00 +00:00
Henry Oswald
f2069c6208 converted all analytics to use new google analytics, removing mixpanel 
and heap. Not tracking subscriptions or cancelations yet.
 2014-03-08 19:00:26 +00:00
Oliver Matthews
8989284e10 move from node-ses to nodemailer 2014-03-07 14:08:21 +00:00