github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
5399 commits 3 branches 7 tags 199 MiB
Commit graph

276 commits

Author SHA1 Message Date
Paulo Reis
b841d41b68 Actually send the data to Countly. 2016-07-06 12:26:21 +01:00
Paulo Reis
72d498c6c8 Merge branch 'master' into pr-contact-form-suggestions 2016-06-29 11:58:07 +01:00
Paulo Reis
f50c73642a Integrate with KB index. 2016-06-29 11:57:43 +01:00
Shane Kilkelly
6581bc4ecf set postal_code as zip 2016-06-28 14:15:47 +01:00
Paulo Reis
0551f27c83 Extra search options; only search after three chars have been entered. 2016-06-27 14:46:34 +01:00
Shane Kilkelly
9938787e4a fix a few silly issues. Appears to work now 2016-06-27 10:38:10 +01:00
Paulo Reis
c2ace9a0a0 Restrict # of hits returned; clear results on empty search string. 2016-06-27 10:21:36 +01:00
Shane Kilkelly
72c73809f6 Generate address xml from object. 2016-06-27 09:44:40 +01:00
Paulo Reis
2c9812f62f Add algolia search. 2016-06-24 17:10:07 +01:00
Shane Kilkelly
249381b6a8 WIP: initial work on sending address to recurly for paypal subscriptions 2016-06-24 11:42:58 +01:00
Paulo Reis
a587d5ddba Set up model options. 2016-06-24 11:02:29 +01:00
Shane Kilkelly
6f07ea513e Remove DataJoy link from the project page. 2016-06-21 13:28:08 +01:00
Shane Kilkelly
9919f5f44a Refactor heap analytics 2016-06-16 10:17:36 +01:00
Shane Kilkelly
522ac8b59b initial port of heap code from DJ into sharelatex. 2016-06-15 15:35:03 +01:00
Henry Oswald
633839c98b for support tickets include browser/os and hide email address if 
set already. This way we know who they are logged in with which has
caused condfusion.
 2016-04-04 16:05:42 +01:00
Henry Oswald
cb3eb88af2 Merge branch 'subscriptionimprovements' 2016-03-31 11:58:56 +01:00
Henry Oswald
c7da9f1eef added different check to contact-us modal 2016-03-29 14:25:59 +01:00
Henry Oswald
e2dffdf722 when user contact us put project url at bottom of message 2016-03-24 14:23:18 +00:00
Henry Oswald
6662d4c2cd wired up modal for learn and added translations 2016-03-24 12:05:54 +00:00
James Allen
9b84e1b164 Improve styling of wiki search 2016-03-24 11:38:56 +00:00
Henry Oswald
ce2cfeaa5b don't show search bar in templates if its not configured 2016-03-24 09:52:19 +00:00
Henry Oswald
6a4e13d3c8 added templates angular file forgoten in last commit 2016-03-24 09:35:11 +00:00
Henry Oswald
c554b0630d if user has subscription before joining group is given option to cancel personal one 2016-03-22 16:59:47 +00:00
Henry Oswald
fbfd160c6d default message to empty string 2016-03-22 14:02:15 +00:00
Henry Oswald
cacb3bf39e Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2016-03-22 12:30:52 +00:00
Henry Oswald
69a7a1508b modal != modal instance 2016-03-22 12:28:37 +00:00
James Allen
7637c858c8 Merge branch 'master' of github.com:sharelatex/web-sharelatex 2016-03-22 12:14:18 +00:00
James Allen
4595c90363 Use translations for action in project delete modal 2016-03-22 12:12:11 +00:00
Henry Oswald
4e78e34cdf finished contact us with groove 
for settings file:

<a ng-controller="ContactModal", ng-click="contactUsModal()", href>Contact</a>
 2016-03-21 11:41:05 +00:00
