Henry Oswald
e6f92c181f
ill_take_it != ill_take_it!
2015-12-09 12:00:31 +00:00
Henry Oswald
17cfbf8000
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-12-09 11:49:33 +00:00
Henry Oswald
56fa51f9b2
got translations done for subscription dashboard
2015-12-09 11:24:14 +00:00
Henry Oswald
aafdeb031e
wip - downgrade options it all works, need unit tests & translations
2015-12-08 18:23:28 +00:00
Henry Oswald
8fb1f9e00b
wip: downgrade to student if they are a collab monthly
2015-12-08 15:45:52 +00:00
Brian Gough
91a047ea7a
added sentry error reporting
2015-12-08 12:16:00 +00:00
Henry Oswald
5c05d02840
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-12-08 11:38:29 +00:00
Henry Oswald
fc7ca5ef74
tried changing a couple of sentry ignore to regex's
2015-12-08 11:38:21 +00:00
Brian Gough
cd4ab35fbc
only send a 5% sample of sentry errors
2015-12-08 11:34:11 +00:00
Henry Oswald
7e31851949
fix margin for modal alerts on upload
2015-12-08 08:50:11 +00:00
Henry Oswald
156f646613
increase number of files that can be uploaded & limit 1 concurent
2015-12-07 16:50:09 +00:00
Henry Oswald
88799fc881
add help link when user needs to refresh page
2015-12-04 08:43:55 +00:00
James Allen
50112a59d4
Monitor memory usage and do periodic GC
2015-12-03 10:52:06 +00:00
Henry Oswald
25411189a7
redirect to login if session expired in file upload
2015-12-02 15:40:14 +00:00
Henry Oswald
1d0228ce0c
updated packages to work with node 4.2
...
still needs a deep test
2015-12-01 21:28:35 +00:00
Henry Oswald
9383977ca5
remove socket.io as a dependency
2015-12-01 21:18:00 +00:00
Henry Oswald
6738fdd1fc
added translation for rate limit message to client
2015-12-01 13:11:19 +00:00
Henry Oswald
8590af3e49
added rate limit on server side for file uploads
2015-12-01 13:08:49 +00:00
Henry Oswald
a6aea41fb1
added max of 20 files which can be uploaded at same time to client
2015-12-01 12:55:35 +00:00
Henry Oswald
69734c20c0
added heapdump endpoint
2015-11-30 16:16:16 +00:00
Henry Oswald
4fa38178be
ignore some common errors in sentry
2015-11-30 13:49:46 +00:00
Henry Oswald
5213be4fe9
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-25 11:54:40 +00:00
Henry Oswald
91a84cb232
increase compile throttle limit
2015-11-25 11:07:53 +00:00
Henry Oswald
1ddf95e746
accesabble != accessible
2015-11-24 16:53:44 +00:00
Henry Oswald
8ca962b734
added missing convert handler
2015-11-24 14:17:40 +00:00
Henry Oswald
4f3b01ed43
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-23 17:11:06 +00:00
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
