Commit graph

18604 commits

Author SHA1 Message Date
Henry Oswald
dc066dfbdb added adminDN and adminPW fields to ldap settings 2015-11-19 11:52:11 +00:00
Henry Oswald
b3bdbb3fb7 Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-19 11:51:53 +00:00
James Allen
503b766dcc For duplicate ops only send ack to submitting client
When a duplicate op is received, we only need to ack it to client
that sent it. Only that client is having trouble, and all other clients
will already have received it.
2015-11-19 10:58:28 +00:00
James Allen
2589e2d417 Gracefully return when an op has already been submitted
It is not a fatal error if an op has already been submitted. We just
need to send an ack back to the client that submitted it and continue.
If we detect a duplicate op, set dup: true on the op and pass it back
to real-time for distributing. The dup: true flag will ensure it only
gets acknowledged to the submitting client, not everyone.
2015-11-19 10:54:28 +00:00
Marc Egea i Sala
dcaf2d0fa6 Merge pull request #4 from overleaf/handle-401
Handle 401 errors as ptorected projects
2015-11-19 10:52:53 +00:00
Marc Egea i Sala
18bb534f96 Handle 401 errors as ptorected projects 2015-11-19 10:40:07 +00:00
James Allen
2476c1e868 Report unsaved changes after 60 seconds 2015-11-18 15:23:23 +00:00
Henry Oswald
003cdc01fc consolidated 2 options in payment left menu 2015-11-18 15:21:48 +00:00
Henry Oswald
f40e984e10 Updated ldap settings to make them clearer 2015-11-17 16:27:29 +00:00
Henry Oswald
3836142cee don't create 2 sessions in sixpack 2015-11-17 16:16:37 +00:00
Henry Oswald
5a9174b1de use user_id for client side six pack. also change name of editor free trial test 2015-11-17 15:54:59 +00:00
Henry Oswald
76be671e26 fix the popup alert when starting a new trial 2015-11-17 14:56:03 +00:00
Henry Oswald
b1c0dfb0e4 show discount rate on pricing page 2015-11-17 12:23:27 +00:00
Xavier Trochu
476db58c3f Add the opts parameter to getFileStream and implement Range requests 2015-11-17 12:52:25 +01:00
Henry Oswald
631e84f5d6 copy coupon code over when switching to student 2015-11-17 11:47:28 +00:00
Henry Oswald
264839e27d don't show tax or subtotal if there is no info on it 2015-11-17 11:44:31 +00:00
Henry Oswald
d959a51f36 show normal price if there is a discount 2015-11-17 11:42:03 +00:00
Henry Oswald
fefe7c2022 ignore ldap in modules 2015-11-17 11:41:52 +00:00
Henry Oswald
ef3613371f don't show coupon area for upgrades 2015-11-17 11:41:39 +00:00
Henry Oswald
471b285ad7 changed plan choice using ab sixpack not ga 2015-11-16 16:40:14 +00:00
Henry Oswald
9d3c49242d added api into angular sixpack 2015-11-16 16:22:27 +00:00
Henry Oswald
f7854649e2 added 20% off option 2015-11-16 15:58:04 +00:00
Henry Oswald
89381e84eb switch to student switches to free trial 2015-11-16 15:51:54 +00:00
Henry Oswald
05c45cd658 changed upgrade to list features 2015-11-16 14:36:59 +00:00
Henry Oswald
3ef18a09eb removed finished sixpack test 2015-11-16 12:21:24 +00:00
Henry Oswald
ba58509a67 increased length rate limit is in effect for 2015-11-16 12:21:06 +00:00
Xavier Trochu
26523b011a small fixes 2015-11-16 09:59:27 +01:00
Henry Oswald
253a99e780 added try catch around word count where a file is not created 2015-11-12 15:19:22 +00:00
Henry Oswald
56635d2221 set timeout for sixpack server dynamically, needs to be longer for local dev 2015-11-12 12:43:55 +00:00
Henry Oswald
49e6f4db87 set NODE_TLS_REJECT_UNAUTHORIZED to 0 for testing
allows us to talk to staging sixpack
2015-11-12 12:38:35 +00:00
Henry Oswald
8a6c3b5838 covert payment-left-menu test 2015-11-12 09:57:06 +00:00
Henry Oswald
377cc11c3b added sixpack to server side 2015-11-12 09:29:44 +00:00
Henry Oswald
3a61f48068 added payment page with security seal 2015-11-11 17:59:35 +00:00
Henry Oswald
e4b36e6c5c moved where ask_proj_owner_to_upgrade_for_history shows up in rendering issue 2015-11-11 17:25:28 +00:00
Henry Oswald
cf6998cac3 added ab test into payment page left hand feature list 2015-11-11 16:42:04 +00:00
Henry Oswald
453415ff7c fixed tab index on payments page 2015-11-11 16:22:07 +00:00
Henry Oswald
4e8eebb482 increase rate limit threshold on pdf downloads 2015-11-11 09:00:38 +00:00
Henry Oswald
16670cb3e3 only rate limit full pdf downloads 2015-11-10 16:23:55 +00:00
Henry Oswald
da9535f442 fix an alignment issue 2015-11-10 15:38:05 +00:00
Henry Oswald
b6b252b1f8 only participate in track changes test if they are shown view 2015-11-10 15:14:27 +00:00
Henry Oswald
5598624ee1 only run participate test for sign up if user has no projects 2015-11-10 14:06:06 +00:00
Henry Oswald
23fd12c67d dropped throttle for full pdf download to 30 over 5 mins
1 download every 10 seconds which seems ample
2015-11-10 11:53:11 +00:00
Henry Oswald
615e4b448a fix search on project list page. ng-if breaks it but ng-show does not for some reason 2015-11-10 11:36:11 +00:00
Henry Oswald
c8ba7b72ab Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-11-10 10:36:06 +00:00
James Allen
7185657f06 Use max_doc_length rather than max_doc_size to be consistent with other services 2015-11-09 15:24:21 +00:00
Geri Morales
6f93362fdc Updated package warning parser 2015-11-08 23:02:41 -06:00
James Allen
e73890bfc2 Error if update would make document too long 2015-11-06 12:52:03 +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
27d3ebc1fd Add configurable max_doc_length 2015-11-06 12:43:53 +00:00
James Allen
9dcc251017 Copy header values so they can be modified by modules each request 2015-11-05 16:52:50 +00:00