Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13504 commits 3 branches 0 tags 405 MiB
Commit graph

1551 commits

Author SHA1 Message Date
drigato
4429117f6a SAAS-712: UI Improvements 2015-04-09 09:43:15 -04:00
drigato
23bf866211 SAAS-712: UI Improvements 2015-04-08 14:01:57 -04:00
drigato
220f21ab22 Merge branch 'saas' into saas-embed-player 
Conflicts:
	airtime_mvc/application/configs/ACL.php
 2015-03-31 17:44:14 -04:00
drigato
778df97d3c SAAS-662: Make player auto-connect if there is a problem with the stream 
Kind of working in HTML5 mode
 2015-03-31 16:51:14 -04:00
Albert Santoni
dab9cc775c Hide the show form after updating a show because it was broken at that point anyways 2015-03-31 15:39:06 -04:00
drigato
17358a761f SAAS-663: Integrate player design 2015-03-25 11:44:28 -04:00
drigato
e32744668f SAAS-661: Add mobile stream identifier on Stream Settings page 2015-03-23 16:06:35 -04:00
drigato
e2ca218ac2 Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player 2015-03-23 15:54:04 -04:00
drigato
2ae4d6c1c3 Embed Player 
Added stream modes
Unhardcoded some values
Disabled opus streams
 2015-03-23 12:37:22 -04:00
drigato
5c4533d785 SAAS-644: Embed Player -> Update embed src code and preview when an option changes 2015-03-23 10:11:33 -04:00
drigato
0764ca60e6 Delete muses skin files 2015-03-20 09:09:09 -04:00
drigato
16ddf09d6d SAAS-655: Extract muses player events into our own js object 2015-03-19 16:59:05 -04:00
drigato
875ed0e41e Got muses working without a skin 
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
 2015-03-19 13:42:19 -04:00
drigato
bafd9eeb6f Cleaning up player code 2015-03-18 15:03:34 -04:00
drigato
ed891fb145 Committing lots of trial and error embed player code changes 2015-03-18 14:23:38 -04:00
drigato
ac2181a52d Merge branch 'saas' into saas-embed-player 2015-03-11 17:13:04 -04:00
drigato
6c46f0a156 Added player preview to view 
Everything is hardcoded right now
 2015-03-10 16:32:35 -04:00
Albert Santoni
d61b75f105 Added a working 4th stream 2015-03-03 16:08:53 -05:00
Duncan Sommerville
6082738439 Merge branch 'saas' into saas-media-refactor 2015-03-02 16:02:34 -05:00
Duncan Sommerville
17d51eb0f9 Added csrf verification to show image upload and deletion 2015-03-02 16:00:11 -05:00
Duncan Sommerville
936d11b367 Merge branch '2.5.x-albertenhancements' into saas 2015-02-27 17:21:20 -05:00
Duncan Sommerville
78c7170c4e Reformatted logo remove button to use Zend 2015-02-27 17:19:37 -05:00
Albert Santoni
3a1141d4c8 Merge branch 'saas' into saas-media-refactor 
Conflicts:
	airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
	airtime_mvc/application/controllers/ApiController.php
 2015-02-25 13:02:11 -05:00
Albert Santoni
562c2f0100 Remove widget JS snippet animation because it's bugged 2015-02-24 15:18:39 -05:00
Albert Santoni
e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Duncan Sommerville
5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
Duncan Sommerville
69d588d2f6 Merge branch '2.5.x' into 2.5.x-albertenhancements 2015-02-24 10:45:52 -05:00
Albert Santoni
2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
Albert Santoni
3c064b13a9 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
 2015-02-18 16:03:14 -05:00
Albert Santoni
68cd5b027a CC-5998: Prevent users from spamming the delete button in the library 2015-02-18 15:56:28 -05:00
Duncan Sommerville
826ae17552 SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful 2015-02-04 15:09:27 -05:00
Albert Santoni
fd42c67b0b Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-01-21 18:08:05 -05:00
Duncan Sommerville
7e2cc65f32 Merge branch '2.5.x' into saas 2015-01-21 15:15:58 -05:00
Duncan Sommerville
6492128ce9 Hide Now Playing toolbar for Guest users 2015-01-21 15:15:22 -05:00
Albert Santoni
7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni
f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00
Albert Santoni
d5b969f94f Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-13 21:31:57 -05:00
Albert Santoni
ad56d6cafb Show the plan and station URL in Live Chat 2014-12-11 17:40:34 -05:00
Duncan Sommerville
af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville
4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville
4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville
3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -05:00
Duncan Sommerville
3b588dcce8 Removed unnecessary call to set locale data on the Login page 2014-11-05 17:27:08 -05:00
Duncan Sommerville
273afaa126 Added Japanese language text files to js i18n datatables 2014-11-05 16:47:09 -05:00
Duncan Sommerville
00e85de3c8 Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change 2014-11-05 10:06:59 -05:00
Albert Santoni
8616cee9a3 Merge pull request #73 from RobertElder/2.5.x-relder-jplayer-upgrade 
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st Sep...
 2014-10-31 15:49:45 -04:00
Albert Santoni
359727fc66 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 
Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php
 2014-10-29 18:01:31 -04:00
Albert Santoni
ceb51100ec Merge branch 'cc-5709-airtime-analyzer' into saas 2014-10-29 17:58:56 -04:00
Albert Santoni
fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04:00
Duncan Sommerville
275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -04:00