154 commits

Author	SHA1	Message	Date
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