Henry Oswald
b9187ebd08
added test to wording for datajoy popup
2015-10-27 10:58:51 +00:00
Henry Oswald
8f1d09beea
added six pack to web
2015-10-27 10:58:27 +00:00
Henry Oswald
5e19d710ba
change error handling on spelling
2015-10-22 20:15:50 +01:00
Henry Oswald
1c91de0395
added function to get project with only folders for quicker adding of files to large projects
2015-10-21 16:56:06 +01:00
Henry Oswald
885915916a
check if user exists on recurly callback
2015-10-21 11:27:13 +01:00
Henry Oswald
d9734953a6
don't archive project in track changes for moment
2015-10-20 17:36:37 +01:00
Henry Oswald
79a694b5c8
for spelling attach error handler first
2015-10-20 09:55:12 +01:00
Henry Oswald
f61d97a4f6
added null check on user when checking permissions
2015-10-19 22:29:36 +01:00
Henry Oswald
2b8dd7248a
added subscription handler null check
2015-10-19 22:29:11 +01:00
Henry Oswald
d80179ecc6
added missing null check in
2015-10-19 22:14:52 +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
2f48568f76
fix free trial button on timeout view
2015-10-15 11:38:01 +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
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
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
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
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
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
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
James Allen
c64891a61b
Fix folder dropdown to work with new Angular
2015-09-03 12:54:11 +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
James Allen
639424f664
Don't error on project clone if not root doc is set
2015-09-02 14:32:21 +01:00
James Allen
40704b486e
Don't lock up on very long lined documents
2015-08-28 16:52:09 +01:00
Shane Kilkelly
0aaeb6671e
Keep password reset token in session, and strip it from reset page url.
...
This fixes an issue where the reset token was leaked in the referrer header
when navigating away from the password reset page to an external site.
Now we get the token from the query string, store it in the session,
then redirect to the bare url of the password reset page, which then
uses the stored token to render the reset form.
2015-08-24 11:53:33 +01:00
Henry Oswald
a53e3b80cf
if blog or universities site is down don't crash, send 500
2015-08-20 16:55:16 +01:00
Shane Kilkelly
aab7a8713e
Catch the case where filename is shorter than the extension length.
2015-08-20 15:56:30 +01:00
