github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
1451 commits 3 branches 7 tags 206 MiB
Commit graph

317 commits

Author SHA1 Message Date
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
2375dbb851 run succesful login before each smoke test to avoid any rate limit issues 2014-09-29 11:45:34 +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
Henry Oswald
b875864568 check for error on smoke test after 2014-09-04 18:06:24 +01:00
James Allen
971afb7342 Treat large text files as binary 2014-09-04 13:00:51 +01:00
Henry Oswald
c131a9d301 added /logout to smoke tests 2014-09-04 12:35:59 +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
Henry Oswald
6bb4c9867e convert smoke cookie to be unsecure so curl will send it 2014-08-19 15:35:34 +01:00
Henry Oswald
ca5b1e7422 cleaned up smoke tests 2014-08-19 14:35:20 +01:00
Henry Oswald
a082dd0f3b use cookie domain in smoke test path 2014-08-19 12:05:07 +01:00
Henry Oswald
8895ceea35 write cookies to tmp for smoke test 2014-08-19 12:01:30 +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
Henry Oswald
0dc4b3a01b login works with curl 2014-08-19 10:54:33 +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
Henry Oswald
b41256b599 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2014-08-08 13:15:03 +01:00
Henry Oswald
b48ca2c7ed fixed smoke test breaking on title, removed "the" as its not great for SEO (i think) 2014-08-08 13:11:49 +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
James Allen
0a44aa9e71 Push into doc updater queue rather than pub/sub for updates 2014-08-07 13:19:10 +01:00
James Allen
dc54fe3d2e Fix Smoke test to use new title 2014-08-06 11:50:19 +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
ff7b7cdd20 Fix smoke tests 2014-07-08 14:29:06 +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
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
978e3262b5 added redirects from config file in, used for old template paths 2014-07-01 15:44:12 +01:00