629 Commits

Author	SHA1	Message	Date
Albert Santoni	274881c6e0	Add _pro macros to a bunch of billing page stuff	2015-09-04 11:17:01 -04:00
Albert Santoni	7a91677d01	Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev	2015-09-02 16:25:35 -04:00
Albert Santoni	01b3ae1bf0	Allow smart blocks with no criteria	2015-09-02 16:25:30 -04:00
Duncan Sommerville	63ce022a8d	SAAS-1040 - station logo functionality improvements	2015-09-02 15:28:36 -04:00
Duncan Sommerville	37df86723d	CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user	2015-09-01 16:10:33 -04:00
Duncan Sommerville	a99bc26715	Set autofocus on login username field	2015-09-01 16:07:16 -04:00
Duncan Sommerville	f21e53b12e	CC-6121 - Fix up user settings page	2015-08-31 15:25:17 -04:00
Duncan Sommerville	c6a6a97c55	CC-6117 - Change submit button text for file metadata editor so behaviour is consistent with button text	2015-08-31 13:33:23 -04:00
drigato	6811646aaa	CC-6106: Permission problems with bulk and single edit in the Dashboard	2015-08-28 13:40:38 -04:00
Duncan Sommerville	294298c9bf	CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes	2015-08-27 16:59:21 -04:00
Albert Santoni	98ac8fd851	Major layout work on the smartblock and playlist editors ... * CC-6088: Smart Block form needs to have a form layout * CC-6089: Editor view name fields must be made <input> fields	2015-08-26 13:10:51 -04:00
drigato	6ecb208962	SAAS-1021: Billing page restyle	2015-08-26 09:11:25 -04:00
Duncan Sommerville	afa3b47e42	Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder	2015-08-25 17:09:17 -04:00
Duncan Sommerville	84baef1996	CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen	2015-08-25 17:09:05 -04:00
Albert Santoni	700c3c4005	Merge branch 'saas-dev' into saas-showbuilder	2015-08-25 13:27:40 -04:00
Duncan Sommerville	3f25ab2647	CC-6079 - merge and remove underscore files	2015-08-18 15:23:42 -04:00
Duncan Sommerville	4adb9cc55a	CC-6070 - standardize editor buttons	2015-08-17 18:34:39 -04:00
Albert Santoni	61d1e6bb50	Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder	2015-08-12 16:45:07 -04:00
Albert Santoni	409e9e2a78	Stream settings, Add Show form CSS revamp, etc.	2015-08-12 16:44:45 -04:00
Duncan Sommerville	1957c7827f	SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes	2015-08-12 14:35:27 -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
Duncan Sommerville	133db1c6a6	Merge branch 'saas-dev' into saas-showbuilder	2015-08-07 16:50:28 -04:00
Duncan Sommerville	e6609896a5	SAAS-948 - showbuilder styling	2015-08-07 16:49:05 -04:00
Albert Santoni	b5e5fcfc98	More tweaks for password reset	2015-08-07 14:22:01 -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	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
Duncan Sommerville	33d2fe0900	SAAS-989 - Move file metadata editor to right-hand showbuilder pane	2015-08-04 19:56:12 -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
Duncan Sommerville	661a87dfbc	SAAS-948 - Frontend tweaks and fixes	2015-07-29 13:35:01 -04:00
Duncan Sommerville	fcbc37977f	SAAS-948 - Frontend tweaks	2015-07-28 11:42:04 -04:00
drigato	ee2bfe7664	SAAS-945: Language + Timezone Setup Popup	2015-07-27 07:06:22 -04:00
Duncan Sommerville	5c4803ddf2	SAAS-781 - password reset	2015-07-22 13:48:47 -04:00
drigato	fd09941223	Merge branch 'saas-dev' into saas-dev-usability-hints	2015-07-15 13:59:43 -04:00
drigato	8276b1762e	Updated outdated public airtime api setting message on preferences page	2015-07-15 13:47:54 -04:00
Albert Santoni	66caf2574a	CC-6064: Allow shows to be started "now"	2015-07-14 10:35:21 -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	c99165a8dd	SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options	2015-07-10 13:17:20 -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
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
Albert Santoni	d2ca10294f	Two Add Show form bugfixes ... * Fixed the Show Source mount name not showing up in Add Show form * Use Airtime Authenticaiton by default	2015-07-09 10:18:21 -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	e12494ef5f	Fix show source mount error	2015-07-07 15:55:35 -04:00
Duncan Sommerville	457230ba07	SAAS-876 - Initial commit	2015-07-03 13:32:41 -04:00
Duncan Sommerville	f87fe11a24	SAAS-908 - Break source URL strings into host/port/mount fields	2015-06-30 12:14:33 -04:00