Henry Oswald
89b2cd8477
added secure banner to both payment forms
2015-11-23 17:10:53 +00:00
Henry Oswald
61182451f1
removed SubscriptionDomainHandler from user controller
2015-11-23 15:12:30 +00:00
Henry Oswald
333c1be68f
added dropbox and github promo on left hand side
2015-11-23 15:12:17 +00:00
James Allen
dea97bb9dc
Fix bad connection debugging parameters
2015-11-19 13:15:51 +00:00
James Allen
442ae638de
Revert "Report unsaved changes after 60 seconds"
...
This reverts commit 44a7e598f2fdbd91d18cc340de477ca3d33a1338.
2015-11-19 12:04:35 +00:00
James Allen
99bca31766
Error and hard refresh document after 30 seconds unsaved changes
2015-11-19 12:04:12 +00:00
James Allen
bf452bf306
Keep the connection.id up to date with socket.io client id
...
The meta.source of an update is populated on the server side so
we need to keep our local connection id up to date with it. When a duplicate
op is submitted we must send all possible client ids that it could have
been sent with.
2015-11-19 12:04:12 +00:00
James Allen
cde5144c42
Retry updates that have not been acknowledged.
...
If we do not get a reply from the server acknowledging our update after 5 seconds,
send it again. If it never got to the server, this is like normal. If the update
got to the server, but we never received the ack then we need to rely on ShareJs's
duplicate handling. We set the dupIfSource parameter on any retried updates which
let ShareJs know that it's a dup if we already have an op with this version number
and client id. The doc-updater and real-time services need changes to correctly
send another ack only to the submitting client in the case of a duplicate update.
2015-11-19 12:04:12 +00:00
Henry Oswald
6eb9b095bd
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-19 11:52:19 +00:00
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
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
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
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
Geri Morales
6f93362fdc
Updated package warning parser
2015-11-08 23:02:41 -06:00
James Allen
a153c6682a
Put in client side check for document getting too long
2015-11-06 12:51:43 +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
James Allen
8128200d55
Don't show pop up when leaving page in Safari
2015-11-05 10:18:40 +00:00
