Henry Oswald
4f3b01ed43
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-23 17:11:06 +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
James Allen
2476c1e868
Report unsaved changes after 60 seconds
2015-11-18 15:23:23 +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
d959a51f36
show normal price if there is a discount
2015-11-17 11:42:03 +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
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
c8ba7b72ab
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-11-10 10:36:06 +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
8128200d55
Don't show pop up when leaving page in Safari
2015-11-05 10:18:40 +00:00
James Allen
16b7bf222a
Merge branch 'contacts'
2015-11-05 10:14:25 +00:00
James Allen
21f702a42e
Fix bug with click on share button registering
2015-11-04 14:33:27 +00:00
Henry Oswald
0ef8d77ce3
project list minimal to work with projects
2015-11-02 18:44:12 +00:00
James Allen
c46f62cfc1
Ensure that a user can only be added to project once
2015-11-02 15:21:41 +00:00
James Allen
7359fc16ee
Add in show-on-hover CSS classes
2015-11-02 13:59:34 +00:00
Shane Kilkelly
c05c5ac7c8
Clear drag/drop highlight explicitly after the drop has completed.
...
Solves a problem where sometimes the Jquery drag/drop plugin
fails to remove the highlight class from drop target.
2015-10-28 12:17:50 +00:00
Henry Oswald
730088b6ab
set button colour to red for free trial
2015-10-27 23:35:13 +00:00
Henry Oswald
2d03410c42
removed some editor actions sent to google analytics as we are sending too much data
2015-10-27 23:28:54 +00:00
Henry Oswald
97c2b5fb11
removed excess logging for sixpack
2015-10-27 11:20:54 +00:00
Henry Oswald
8f1d09beea
added six pack to web
2015-10-27 10:58:27 +00:00
James Allen
bafd3a1cb4
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-10-16 12:31:21 +01:00
James Allen
fb42489803
Improve formatting of users, groups and tags
2015-10-15 16:43:53 +01:00
James Allen
b0895cc6aa
Support adding groups to projects via share modal
2015-10-15 13:53:46 +01:00
Henry Oswald
bbe510099e
change auto disconnect to 24 hours and expose it publicly for easier testing
2015-10-15 11:38:23 +01:00
Henry Oswald
2f48568f76
fix free trial button on timeout view
2015-10-15 11:38:01 +01:00
Henry Oswald
9eb4dd1b3b
on firefox don't show retrying connected message if the user clicked to change page
...
it creates a bit of worry for the user as it looks like the connection was not there.
2015-10-14 18:07:12 +01:00
Henry Oswald
a1f57f220b
inline ng-clock as it does not work for firefox in base.less quickly enough
2015-10-14 16:22:32 +01:00
Henry Oswald
f5162d424f
if a user is inactive for 12 hours disconect them.
2015-10-14 14:28:24 +01:00
Henry Oswald
28e507b007
Revert "A tiny cache-busting change"
...
This reverts commit 1241b397d32cf982c9bb92865c725ce1e431e409.
2015-10-09 10:12:08 +01:00
Shane Kilkelly
8676ce9538
A tiny cache-busting change
2015-10-09 08:45:50 +01:00
James Allen
c4e4f2c77a
Add modules hook for contacts and support groups in auto complete
2015-10-08 18:17:53 +01:00
James Allen
8cc7869b03
Pull in contacts from contacts api and send to tag-input for autocomplete
2015-10-07 17:32:35 +01:00
Henry Oswald
a73b2ceb37
Merge branch 'connect-failed'
2015-10-07 11:30:48 +01:00
James Allen
64ffcde3df
Namespace subscription groups as SubscriptionGroup
2015-10-05 16:37:03 +01:00
Henry Oswald
89256f9d5f
added connect timeout option to socket.io.connect needed for the firing of connect_failed. Best way to test is drop connect timeout to 10ms and remove some transports from realtime.
2015-10-05 00:43:37 +01:00
Shane Kilkelly
12f1a798c6
Add raven version 1.1.22
2015-09-30 10:38:52 +01:00
