Commit graph

1023 commits

Author SHA1 Message Date
Duncan Sommerville
661a87dfbc SAAS-948 - Frontend tweaks and fixes 2015-07-29 13:35:01 -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
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
5e58403c7f Merge branch 'saas-dev' into saas-showbuilder 2015-07-27 15:38:30 -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
d7d9a994d5 SAAS-948 - ShowBuilder redesign initial commit 2015-07-15 18:53:19 -04:00
Albert Santoni
2693c9f02c Small bugfix for CC-6064 2015-07-14 11:25:11 -04:00
Albert Santoni
66caf2574a CC-6064: Allow shows to be started "now" 2015-07-14 10:35:21 -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
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
Albert Santoni
4b8944f221 Improved explanation for live streaming form 2015-07-09 09:22:49 -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
drigato
b200a29f43 SAAS-928: Time strings on Radio Page are not localized 2015-07-07 09:21:44 -04:00
drigato
a5a91c25e0 SAAS-929: Shows don't show up on schedule widget on Firefox 2015-07-06 12:53:15 -04:00
drigato
ec0fbd2d61 Fix for schedule widget weekdays going out of order 2015-07-06 10:47:04 -04:00
Duncan Sommerville
457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Albert Santoni
00dfd64677 Merge pull request #117 from sourcefabric/saas-dev-schedule-widget-angular
Saas dev schedule widget angular
2015-07-01 15:05:59 -04:00
Duncan Sommerville
f87fe11a24 SAAS-908 - Break source URL strings into host/port/mount fields 2015-06-30 12:14:33 -04:00
drigato
5f925f2f1f Merge branch 'saas-dev' into saas-dev-schedule-widget-angular 2015-06-30 09:46:36 -04:00
drigato
6db75550cc SAAS-870: Schedule widget displays shows in wrong timezone
Timezone conversion done in frontend
2015-06-30 09:38:53 -04:00
drigato
0a4651f752 SAAS-870: Schedule widget displays shows in wrong timezone
Have angularjs hooked in
2015-06-26 15:25:44 -04:00
Duncan Sommerville
9d60a3d130 Move Help Translate Airtime link to help menu 2015-06-26 14:27:27 -04:00
Duncan Sommerville
3a51e66b07 Add transifex link to login page 2015-06-26 13:25:19 -04:00
Duncan Sommerville
c44bae8140 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
2015-06-26 10:37:30 -04:00
Duncan Sommerville
6497bc28c5 Show collapsible sections (other than 'dangerous settings') by default on preferences page 2015-06-25 17:43:15 -04:00
Duncan Sommerville
87bdc01318 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-06-25 14:13:25 -04:00
Duncan Sommerville
6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
Duncan Sommerville
70f6cbbc71 Fixes to airtime-celery setup 2015-06-23 15:10:02 -04:00
Albert Santoni
1bb6ee63dc SAAS-867: Embedded player spins in endless loop if connection is refused 2015-06-19 15:30:51 -04:00
Duncan Sommerville
02e0537be9 Merge branch 'saas-dev' into soundcloud 2015-06-18 13:29:59 -04:00
Duncan Sommerville
298ee30e9d Move misplaced tag 2015-06-18 10:03:12 -04:00
Duncan Sommerville
88bd3c9bc2 SAAS-872 - Load disk information statically 2015-06-18 10:03:05 -04:00
Duncan Sommerville
89e3eaa986 Merge branch 'saas-dev' into soundcloud 2015-06-17 17:00:15 -04:00
Duncan Sommerville
af2f757985 Move misplaced tag 2015-06-17 14:52:04 -04:00
Duncan Sommerville
b42d773b5d Merge branch 'saas-dev' into soundcloud 2015-06-17 13:45:33 -04:00
Duncan Sommerville
4b3b3b5b93 SAAS-872 - Load disk information statically 2015-06-17 13:44:14 -04:00
Duncan Sommerville
3a1d34dffe Merge branch 'saas-dev' into soundcloud 2015-06-17 10:14:03 -04:00
Albert Santoni
627343a626 Fixed the status page 2015-06-16 18:18:34 -04:00
Albert Santoni
0f58e315e6 Merge branch 'saas-cc-6055' into saas 2015-06-16 16:13:40 -04:00
Duncan Sommerville
0cd9b1d0e5 Merge branch 'saas-dev' into soundcloud 2015-06-16 15:10:14 -04:00