Henry Oswald
882297c353 working framework. not happy with groove. Can't set mailbox 2016-03-18 12:55:35 +00:00
Henry Oswald
36966f0c9b wip 2016-03-10 17:11:28 +00:00
Henry Oswald
789abe504d added random ticket number to groove tickets 2016-03-02 12:23:51 +00:00
James Allen
f21aa0dd94 Don't allow project names to be blank 2016-02-23 15:21:53 +00:00
Henry Oswald
85a8bc97ed add leave group button for group subscriptions 2016-02-19 12:27:32 +00:00
James Allen
e4960e782f Merge branch 'ja-multi-select' 2016-02-12 11:56:10 +00:00
Henry Oswald
5c5888b5dc Merge branch 'pr/221' 2016-02-11 11:44:45 +00:00
James Allen
4487ae1253 Look for queued-http in the correct place 2016-02-10 11:38:01 +00:00
James Allen
506d2224aa Allow Cmd+Clicking to multi select entries in the file tree 2016-02-09 15:13:58 +00:00
Henry Oswald
47eebb1840 add null check and default empty object for subscirption dashboard 2016-02-03 17:41:05 +00:00
Henry Oswald
a05a7b984f refresh scope after contact us request 2016-02-01 15:41:43 +00:00
Henry Oswald
7f05ac54f8 improved contact us form progress feedback 2016-02-01 15:22:22 +00:00
Henry Oswald
1f6b43e1b1 added universties site angular controler 2016-02-01 14:33:50 +00:00
James Allen
a0e129b880 Remove tag from projects when deleted 2016-02-01 11:36:04 +00:00
James Allen
1ee0ef2cde Remove console.log line 2016-02-01 10:36:38 +00:00
James Allen
b32178182d Explicitly create tags and get their id 2016-02-01 10:18:56 +00:00
James Allen
77cc6af35e Update add tag end point to use tag_id 2016-02-01 10:18:56 +00:00
James Allen
f1e65cc776 Use tag_id for deleting tags from project 2016-02-01 10:18:56 +00:00
James Allen
1bd5aef85f Allow renaming of tags 2016-02-01 10:18:56 +00:00
James Allen
1a86e69d1f Allow tags to be deleted 2016-02-01 10:18:56 +00:00
Henrique Santos
9429e49cf8 finishing frontend 2016-01-22 18:08:39 -02:00
Henrique Santos
476eaa8b84 add notification backend and unit test 
add notification init frontend
 2016-01-21 18:42:50 -02:00
Henry Oswald
134e733b01 change succesful subscription message 2015-12-21 10:31:22 +00:00
Henry Oswald
1ad27bb6ed changed left menu test to show random benefit to users 2015-12-16 12:40:34 +00:00
Henry Oswald
3ed4c0fb72 change name of test cancelation-view -> cancelation-options-view 2015-12-12 11:17:17 +00:00
Henry Oswald
d5cf8f6886 simplified cancelation logic 2015-12-09 13:58:26 +00:00
Henry Oswald
56fa51f9b2 got translations done for subscription dashboard 2015-12-09 11:24:14 +00:00
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
333c1be68f added dropbox and github promo on left hand side 2015-11-23 15:12:17 +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
5598624ee1 only run participate test for sign up if user has no projects 2015-11-10 14:06:06 +00:00
Henry Oswald
0ef8d77ce3 project list minimal to work with projects 2015-11-02 18:44:12 +00:00
Henry Oswald
730088b6ab set button colour to red for free trial 2015-10-27 23:35:13 +00:00
James Allen
64ffcde3df Namespace subscription groups as SubscriptionGroup 2015-10-05 16:37:03 +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
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
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
9b8cf7bcfa Remove public registration and require that a user be registered by an admin 2015-03-19 14:22:48 +00:00
Sibren Vasse
f4f74a2baf Fix for adblock blocking loginscreen. 2015-03-17 20:14:55 +01:00
Henry Oswald
97f0fad525 add vat number option to payment form 2015-03-04 18:08:06 +00:00
Henry Oswald
80dc2f9224 send coupon code server side to be applied to users subscription 2015-03-04 17:50:24 +00:00
Henry Oswald
f7f681d2a3 deal with nan tax rate if user is not in taxable location for subscription dashboard/change plan 2015-02-22 18:35:59 +00:00
Henry Oswald
1d6c928c81 fix bug which showed all plans as monthly in payment form. 
Also use translations for string of month/year
 2015-02-10 18:05:39 +00:00
