Henry Oswald
a94a03fc3e
added missing stubbed module call breaking tests
2015-10-19 15:48:59 +01:00
Henry Oswald
0c74673e04
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-10-19 15:44:54 +01:00
Henry Oswald
2c32126f68
archive in track changes as well as docstore
2015-10-19 15:44:50 +01:00
James Allen
36678301e6
Try to put a new doc in the docstore first so that if it fails it doesn't leave a broken doc_id in the project
2015-10-16 12:34:33 +01:00
James Allen
bafd3a1cb4
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-10-16 12:31:21 +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
aba8f164fc
copy right 2015 not 2014
2015-10-14 14:44:48 +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
Henry Oswald
ea5046ef20
Merge branch 'master' of https://github.com/sharelatex/web-sharelatex
2015-10-09 10:11:57 +01:00
Henry Oswald
e593b3f717
append string to ide.js min which we can use for testing via status cake
2015-10-09 10:11:38 +01:00
Shane Kilkelly
8676ce9538
A tiny cache-busting change
2015-10-09 08:45:50 +01:00
Henry Oswald
f1d07811df
update the entire users features on assign bonus bu don't update
...
the user features if there is nothing to update when assigning bonus
2015-10-07 13:50:51 +01:00
Henry Oswald
a73b2ceb37
Merge branch 'connect-failed'
2015-10-07 11:30:48 +01:00
Henry Oswald
b69ec9768d
bonus allocater does not need to check if user has subscription any more.
2015-10-05 16:50:34 +01:00
James Allen
64ffcde3df
Namespace subscription groups as SubscriptionGroup
2015-10-05 16:37:03 +01:00
Henry Oswald
fae7d431f4
after subscription is updated always check bonus
2015-10-05 16:33:13 +01:00
Henry Oswald
9a60617162
change referral allocated to only upgrade features and to find highest level
...
i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.
2015-10-05 12:30: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
ae10cc5755
Update default raven version to 1.1.22
2015-09-30 10:40:20 +01:00
Shane Kilkelly
12f1a798c6
Add raven version 1.1.22
2015-09-30 10:38:52 +01:00
Shane Kilkelly
15847f8921
Add the 'release' attribute to Sentry configuration.
2015-09-29 15:41:25 +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
54de12d908
Fix alignment of inputs in Search-Replace panel.
2015-09-28 14:16:10 +01:00
Henry Oswald
27c02f5ef5
added some robots to the blocked list
2015-09-22 14:27: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
011f628de8
lock down translations version
2015-09-17 10:26:29 +01:00
Henry Oswald
24007affa7
change admin link to /admin/user
...
this is the page for the admin panel, if the panel is installed
then it will load, otherwise a redirect to register users has been
added in.
2015-09-16 12:17:58 +01:00
Henry Oswald
70611da833
added a null check to getRequestUserAndProject
2015-09-15 12:47:48 +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
77ac6c1baf
Merge branch 'master' of github.com:sharelatex/web-sharelatex
2015-09-14 12:08:11 +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
Henry Oswald
507e8d13a6
Merge pull request #200 from heukirne/wordcount
...
Wordcount hook
2015-09-11 16:22:15 +01:00
Shane Kilkelly
778f588741
Merge pull request #199 from sharelatex/sk-missing-users
...
When a user is null in track-changes UI, display them as "Anonymous".
2015-09-11 14:24:08 +01:00
Henrique Dias
3be0425b45
add unit tests for wordcount
2015-09-11 10:21:05 -03:00
Henrique Dias
d228fd88ab
add worcount file param
2015-09-11 09:53:06 -03:00
Henrique Dias
77c2162872
add wordcount clsi handler
2015-09-10 12:41:48 -03:00
James Allen
662050b3f9
Only show services header if we have some services to render
2015-09-10 16:01:12 +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
5fdb50958e
Fix logs dropdown to work with Angular 1.3
2015-09-03 13:13:28 +01:00
James Allen
95db287fef
Fix more dropdown menu in project list for new Angular
2015-09-03 13:02:43 +01:00
