5083 Commits

Author	SHA1	Message	Date
Albert Santoni	91c584ba16	Test alternate session reopening code to alleviate double Set-Cookie header	2015-09-25 11:37:36 -04:00
Albert Santoni	c03e9cbe9a	SAAS-1085: Optimization - Don't start sessions unless we actually need them.	2015-09-25 10:41:51 -04:00
Albert Santoni	a86e3ed4a8	Improvements to the preferences screen	2015-09-23 18:21:30 -04:00
Albert Santoni	13d1534042	Merge pull request #124 from danielhjames/saas ... IN-1956 Update Transifex project link	2015-09-22 11:47:33 -04:00
Albert Santoni	2a79424a64	Increase the CSRF token timeout	2015-09-21 18:00:04 -04:00
Daniel James	ad2e26a1c3	IN-1956 Update Transifex project link	2015-09-21 17:44:00 +01:00
Albert Santoni	a810010448	Dropped percentage from educational discount	2015-09-18 14:01:30 -04:00
Albert Santoni	2cad7c1848	Added educational pricing page link	2015-09-18 13:59:55 -04:00
Albert Santoni	8308ce9cac	October promo banner	2015-09-17 15:38:00 -04:00
Albert Santoni	3d07260a9d	Small VAT checker bugfix	2015-09-17 15:17:18 -04:00
Albert Santoni	32f5492e85	Merge branch 'saas' of github.com:sourcefabric/Airtime into saas	2015-09-09 18:59:44 -04:00
Albert Santoni	c77749a096	SAAS: Show logo is deleted on disk when a show instance is deleted ... * Default to returning the station logo in response if we can't find the show logo on disk (but it's in our DB).	2015-09-09 18:59:00 -04:00
Duncan Sommerville	2296aab8d5	Fix bug where show logo was removed when deleting an instance of a repeating show	2015-09-09 18:47:43 -04:00
drigato	fa340c3e30	SAAS-976: September 1st: Undo the billing page changes for the August promotion	2015-08-31 13:37:20 -04:00
Albert Santoni	17074e5f70	SAAS-1032: Shows with missing show art on disk can't be edited	2015-08-28 12:28:34 -04:00
Albert Santoni	3592eceb22	Merge branch 'saas' into saas-dev	2015-08-24 17:11:52 -04:00
Albert Santoni	e5f70e7ec3	Re-enable the task manager, it made no difference	2015-08-11 17:32:40 -04:00
Albert Santoni	60a02cfdee	Temporarily disable the task manager to test lock contention	2015-08-11 16:34:28 -04:00
Albert Santoni	249d3b1d2d	SAAS-1011: Files stored locally with incorrect file extensions won't play out	2015-08-11 09:33:29 -04:00
Albert Santoni	75914b791c	Merge branch 'saas-dev' into saas ... Conflicts: airtime_mvc/application/common/FileDataHelper.php	2015-08-10 09:00:54 -04:00
Albert Santoni	fc5d20f4d6	Safen up getUsingCustomStreamSettings()	2015-08-10 08:57:21 -04:00
Albert Santoni	a82b75743f	Fix error messages being swapped on the password reset page	2015-08-07 14:41:10 -04:00
Albert Santoni	e760df0e5e	Added missing newline to password reset email	2015-08-07 14:29:10 -04:00
Albert Santoni	b5e5fcfc98	More tweaks for password reset	2015-08-07 14:22:01 -04:00
Albert Santoni	bd83eefefe	Cleanup for password reset post-email screen	2015-08-07 14:09:01 -04:00
Albert Santoni	ea2a6b3f68	Clean up and bugfixes for password reset (SAAS-1009)	2015-08-07 13:57:42 -04:00
drigato	f833ab9690	SAAS-838: Undefined variable previousMediaName	2015-08-06 17:09:54 -04:00
drigato	ea86675d07	SAAS-994: The Scheduled Play switch should not be able to be turned off without a warning message ... Hid the element in the dashboard so it can never be turned off.	2015-08-06 11:14:43 -04:00
Albert Santoni	9c5a634754	Fix default Icecast hostname	2015-08-05 15:30:14 -04:00
Albert Santoni	1093e7085a	Re-enable hiding the first run popup after first run	2015-08-05 15:00:28 -04:00
Albert Santoni	1d39117b21	Merge remote-tracking branch 'origin/saas-email' into saas-dev	2015-08-05 14:50:58 -04:00
Albert Santoni	e49d337db0	Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev	2015-08-05 14:50:31 -04:00
Albert Santoni	eef61a65fc	Cleanup and comments for the timezone/language popup	2015-08-05 14:49:43 -04:00
Albert Santoni	2aaba99b9a	Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev	2015-08-05 12:32:33 -04:00
drigato	23fe12651f	SAAS-838: Undefined variable previousMediaName	2015-08-05 09:48:31 -04:00
Albert Santoni	c934866063	Two small code improvements	2015-08-04 17:42:53 -04:00
Albert Santoni	d0d6efd508	Fix m4a uploads in Airtime	2015-07-31 15:02:53 -04:00
Denise Rigato	f19b6b4bf2	Merge pull request #123 from sourcefabric/saas-aug-promo ... Airtime Billing page - Add support for August promotion plans	2015-07-31 13:55:20 -04:00
drigato	8a52178765	Fix for billing downgrade with no new invoice created	2015-07-31 13:42:47 -04:00
drigato	5530142174	Un-doing last 2 committs about invoices	2015-07-31 12:01:26 -04:00
drigato	aab4b634bf	Show form on billing page if no invoice was generated after downgrade	2015-07-31 11:56:00 -04:00
drigato	278ca264eb	Fix for bringing customer to view invoice that doesn't exist after downgrade	2015-07-31 11:48:20 -04:00
Albert Santoni	78327c4f68	Merge branch 'saas' of github.com:sourcefabric/Airtime into saas	2015-07-31 11:44:29 -04:00
Albert Santoni	84c21de578	Fix error logic if no API key passed to provisioning/create API	2015-07-31 11:43:58 -04:00
drigato	ff61fab62a	SAAS-973: Airtime Billing page - Add support for August promotion plans ... Fix to not allow current promo plans to downgrade to another promo plan Added promo banner to billing page	2015-07-31 10:46:02 -04:00
drigato	48d745bf77	Hide Awesome August 2015 promo plans from billing page	2015-07-30 13:37:15 -04:00
drigato	b2fbb27801	SAAS-973: Airtime Billing page - Add support for August promotion plans ... Made WHMCS Airtime group id a constant Check for CSRF token on promo eligibilty ajax check	2015-07-30 13:27:32 -04:00
drigato	bccba2f9d5	SAAS-973: Airtime Billing page - Add support for August promotion plans ... Front-end changes to price grid, and plan title	2015-07-30 12:53:37 -04:00
drigato	d9e2ba0ed3	SAAS-973: Airtime Billing page - Add support for August promotion plans ... Un-hardcode product ids	2015-07-30 09:39:50 -04:00
drigato	4ed87de183	SAAS-973: Airtime Billing page - Add support for August promotion plans ... Backend side pretty much done	2015-07-29 22:24:17 -04:00