Henry Oswald
6f5b524b56 use currency for change plan pricing 2015-02-06 17:08:42 +00:00
Henry Oswald
79e7f82a36 only setup recurly once for subscription dashboard and apply async to make sure updates on pricing are applied 2015-02-06 16:54:11 +00:00
Henry Oswald
7030d5f822 change plan shows price including tax 2015-02-06 16:19:52 +00:00
Henry Oswald
e9ab77351a Merge branch 'master' of https://github.com/sharelatex/web-sharelatex 2015-02-03 11:36:16 +00:00
Henry Oswald
e4976539d9 show generic error handler only on error 2015-02-03 10:41:58 +00:00
James Allen
860de1528f Load default coupon code if provided in query string 2015-02-02 17:42:27 +00:00
James Allen
36513f443c Ensure we are in a digest loop when updating validation errors 2015-01-29 14:43:38 +00:00
James Allen
3731c62e17 Get validation working with address fields and Angular digest loop 2015-01-29 14:22:57 +00:00
James Allen
2a78a7843a Allow subscriptions with no free plans, and adjust styles 2015-01-29 14:11:25 +00:00
Henry Oswald
69c3f48c1e if there is a validation error re enable the button 2015-01-29 13:56:19 +00:00
Henry Oswald
90bb12db40 added state to payment form 2015-01-19 20:27:01 +00:00
Henry Oswald
7508ba6c47 improved validation so that fields recurly said are wrong get highlighted 2015-01-07 16:43:20 +00:00
Henry Oswald
f9843b3709 tax auto updates on change of address now. Is also preset based on users ip address 2015-01-07 13:16:19 +00:00
Henry Oswald
d678af4417 only validate credit card an cvv if there is data in them 2014-12-28 22:19:15 +00:00
Henry Oswald
474fa5fe19 only validate expiry when both are set 2014-12-28 21:53:12 +00:00
Henry Oswald
7f979e77db - fixed new payment page so it uses correct plan and currency 
- submit button is disabled while processing
- removed test data
 2014-12-28 17:16:21 +00:00
Henry Oswald
ecb71d5bbf pull recurely pub api key from settings file 2014-12-23 12:08:01 +00:00
Henry Oswald
e2819c3bc6 added generic error handling to recurly processing and required fields 2014-12-23 11:04:54 +00:00
Henry Oswald
a7eb836c79 redirect to /thank-you on success and fix broken unit test from a few commits ago 2014-12-22 16:37:09 +00:00
Henry Oswald
d0c9783718 added paypal option in, not tested as we don't have paypal in stag 2014-12-22 15:51:50 +00:00
Henry Oswald
fb0a083b36 added address 2 2014-12-22 15:19:40 +00:00
Henry Oswald
6cedfb19d9 cleaned up form and added basic validation 2014-12-22 15:07:55 +00:00
Henry Oswald
fa1ec44e22 coupons work 2014-12-22 14:06:39 +00:00
Henry Oswald
a47b25d4b2 works with multi plan and currency, auto updates view on change 2014-12-22 12:55:29 +00:00
Henry Oswald
5305cbfd3e got more correct details making it to recurly and improved form. 2014-12-19 11:17:35 +00:00
Henry Oswald
cc545db17b can add account just about into recurly 2014-12-18 18:59:29 +00:00
Henry Oswald
47fb2a0878 basic angular form which has data bound to it 2014-12-18 17:48:23 +00:00
Henry Oswald
ba784c3e62 changed swiss franks to show Fr for display issues 2014-11-25 13:18:57 +00:00
Henry Oswald
d070c0acd8 fixed SGD collab price 2014-11-25 13:14:38 +00:00
Henry Oswald
02ef07dca4 broken free trial func into own file. added ab test on upgrade button colour 2014-11-24 23:59:55 +00:00
Henry Oswald
6c0f03e9c7 added ab test to show collar plan to people in editor 2014-11-24 16:21:03 +00:00
Henry Oswald
6d22bda88f added new currencies removed ab test as well 2014-11-21 13:13:53 +00:00
Henry Oswald
458e4335de added a load more currencies 2014-11-19 21:34:13 +00:00
Henry Oswald
dbb1d68b66 added SEK and CAD currencies 2014-11-19 14:52:59 +00:00
Henry Oswald
8097e6ad71 made 7 day free trial the default 2014-10-21 13:48:46 +01:00
Henry Oswald
750b050358 added ab test in for multi currency 2014-10-15 16:21:45 +01:00
Henry Oswald
52c54e7300 added ability to change currency on payment page 2014-10-13 17:28:00 +01:00
Henry Oswald
2bbdea3433 renamed change currency function and sorted out recommended currency 2014-10-13 16:27:27 +01:00
Henry Oswald
f55ef2f1b4 made what is returned for multi currency more explicit 2014-10-13 16:13:31 +01:00
Henry Oswald
36264706f6 hooked the plans page up to the geo ip lookup 2014-10-13 14:10:15 +01:00
James Allen
bc94ea56cb Add projects to tag after creating the tag 2014-10-09 08:39:15 +01:00
Henry Oswald
28b1e6bfe5 added client side checks on how long project or entity names can be 
150 chars should be safely under the 1024 bytes mongo index limit
 2014-10-07 11:08:08 +01:00
