91c584ba16
Test alternate session reopening code to alleviate double Set-Cookie header
2015-09-25 11:37:36 -04:00
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
43e9fb59ce
SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable
2015-09-24 15:57:38 -04:00
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
dcb30b3aa7
Move file extension check to before database object insertion
2015-09-24 12:57:19 -04:00
778b67982b
Remove duplicate imports and add new table imports to ScheduleController
2015-09-24 12:56:32 -04:00
c587dcf4e4
Added extra fields to podcast table
2015-09-24 10:32:16 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
07b63abfe1
Small Podcast API fix
2015-09-23 15:54:42 -04:00
e610ce8af7
Fix for switching to simplepie
2015-09-23 15:35:24 -04:00
4de42ada6e
Disable simplepie caching
2015-09-23 14:50:32 -04:00
727abac0b8
Switch Podcast reader to use simplepie
2015-09-23 14:47:40 -04:00
827a83392f
Remove unnecessary fields from bulk get, add explicit casting back to podcast item array for testing
2015-09-22 20:24:53 -04:00
55d5fc62a2
SAAS-1071 - more work on celery backend
2015-09-22 20:22:06 -04:00
ee1ceb9281
Update TaskManager to be a bit easier to extend
2015-09-22 20:21:19 -04:00
3790b0fa81
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/podcast.js
2015-09-22 18:37:41 -04:00
ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
50996a081f
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-22 15:27:18 -04:00
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
cf1de5fb66
SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service
2015-09-22 15:26:08 -04:00
79db208cd4
Refactor SoundCloud/Third party controllers to fit new service architecture
2015-09-22 14:18:48 -04:00
13d1534042
Merge pull request #124 from danielhjames/saas
...
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -04:00
d86b00c53e
SAAS-1077: REST API for podcast episodes
...
Empty PUT action
2015-09-22 11:19:39 -04:00
0fc324f3ba
SAAS-1077: REST API for podcast episodes
2015-09-22 11:13:18 -04:00
5bd8a508b1
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-21 18:12:27 -04:00
479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
2a79424a64
Increase the CSRF token timeout
2015-09-21 18:00:04 -04:00
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
77a53491b0
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 14:51:55 -04:00
3198d822bf
SAAS-1058: Podcast table schema
...
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
ad2e26a1c3
IN-1956 Update Transifex project link
2015-09-21 17:44:00 +01:00
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
3db20bd3b5
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 07:08:55 -04:00
1445e85795
SAAS-1058: Podcast table schema
...
Changed podcast table column sizes
Added some podcast table column size validation
2015-09-20 12:06:51 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
a6450353e5
Add missing phtml file
2015-09-18 15:52:54 -04:00
7da1f86659
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 15:39:19 -04:00
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
be39b6b7c0
* Initial podcast skeleton functionality
...
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
11f3aa7b76
Fix typo
2015-09-18 14:36:54 -04:00
a810010448
Dropped percentage from educational discount
2015-09-18 14:01:30 -04:00
2cad7c1848
Added educational pricing page link
2015-09-18 13:59:55 -04:00
d95b5a9034
SAAS-1063: REST API for podcasts
...
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
9a2e9d1b3b
SAAS-1058: Podcast table schema
...
Renamed podcast_contents to podcast_episodes
Added new columns to podcast_episodes table
2015-09-18 09:51:44 -04:00
f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
3d07260a9d
Small VAT checker bugfix
2015-09-17 15:17:18 -04:00
d31e0f950d
Fix podcast api permission
2015-09-17 13:19:11 -04:00
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
dc840bf25f
Fix bad file extension
2015-09-16 15:31:59 -04:00
cce18ec911
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-16 15:29:18 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
c1899f18af
remove comment
2015-09-16 15:07:38 -04:00
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
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
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
0d80f857d3
Fix broken import
2015-09-15 16:08:19 -04:00
7b76c8d6d3
Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions
2015-09-15 15:06:03 -04:00
a444751397
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-15 14:21:27 -04:00
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
ff24976bed
Fix up celery downloads a bit
2015-09-15 14:21:19 -04:00
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
73d154ba17
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-15 14:07:59 -04:00
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
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
dd09676f88
Hide celery user
2015-09-15 13:59:48 -04:00
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
2015-09-14 18:29:43 -04:00
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
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
32f5492e85
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-09-09 18:59:44 -04:00
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
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
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
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
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
63784d4e6b
Fix some behaviour with playlist/smartblock fade button
2015-09-08 16:39:33 -04:00
d18d52a37a
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:15:24 -04:00
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -04:00
17c2ec2fd4
Fix responsiveness bugs
2015-09-08 15:25:28 -04:00
c2d1b788c5
Added missing opening php tag on billing - upgrades page
2015-09-08 11:03:33 -04:00
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
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04:00
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
83cd51de92
Reword usability hint text to match calendar context menu
2015-09-03 15:42:27 -04:00
f396bb4390
CSS tweaks
2015-09-03 14:51:58 -04:00
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
c928627d8b
CC-6131 - add div to show when search is active; css tweaks
2015-09-03 13:41:29 -04:00
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
65fd40bd6e
CC-6115: Redesign the navbar upload button
2015-09-02 17:39:00 -04:00
Albert Santoni
Duncan Sommerville
drigato
Albert Santoni
Daniel James
Duncan Sommerville