Commit graph

13577 commits

Author SHA1 Message Date
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
Duncan Sommerville
574fdf4b27 Merged 2.5.x into saas 2015-04-27 14:01:28 -04:00
Duncan Sommerville
4b307d6b47 Fix for vertical scrollbar issue 2015-04-27 13:52:55 -04:00
localizer
3d8a1cf9a6 updated translation resources 2015-04-24 10:43:06 +00:00
localizer
ff94efc214 updated translation resources 2015-04-24 09:09:12 +00:00
localizer
b3f66e28f7 updated translation resources 2015-04-21 11:54:12 +00: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
localizer
ef3fc14b50 updated translation resources 2015-04-17 20:43:07 +00:00
localizer
4bf234d108 updated translation resources 2015-04-17 20:35:08 +00:00
Albert Santoni
53def5af8d Merge remote-tracking branch 'origin/saas-suspend' into saas 2015-04-17 15:56:20 -04:00
Albert Santoni
319b949c5b Invert suspend logic (forgot to push?) 2015-04-17 15:55:41 -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
5d25fcea2d Style tweaks to the suspension notice. 2015-04-17 12:58:05 -04:00
Albert Santoni
074ad31228 Squash warnings in ProvisioningController 2015-04-17 12:40:52 -04:00
Albert Santoni
1964cbb75e Merge branch 'saas' into saas-suspend 2015-04-17 12:18:56 -04:00
Albert Santoni
bd7c0be514 Whoops, invert the suspension logic 2015-04-17 12:18:49 -04:00
Albert Santoni
3ca16db524 Comments 2015-04-17 12:09:05 -04:00
localizer
a286597826 updated translation resources 2015-04-17 13:03:07 +00:00
localizer
f7d9363fff updated translation resources 2015-04-17 12:51:13 +00:00
Albert Santoni
b61df4d681 Merge branch '2.5.x' into saas 2015-04-16 12:11:49 -04:00
Albert Santoni
aa0d0f959a Remove unnecessary LOCK TABLE that can cause deadlocks in rare circumstances 2015-04-16 12:10:56 -04:00
Albert Santoni
f0bcc1e42b Merge branch '2.5.x' into saas 2015-04-15 16:44:26 -04:00
Albert Santoni
4267c4e86d CC-6024: Cannot drag and drop tracks between shows in the Now Playing screen 2015-04-15 16:44:04 -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
838f7e84bf Merge branch 'saas-player-testing' into saas 2015-04-15 13:22:32 -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
d5a29398c6 Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-04-15 10:50:57 -04:00
drigato
1c2a307d34 Fixed a repeating show bug
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:50:16 -04:00
drigato
3b33f55652 Fixed a repeating show bug
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:48:31 -04:00
Albert Santoni
3695049a6c Added Admin_Only decorator and greyed out read-only text-areas 2015-04-14 14:35:37 -04:00
Albert Santoni
a48ae75907 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-04-14 11:36:22 -04:00
Albert Santoni
a606fef5af Gracefully handle bad ColReorder deserialization 2015-04-14 11:36:13 -04:00
drigato
66a236a842 Better error handling for player in flash mode 2015-04-14 10:51:52 -04:00
localizer
87b6f0db48 updated translation resources 2015-04-13 19:40:08 +00:00
localizer
5d3ec4ab13 updated translation resources 2015-04-13 19:27:07 +00:00
localizer
90b03a06a2 updated translation resources 2015-04-13 19:12:15 +00:00
drigato
83c21d4381 SAAS-715: Indicate errors on the player
logging for flash testing
2015-04-13 14:29:39 -04:00
Denise Rigato
10a5596ace Merge pull request #108 from sourcefabric/saas-embed-player
Saas embed player
2015-04-13 11:46:57 -04:00
drigato
24b6751eeb Remove unused code from player 2015-04-13 09:18:36 -04:00
drigato
b48d10a45e Merge branch 'saas' into saas-embed-player 2015-04-13 09:03:59 -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