Henry Oswald
ab46d6ec1a 30 != 7 days 2014-09-26 11:33:34 +01:00
Henry Oswald
21f46da08a changed ab test from 30 -> 14 to 14 -> 7 2014-09-26 10:56:45 +01:00
Henry Oswald
d961b48857 imporved logging for session debug 2014-09-10 08:20:36 +01:00
Henry Oswald
50ee889569 fixed template search, ng-controller was too deep 2014-09-09 16:51:52 +01:00
Henry Oswald
187e87a978 disabled euro and pounds for the moment 2014-09-08 17:45:03 +01:00
Henry Oswald
ff0365c157 change plan has multi currency view 2014-09-05 15:47:08 +01:00
Henry Oswald
eeb27062a0 added currency query string param to subscribe button 2014-09-05 11:40:14 +01:00
Henry Oswald
13a667f47a v1 of multi currency 2014-09-04 19:03:04 +01:00
Henry Oswald
75e570c076 fix ab cookies and send 0 event when clicking monthly free trial button on plans page 2014-09-02 11:07:21 +01:00
Henry Oswald
326900c467 broke project-list file down into more digestable chunks 2014-09-01 18:05:51 +01:00
Henry Oswald
54b9cdc3e4 new ab framework up and running 2014-09-01 17:48:09 +01:00
Henry Oswald
f3c04feda7 added a missing templates button back into templates index page 2014-09-01 15:13:37 +01:00
Henry Oswald
e740e4913d if user is already annual tell them so on the annual upgrade page 2014-08-29 14:13:05 +01:00
Henry Oswald
b951ab798c set flag incorrectly when debugging 2014-08-29 12:37:00 +01:00
Henry Oswald
e67d3889f9 got better logic and copy for upgrade annual plans, needs i18n next 2014-08-29 12:36:36 +01:00
Henry Oswald
350b95a0a5 annual upgrade page works, needs a bit of copy love now 2014-08-28 18:14:31 +01:00
Henry Oswald
d0d08824da modal asking users to confirm a change of plan 2014-08-27 13:21:39 +01:00
Henry Oswald
d033238efc forgot to commit files 2014-08-13 16:04:23 +01:00
Henry Oswald
041e85b92b added local cooked option to hide notification 2014-08-13 14:14:31 +01:00
Henry Oswald
9b8d77cb0f removed client side i18n as we don't really need it #wasteoftime 2014-08-01 14:49:43 +01:00
Henry Oswald
49c7d52208 i18n is cleaned and working with requirejs 2014-07-30 16:13:02 +01:00
Henry Oswald
1a8c3d17b2 working example of directive for i18n new project button 2014-07-30 15:05:13 +01:00
Henry Oswald
bdf1fed462 jquery translations work 2014-07-30 14:22:36 +01:00
Henry Oswald
9354d61aa3 fixed delete account validation 
not using angular equals which does not seem to work
 2014-07-28 16:52:25 +01:00
James Allen
06eb952994 Resize project list correctly on page load 2014-07-28 10:28:48 +01:00