drigato
c1899f18af
remove comment
2015-09-16 15:07:38 -04:00
drigato
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
drigato
67db2c1d25
SAAS-1063: REST API for podcasts
...
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
2015-09-16 14:22:13 -04:00
Duncan Sommerville
7006b55818
js tweaks
2015-09-16 11:26:11 -04:00
Duncan Sommerville
8dcea06077
* Move tab functionality to a separate module
...
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
Duncan Sommerville
0d80f857d3
Fix broken import
2015-09-15 16:08:19 -04:00
Duncan Sommerville
7b76c8d6d3
Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions
2015-09-15 15:06:03 -04:00
Duncan Sommerville
a444751397
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-15 14:21:27 -04:00
Albert Santoni
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
Duncan Sommerville
ff24976bed
Fix up celery downloads a bit
2015-09-15 14:21:19 -04:00
Albert Santoni
ffdc83dc26
Reusable datatable control that hooks up to any of our REST APIs
...
* Implements item selection (single, shift, ctrl), pagination, and
sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
drigato
73d154ba17
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-15 14:07:59 -04:00
Duncan Sommerville
c8baa6e4b3
Merge branch 'saas-dev-publishing' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
airtime_mvc/public/js/airtime/library/spl.js
2015-09-15 14:03:11 -04:00
drigato
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
Duncan Sommerville
dd09676f88
Hide celery user
2015-09-15 13:59:48 -04:00
Duncan Sommerville
8c65ba8f66
SAAS-1061 - implement podcast list view skeleton; small bugfixes
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
drigato
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
Duncan Sommerville
2d2ed25fcc
CC-6137 - datatables is the devil
2015-09-10 16:47:36 -04:00
Albert Santoni
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
Albert Santoni
32f5492e85
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-09-09 18:59:44 -04:00
Albert Santoni
c77749a096
SAAS: Show logo is deleted on disk when a show instance is deleted
...
* Default to returning the station logo in response if we can't find the
show logo on disk (but it's in our DB).
2015-09-09 18:59:00 -04:00
Duncan Sommerville
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
Duncan Sommerville
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
Duncan Sommerville
1649d9db77
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-09 17:25:45 -04:00
Duncan Sommerville
fb1ee2e284
Fix some issues with the users page
2015-09-09 17:25:40 -04:00
Albert Santoni
1f319f84a4
Two small radio page tweaks
...
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -04:00
drigato
bd4fc62e04
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-09 13:55:27 -04:00
drigato
2569ce4d0a
CC-6136: Playlist fade values don't get or set properly
...
Fix smartblock design and fade out saving bug
2015-09-09 13:54:16 -04:00
Duncan Sommerville
03e23daba0
Apply highlight to active submenu item
2015-09-08 17:42:52 -04:00
Duncan Sommerville
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
Duncan Sommerville
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
Duncan Sommerville
63784d4e6b
Fix some behaviour with playlist/smartblock fade button
2015-09-08 16:39:33 -04:00
Duncan Sommerville
d18d52a37a
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:15:24 -04:00
Duncan Sommerville
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
Duncan Sommerville
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -04:00
Duncan Sommerville
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
drigato
c2d1b788c5
Added missing opening php tag on billing - upgrades page
2015-09-08 11:03:33 -04:00
Localizer
b80c18c288
updated translation resources
2015-09-07 10:34:19 +00:00
Localizer
57e3059c16
updated translation resources
2015-09-05 08:34:23 +00:00
Albert Santoni
84a1f9071b
Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev
2015-09-04 18:36:26 -04:00
Albert Santoni
de322171df
CC-6118: Playlist crossfade panel needs restyling
...
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
by Propel so we should probably restrict the fade time to whole
seconds....
2015-09-04 18:35:11 -04:00
Duncan Sommerville
65ffe43589
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-04 16:11:48 -04:00
Duncan Sommerville
3dc8a5f98d
CC-6135 - fix playlist bugs
2015-09-04 16:11:41 -04:00
Duncan Sommerville
ba26adc904
CC-6130 - fix empty placeholders appearing when search returns no results
2015-09-04 15:37:04 -04:00
Albert Santoni
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
Albert Santoni
68a22ccb49
Added a README_TRANSLATIONS file
2015-09-04 11:20:41 -04:00
Albert Santoni
8499fd989c
Regenerate the translation files
2015-09-04 11:17:18 -04:00
Albert Santoni
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04:00
Localizer
d4287e9abd
updated translation resources
2015-09-04 14:47:15 +00:00
Localizer
d257daa510
updated translation resources
2015-09-04 08:16:31 +00:00
