Commit graph

2000 commits

Author SHA1 Message Date
Duncan Sommerville
e6609896a5 SAAS-948 - showbuilder styling 2015-08-07 16:49:05 -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
ea2a6b3f68 Clean up and bugfixes for password reset (SAAS-1009) 2015-08-07 13:57:42 -04:00
Duncan Sommerville
02d96d7bd0 SAAS-991 - initial playlist editor redesign 2015-08-06 19:16:04 -04:00
Duncan Sommerville
cc36fcd37b Showbuilder checkboxes and style fixes 2015-08-06 16:01:44 -04:00
Duncan Sommerville
36f2e1844f Merge branch 'saas-dev' into saas-showbuilder 2015-08-05 15:32:04 -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
Duncan Sommerville
4200f56265 SAAS-999 - Change Advanced Search Options to dropdown 2015-08-04 15:38:48 -04:00
Duncan Sommerville
f138dc6b47 SAAS-948 - tab layout for right-hand pane 2015-07-31 18:28:16 -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
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
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
661a87dfbc SAAS-948 - Frontend tweaks and fixes 2015-07-29 13:35:01 -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
Duncan Sommerville
75aef986ea SAAS-781 - Code review fixes 2015-07-28 11:47:53 -04:00
Duncan Sommerville
fcbc37977f SAAS-948 - Frontend tweaks 2015-07-28 11:42:04 -04:00
Duncan Sommerville
59d89b0b9e SAAS-948 - ShowBuilder redesign editors and fixes 2015-07-27 15:37:55 -04:00
drigato
989b4994aa SAAS-945: Language + Timezone Setup Popup
forgot to auto detect user's timezone
2015-07-27 14:38:42 -04:00
drigato
ee2bfe7664 SAAS-945: Language + Timezone Setup Popup 2015-07-27 07:06:22 -04:00
Duncan Sommerville
ce0cc946ab Disable password reset in saas-dev (moved to saas-email branch) 2015-07-23 13:00:34 -04:00
Duncan Sommerville
5c4803ddf2 SAAS-781 - password reset 2015-07-22 13:48:47 -04:00
Duncan Sommerville
a1a2bf9368 Test out existing email functionality 2015-07-22 11:19:37 -04:00
Duncan Sommerville
ba90b1f1eb Merge branch 'saas-dev' into saas-showbuilder
Conflicts:
	airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
Duncan Sommerville
04333aaa29 SoundCloud download initial commit 2015-07-16 11:27:27 -04:00
Duncan Sommerville
40d8212c13 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-07-16 11:03:53 -04:00
Duncan Sommerville
c5e7d6734e SAAS-951 - fix SoundCloud capitalization 2015-07-16 11:03:30 -04:00
Duncan Sommerville
d7d9a994d5 SAAS-948 - ShowBuilder redesign initial commit 2015-07-15 18:53:19 -04:00
Albert Santoni
5a2ef8d3db Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:35:47 -04:00
Albert Santoni
66caf2574a CC-6064: Allow shows to be started "now" 2015-07-14 10:35:21 -04:00
drigato
25ef70767b SAAS-940: Provide usability hints to user
Customized hints depending on what page the user is on and what action
they just completed.
2015-07-13 17:02:31 -04:00
Duncan Sommerville
755ec79e7d SAAS-876 - frontend tweaks 2015-07-13 15:17:47 -04:00
Duncan Sommerville
56585fb01c Add default icecast pass to settable params in ProvisioningController 2015-07-13 13:28:27 -04:00
Duncan Sommerville
9fdc08f88a SAAS-876 - reset to default settings when using Airtime Pro streaming 2015-07-13 12:28:58 -04:00
Duncan Sommerville
37ed35f5b2 Merge branch 'saas-dev' into saas-stream-settings
Conflicts:
	airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
Duncan Sommerville
e4720b5992 Remove incorrect sql in 2.5.14 upgrade 2015-07-10 10:27:28 -04:00
drigato
670395bb2e SAAS-939: Add option to preferences to display login button on radio page
Change option to ON by default
2015-07-09 15:16:54 -04:00
drigato
0601bd675e SAAS-939: Add option to preferences to display login button on radio page 2015-07-09 14:38:44 -04:00
Duncan Sommerville
ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville
6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
Duncan Sommerville
776596d5b6 SAAS-922 - replace large conditionals with single public mime-type map 2015-07-07 15:48:22 -04:00
Duncan Sommerville
5cb396e512 SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null) 2015-07-06 18:03:44 -04:00
drigato
71b2a4e946 Removing duplicate locale strings 2015-07-06 10:29:02 -04:00
drigato
6914e16165 SAAS-916: Localize schedule widget dates
Forgot to commit msg strings for this
2015-07-06 10:21:27 -04:00