Albert Santoni
|
e86e1cb4ac
|
Merge branch 'saas-dev' into saas-speedy
|
2015-05-21 15:10:01 -04:00 |
|
Albert Santoni
|
2b8e40a12c
|
Merge branch 'saas' into saas-speedy
|
2015-05-21 15:09:57 -04:00 |
drigato
|
5b6a88f7fd
|
Fix bad merge that added soundcloud settings back into preferences page
|
2015-05-19 15:51:04 -04:00 |
|
drigato
|
a2a9e54553
|
Merge branch 'saas-dev' into saas-tunein
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
|
2015-05-19 15:50:16 -04:00 |
|
drigato
|
4451c49c06
|
SAAS-772: Send metadata to Tunein
This is pretty much working except with master source metadata
|
2015-05-19 14:39:05 -04:00 |
|
Albert Santoni
|
1c88d6dccd
|
Merge branch 'saas' into saas-dev
|
2015-05-19 12:18:54 -04:00 |
|
Albert Santoni
|
20649f73bd
|
Added missing translation for disk quota error message
|
2015-05-19 12:18:01 -04:00 |
|
drigato
|
b023f191e3
|
SAAS-772: Send metadata to Tunein
Added form validation by making a test request to the TuneIn API with
the user-entered values
|
2015-05-14 13:13:33 -04:00 |
Duncan Sommerville
|
612aa37738
|
Merge branch 'saas' into saas-dev
|
2015-05-13 19:32:53 -04:00 |
|
drigato
|
cf24c141fd
|
SAAS-772: Send metadata to Tunein
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
|
2015-05-13 16:05:37 -04:00 |
|
Duncan Sommerville
|
15bebc6267
|
Dangerous options subform on Preferences page and Delete all tracks button
|
2015-05-13 15:56:08 -04:00 |
|
drigato
|
77241bb6fc
|
Merge branch '2.5.x' into saas
|
2015-05-11 14:57:58 -04:00 |
|
drigato
|
2953576921
|
CC-5997: Tracks get scheduled outside of the show start and end time
|
2015-05-11 14:57:20 -04:00 |
|
Duncan Sommerville
|
8b380086c3
|
Merge branch 'saas-dev' into saas-speedy
|
2015-05-04 13:09:51 -04:00 |
|
Duncan Sommerville
|
272bb11fcf
|
Fixed player displaying nothing (instead of Offline) when no show is scheduled
|
2015-04-30 14:36:33 -04:00 |
|
Albert Santoni
|
0418cdbc04
|
Nerf a player console.log call
|
2015-04-29 17:26:51 -04:00 |
|
Albert Santoni
|
85cc373328
|
Embedded player: Display the show name during master/show source
|
2015-04-29 16:03:36 -04:00 |
|
Duncan Sommerville
|
e73a6df796
|
Fix for invalid date format issue in Firefox
|
2015-04-29 15:23:29 -04:00 |
|
Albert Santoni
|
1215eb1895
|
Prevent NaN from causing problems with player timeout
|
2015-04-29 12:58:32 -04:00 |
|
Albert Santoni
|
c72cdbc19d
|
More preventative coding for the player and fixed the live-info-v2 API
|
2015-04-29 12:17:44 -04:00 |
|
Albert Santoni
|
c0bd28f6d5
|
Prevent negative timeouts in player
|
2015-04-29 11:59:17 -04:00 |
|
Albert Santoni
|
9019377d0e
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2015-04-29 11:48:15 -04:00 |
|
Albert Santoni
|
b3a19ae49e
|
Bugfix for embedded player sending too many requests on load, quieter logging for boto
|
2015-04-29 11:46:44 -04:00 |
|
Duncan Sommerville
|
94fc2131ff
|
SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade
|
2015-04-27 16:19:15 -04:00 |
|
drigato
|
de8edf982a
|
SAAS-723: Add compatibility chart to player page
|
2015-04-20 10:52:49 -04:00 |
|
drigato
|
9cee7bcc86
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2015-04-20 10:05:55 -04:00 |
|
drigato
|
926d1704bf
|
SAAS-723: Add compatibility chart to player page
|
2015-04-20 09:59:17 -04:00 |
|
Albert Santoni
|
82a129285c
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2015-04-17 15:23:56 -04:00 |
|
Albert Santoni
|
1515984664
|
Merge remote-tracking branch 'origin/saas-suspend' into saas
|
2015-04-17 15:23:40 -04:00 |
|
Albert Santoni
|
6dc8837aff
|
Removed unused status page stuff for Pro and cleanup for code review
|
2015-04-17 11:17:35 -04:00 |
|
drigato
|
7c7bacfcaf
|
Remove console.log
|
2015-04-15 14:20:31 -04:00 |
|
drigato
|
d5dfa9af81
|
player testing console.log
|
2015-04-15 13:53:24 -04:00 |
|
drigato
|
880cca4733
|
SAAS-715: Indicate errors on the player
Fix error handling in flash mode
|
2015-04-15 13:21:54 -04:00 |
|
drigato
|
66a236a842
|
Better error handling for player in flash mode
|
2015-04-14 10:51:52 -04:00 |
|
drigato
|
83c21d4381
|
SAAS-715: Indicate errors on the player
logging for flash testing
|
2015-04-13 14:29:39 -04:00 |
|
drigato
|
24b6751eeb
|
Remove unused code from player
|
2015-04-13 09:18:36 -04:00 |
|
drigato
|
988fcae989
|
Remove console.log
|
2015-04-10 18:17:22 -04:00 |
|
drigato
|
63c3236e7a
|
Player metadata fix
|
2015-04-10 17:38:39 -04:00 |
|
Albert Santoni
|
088ada1d2c
|
Reformatted Bootstrap, added Station Suspended notice
|
2015-04-10 17:14:56 -04:00 |
|
drigato
|
b8e8a1a983
|
Player HTML5 error handling fix
|
2015-04-10 16:44:51 -04:00 |
|
drigato
|
1d79f13716
|
Player HTML5 error handling fix
|
2015-04-10 16:06:19 -04:00 |
|
drigato
|
c80d437601
|
Fixed player HTML5 error handling
|
2015-04-10 15:25:49 -04:00 |
|
drigato
|
9e62c71690
|
Fix player's manual mode
|
2015-04-10 10:52:40 -04:00 |
|
drigato
|
f238faa937
|
SAAS-712: UI Improvements
|
2015-04-09 14:22:50 -04:00 |
|
drigato
|
84231f811a
|
SAAS-720: Player can't be accessed unless a user has a valid session
|
2015-04-09 12:25:27 -04:00 |
|
drigato
|
4429117f6a
|
SAAS-712: UI Improvements
|
2015-04-09 09:43:15 -04:00 |
|
drigato
|
78b2631980
|
Remove stream url js escaping and do it on server side instead
|
2015-04-08 15:19:22 -04:00 |
|
drigato
|
94a7643ebc
|
Escape stream urls in the player js
|
2015-04-08 15:00:02 -04:00 |
|
drigato
|
23bf866211
|
SAAS-712: UI Improvements
|
2015-04-08 14:01:57 -04:00 |
|
drigato
|
f6d5b34cca
|
Embed player - code review fixes
|
2015-04-07 17:49:21 -04:00 |