Commit graph

1014 commits

Author SHA1 Message Date
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
Albert Santoni
61272cd42c Handle 404s with the correct error page, and don't log them 2015-06-16 14:58:27 -04:00
drigato
4bebe1e0fb Radio page fixes 2015-06-16 12:50:40 -04:00
drigato
4c6ba869e3 Fix Radio Page schedule widget iframe size 2015-06-15 16:07:42 -04:00
drigato
0c4888fbd6 Radio Page fixes
Added scrolling back to radio page
2015-06-15 15:03:34 -04:00
drigato
ad5121f2ca Radio Page improvements 2015-06-15 14:42:37 -04:00
Duncan Sommerville
706d7db2b2 Merge branch 'saas-dev' into soundcloud 2015-06-15 11:03:37 -04:00
Albert Santoni
0b5b2329ed Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-06-12 16:06:04 -04:00
Albert Santoni
b4c9a77e7c CC-6055: Improved escaping 2015-06-12 13:48:54 -04:00
Albert Santoni
abc81a92b4 XSS prevention for Radio Page 2015-06-12 13:11:28 -04:00
drigato
ba2aeae7b4 Radio page changes
Moved login button to top right corner.
Changed background image.
2015-06-12 13:07:47 -04:00
Albert Santoni
53b67d0826 Disabled most of status page for Airtime Pro and fixed HTML syntax errors 2015-06-12 10:36:27 -04:00
Albert Santoni
980e2ad767 Unbreak the design from my last commit 2015-06-11 15:09:44 -04:00
Albert Santoni
1efc47beb9 Tweaked layout of the embed widgets page 2015-06-11 14:30:52 -04:00
drigato
2dbed71681 SAAS-860: Schedule widget embed src is wrong 2015-06-11 12:37:51 -04:00
drigato
255bbf74b7 CC-6057: Empty show schedule should show message in Schedule Widget 2015-06-11 09:16:59 -04:00
Albert Santoni
7c6f15984d Small consistency changes for the embeddable widgets 2015-06-10 18:02:25 -04:00
Duncan Sommerville
8163608666 Merge branch 'saas-dev' into soundcloud 2015-06-10 16:25:30 -04:00
Duncan Sommerville
459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
drigato
d1ac78be68 Fix for station logo....again... 2015-06-10 16:01:16 -04:00
drigato
357e17f3b4 Fix for station logo not displaying correctly 2015-06-10 15:57:09 -04:00