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
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
Henry Oswald
25411189a7
redirect to login if session expired in file upload
2015-12-02 15:40:14 +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
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
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
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
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
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
b4c7209a11
Try to reconnect either on editor-cursor move, or when any thing in the page is clicked.
2015-09-29 10:23:21 +01:00
Shane Kilkelly
8bd83f64e0
Try to reconnect when the editor cursor is moved.
2015-09-28 16:18:09 +01:00
Shane Kilkelly
b393de1450
Try to reconnect when the user types in the editor.
2015-09-28 15:45:14 +01:00
Shane Kilkelly
30a63d1e42
Remove ng-click on output files, which was causing a double-request for download.
2015-09-22 10:11:03 +01:00
Henry Oswald
5ffd76c670
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-09-14 15:36:08 +01:00
Henry Oswald
9a72667e91
added word count UI feature.
2015-09-14 15:28:19 +01:00
Shane Kilkelly
5e157bcd16
Fix a case where a null user would cause displayName to crash.
2015-09-14 12:27:27 +01:00
Shane Kilkelly
7bc9218b3c
Fix up a bunch of issues with the track-changes list view.
...
- not crash when a user is null
- fix alignment of user color square
- if first and last name are absent, display email instead
- truncate overly long display name with '...'
2015-09-14 12:08:05 +01:00
Shane Kilkelly
4a315a0474
When a user is null in track-changes UI, display them as "Anonymous".
2015-09-10 14:35:09 +01:00
James Allen
1c9f9274a9
Remove uneeded and now wrong Sentry error capturing
2015-09-08 11:48:39 +01:00
James Allen
25b9a9be19
Upgrade Ace to 'package 11.07.15'
...
This required a refactor of all code that listen to events changes since the API
has changed. See https://github.com/ajaxorg/ace/pull/1745 for more details.
2015-09-07 17:04:05 +01:00
James Allen
aa06eb55b7
Merge branch 'master' into angular_1.3.15
2015-09-03 12:52:08 +01:00
James Allen
7446572ed9
Group online users into dropdown menu when more than 3
2015-09-02 14:33:51 +01:00
James Allen
34c8f22dd7
Allow multiple collaborators to be added at once with a list of emails
2015-09-02 14:33:43 +01:00
Shane Kilkelly
96619bde8c
Move the template-browser code into the 'templates' module.
...
Now located to be located at `modules/templates/public/coffee/main/index.coffee`,
moved to complete a migration of template related code into the templates module.
Corresponding commit in sharelatex-web-modules:
625c556e42072d30f30d474aaef72deff24ca154
2015-08-18 14:21:35 +01:00
Henry Oswald
3e55aef25a
show error if socket io fails to connect. Not tested yet.
2015-07-31 15:42:47 +01:00
James Allen
c75cdf24b5
Fix selectAll for angular upgrade
2015-06-29 13:43:44 +01:00
Henry Oswald
b657c5207e
cleaned up the views a bit
2015-05-27 21:45:29 +01:00
Henry Oswald
481bd67fbd
changed paths to use hyphens and add succesfull join page
2015-05-26 15:26:45 +01:00
Henry Oswald
cad8d8a23b
v1 basic invite works, not pretty or tested
2015-05-22 13:57:15 +01:00
Brian Gough
1bb7ae3996
always remove the spinner, even if it is not spinning
2015-05-11 14:12:24 +01:00
Brian Gough
92836f49fc
avoid unnecessary spell checks on session change
2015-05-11 10:07:11 +01:00
Henry Oswald
9764ab258b
added complex password validation to password resets
2015-04-30 12:05:46 +01:00
Henry Oswald
65b91930d1
field != feild
2015-04-28 17:50:06 +01:00
Henry Oswald
cdbc239a62
config the password options via the settings
2015-04-28 17:39:35 +01:00
Henry Oswald
fa4a51b5a3
email address is not allowed as part of password
2015-04-28 16:20:12 +01:00
Brian Gough
82c35d9b82
example of using controller to access other fields
2015-04-27 16:38:40 +01:00
Henry Oswald
639f73ea74
mvp for password validation
2015-04-27 14:42:32 +01:00
Henry Oswald
7d109ce77d
null check error in pdf view
2015-04-23 10:40:11 +01:00
Henry Oswald
31a51b73d8
improved linkify so data is correctly sanitized, used inbuilt angular lib
...
don't know how I missed that last time!
2015-04-22 17:58:33 +01:00
James Allen
6c585adb3c
Merge branch 'buffer_sharejs_ops'
2015-04-22 13:59:19 +01:00
Brian Gough
d0c759c6fb
always send the latest position when emitting updatePosition event
...
Avoid sending outdated position by capturing the current position in
$scope.currentPostion on every call and sending it the when the timer
for updatePosition runs.
2015-04-20 14:26:56 +01:00
James Allen
87d625b5e0
Delay flushes performed after getting an op acknowledgement as well
2015-04-17 17:32:23 +01:00
James Allen
8a32ca1b64
Reduce buffer delay to 1 second
2015-04-17 16:45:17 +01:00
James Allen
af85c83877
Buffer updates when only a single user is editing a document
...
Add in 5 second delay between flushing updates when only a single user
is editing a document. As soon as an update is received from another user
we switch to sending updates immediately again so there is no latency
between collaborators. The logic applies to individual docs, so two users
can be editing different docs and will still buffer updates since they
will not affect each other.
2015-04-17 11:24:28 +01:00
Henry Oswald
dbd076849b
updated online user management to only send cursor position when people are collaborate
...
if someone is in the project with them cursor info is sent every 500ms, if they are
by themself it is sent every 5mins so they are still marked as online.
2015-04-16 21:01:03 +01:00
Henry Oswald
52f3248869
null check entity in filetree for orderByFoldersFirst
2015-04-14 17:05:13 +01:00
Brian Gough
2ed934120c
Fix display of annotations when switching files in ace editor
...
The annotations (error markers) were not preserved when switching
between files. The setAnnotations method was being called before the
document is ready -- when the document is attached to ace the content
is deleted and reinserted, which caused the annotations to be removed.
To fix the problem we set the annotations after attaching.
2015-04-08 14:39:39 +01:00
Brian Gough
52b041c0bf
update pdf text layer builder with improvements from pdfjs 1.0.1040
2015-03-31 14:55:05 +01:00
Brian Gough
b893446b9c
use new pdfjs getDestination method in pdfRenderer
...
gives faster lookup of link destinations in pdf file
2015-03-31 14:54:36 +01:00
Brian Gough
0684fa36fd
upgrade pdfjs to version 1.0.1040
2015-03-31 14:53:27 +01:00
Mick O'Brien
9f037384b6
Update word regex for spellcheck
...
Adds Latin Extended-A characters to word regex to prevent splitting words half way through on characters like ąęćółżźńś.
2015-03-23 16:14:38 +00:00
James Allen
358242a5e0
Merge pull request #159 from SibrenVasse/adblock_fix
...
Fix for adblock blocking loginscreen.
2015-03-23 12:29:40 +00:00
James Allen
8483f249ee
Actually proxy websocket connections
2015-03-20 19:08:48 +00:00
Brian Gough
b0a32b1ef8
make new pdf viewer the default for all users
...
remove old pdf viewer
2015-03-20 11:28:28 +00:00
James Allen
ff55e4c5ed
Merge branch 'private_registration'
2015-03-20 10:34:17 +00:00
Brian Gough
3bdf2158c1
avoid exception on page size change
2015-03-19 14:26:06 +00:00
James Allen
9b8cf7bcfa
Remove public registration and require that a user be registered by an admin
2015-03-19 14:22:48 +00:00
