Commit graph

1327 commits

Author SHA1 Message Date
Henry Oswald
91a84cb232 increase compile throttle limit 2015-11-25 11:07:53 +00:00
Henry Oswald
8ca962b734 added missing convert handler 2015-11-24 14:17:40 +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
Henry Oswald
003cdc01fc consolidated 2 options in payment left menu 2015-11-18 15:21:48 +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
b1c0dfb0e4 show discount rate on pricing page 2015-11-17 12:23:27 +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
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
05c45cd658 changed upgrade to list features 2015-11-16 14:36:59 +00:00
Henry Oswald
3ef18a09eb removed finished sixpack test 2015-11-16 12:21:24 +00:00
Henry Oswald
ba58509a67 increased length rate limit is in effect for 2015-11-16 12:21:06 +00:00
Henry Oswald
56635d2221 set timeout for sixpack server dynamically, needs to be longer for local dev 2015-11-12 12:43:55 +00:00
Henry Oswald
8a6c3b5838 covert payment-left-menu test 2015-11-12 09:57:06 +00:00
Henry Oswald
377cc11c3b added sixpack to server side 2015-11-12 09:29:44 +00:00
Henry Oswald
3a61f48068 added payment page with security seal 2015-11-11 17:59:35 +00:00
Henry Oswald
e4b36e6c5c moved where ask_proj_owner_to_upgrade_for_history shows up in rendering issue 2015-11-11 17:25:28 +00:00
Henry Oswald
cf6998cac3 added ab test into payment page left hand feature list 2015-11-11 16:42:04 +00:00
Henry Oswald
453415ff7c fixed tab index on payments page 2015-11-11 16:22:07 +00:00
Henry Oswald
4e8eebb482 increase rate limit threshold on pdf downloads 2015-11-11 09:00:38 +00:00
Henry Oswald
16670cb3e3 only rate limit full pdf downloads 2015-11-10 16:23:55 +00:00
Henry Oswald
da9535f442 fix an alignment issue 2015-11-10 15:38:05 +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
23fd12c67d dropped throttle for full pdf download to 30 over 5 mins
1 download every 10 seconds which seems ample
2015-11-10 11:53:11 +00:00
Henry Oswald
615e4b448a fix search on project list page. ng-if breaks it but ng-show does not for some reason 2015-11-10 11:36:11 +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
9dcc251017 Copy header values so they can be modified by modules each request 2015-11-05 16:52:50 +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
77d349dd8f added more long form list of features on track changes upgrade 2015-11-02 18:44:26 +00:00
Henry Oswald
0ef8d77ce3 project list minimal to work with projects 2015-11-02 18:44:12 +00:00
Henry Oswald
79c4c6e26b added split test for on boarding, doing cut down view 2015-11-02 16:15:56 +00:00
James Allen
c46f62cfc1 Ensure that a user can only be added to project once 2015-11-02 15:21:41 +00:00
Henry Oswald
cf48c94725 rate limit pdf downloads 2015-10-30 11:56:01 +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
6c75a6dbe5 change six pack key and add into default settings 2015-10-27 11:37:11 +00:00
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
James Allen
144f1396b7 Fix problem with pasting multiple emails 2015-10-15 17:03:22 +01:00
James Allen
fb42489803 Improve formatting of users, groups and tags 2015-10-15 16:43:53 +01:00
Henry Oswald
2f48568f76 fix free trial button on timeout view 2015-10-15 11:38:01 +01:00
James Allen
d996ed6e47 Refactor addUserToProject for better access by groups 2015-10-14 17:29:58 +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
James Allen
c4e4f2c77a Add modules hook for contacts and support groups in auto complete 2015-10-08 18:17:53 +01:00
James Allen
78c5741d06 Add contact when adding collaborator 2015-10-08 16:42:23 +01:00
James Allen
d11d536994 Refactor adding and removing collaborators to not go through EditorController 2015-10-08 14:15:36 +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
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
Shane Kilkelly
2dd56d0b32 If we're sending a html file to mobile-safari, do so as plain text.
This prevents safari from trying to render the page,
which it does because it ignores the "Content-Disposition" header.
2015-08-20 12:02:43 +01:00
Henry Oswald
63580f6a79 remove useClsi2 flag in project collection 2015-08-19 11:58:41 +01:00