Commit graph

14248 commits

Author SHA1 Message Date
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
Albert Santoni
1f319f84a4 Two small radio page tweaks
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -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
f21fcb3dcc SAAS-1011 - Fixed one mimetype problem and fixed installer 2015-08-24 16:25:09 -04:00
Albert Santoni
fdb2d4fae2 SAAS-1011: Files on NFS with incorrect file extensions won't play out
* Simplified the mime type detection code in pypo and made it actually work
2015-08-24 11:29:45 -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
dab0f00736 Fixed m4a file extension mapping in pypo 2015-08-11 08:59:44 -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
Duncan Sommerville
07d8a0de04 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-08-05 15:29:47 -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
7de507c99a Forgot to commit promo banner 2015-07-31 10:49:24 -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
5998d765fe Merge branch 'saas' into saas-aug-promo 2015-07-30 14:28:07 -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
Duncan Sommerville
da4186ce25 Merge branch 'saas' into saas-dev 2015-07-29 20:29:14 -04:00
drigato
7839a712e6 Merge branch 'saas-dev' into saas-dev-lang-tz-setup 2015-07-29 08:10:58 -04:00
drigato
4d9fb27554 SAAS-973: Airtime Billing page - Add support for August promotion plans
created promo-eligibility-check endpoint
2015-07-29 08:10:05 -04:00
Albert Santoni
bda6a4585c Updated raven-php to fix Sentry 2015-07-28 14:48:41 -04:00
Duncan Sommerville
75aef986ea SAAS-781 - Code review fixes 2015-07-28 11:47:53 -04:00