Duncan Sommerville
2fb988a7cb
CSS fix for nav menu at small resolutions
2015-11-16 15:28:28 -05:00
drigato
f2ce22a1fa
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-16 14:40:46 -05:00
drigato
c453afc6f1
Fix toggling player bar and podcast playback on radio page
2015-11-16 14:40:31 -05:00
Duncan Sommerville
a34d74e7ce
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-16 14:23:16 -05:00
Duncan Sommerville
38d08a5661
SAAS-1208, SAAS-1209 - fix preferences and my podcast settings pages
2015-11-16 14:23:08 -05:00
drigato
16f252c2c8
Fix podcast title responsive layout on radio page
2015-11-16 14:16:10 -05:00
Duncan Sommerville
28d378abfa
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-16 12:45:04 -05:00
Duncan Sommerville
130c5f570b
Fix podcast table bug
2015-11-16 12:44:57 -05:00
drigato
ae02fa6260
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-16 12:36:11 -05:00
drigato
90ac6367e4
Improve podcast title on radio page
2015-11-16 12:35:50 -05:00
Duncan Sommerville
64f62b1994
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-16 12:07:59 -05:00
Duncan Sommerville
08f5aa51a6
CSS and display fixes
2015-11-16 12:07:53 -05:00
drigato
08afb54f89
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-16 11:44:30 -05:00
drigato
03e90cdd3f
Fix podcast pagination highlighting on radio page
2015-11-16 11:44:06 -05:00
Duncan Sommerville
610d860d6a
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-16 11:36:24 -05:00
Duncan Sommerville
3010fa01fa
Add processing div to podcast episodes table
2015-11-16 11:36:18 -05:00
Duncan Sommerville
7569e936ce
Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast
2015-11-13 15:59:57 -05:00
Duncan Sommerville
840f446e07
Disable publish button unless at least one source is checked
2015-11-13 15:59:34 -05:00
Duncan Sommerville
1d8ebab147
Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast
2015-11-13 14:58:24 -05:00
Duncan Sommerville
d0265367bf
Add forgotten png file
2015-11-13 14:58:06 -05:00
Duncan Sommerville
8e867b522c
SAAS-1202 - move station podcast to top-level menu item
2015-11-13 14:57:32 -05:00
Albert Santoni
591f7d59f0
Slightly better error handling for uploads
2015-11-13 10:53:47 -05:00
drigato
50c0bc2c28
Fix podcast current track title escaping on radio page
2015-11-13 09:51:57 -05:00
drigato
d9d4ce884c
Small radio page tweak
2015-11-13 09:02:33 -05:00
drigato
5b59fecae9
Fix radio page description button
2015-11-13 08:26:44 -05:00
drigato
778904fdb5
Radio page css fixes
2015-11-13 07:48:14 -05:00
Duncan Sommerville
0514a5d789
Frontend tweaks + fixes
2015-11-12 19:29:55 -05:00
Duncan Sommerville
69109e171c
Fix bad css
2015-11-12 19:03:32 -05:00
Duncan Sommerville
55df7775c2
Frontend polish and fixes; make empty placeholder implementation more abstract and add placeholder to 'My Podcast' view
2015-11-12 19:02:09 -05:00
Duncan Sommerville
0e74229975
Fix bug where 'Add' dialog appends to the dom multiple times
2015-11-12 15:42:41 -05:00
Duncan Sommerville
5a573d3d9e
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-12 15:32:45 -05:00
Duncan Sommerville
607176276a
Fix invalid reference bug
2015-11-12 15:32:38 -05:00
Duncan Sommerville
28e95d5c16
Add publish button to library table
2015-11-12 15:29:01 -05:00
drigato
9fc4e1c603
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-12 15:28:51 -05:00
drigato
9dae535768
Radio page jPlayer fixes
2015-11-12 15:28:40 -05:00
Duncan Sommerville
ea887dd8f6
Disable publish checkbox for disconnected sources
2015-11-12 14:47:47 -05:00
Duncan Sommerville
0951afcbb3
SAAS-1188 - add empty placeholder for podcast episodes table
2015-11-12 14:14:42 -05:00
Duncan Sommerville
26c9a19836
Fix bug with import status of podcst episodes
2015-11-12 11:37:39 -05:00
Duncan Sommerville
c7dcd4f00a
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-12 10:27:03 -05:00
Duncan Sommerville
1b4ae9bb83
Quick fix for bug on calendar
2015-11-12 10:26:57 -05:00
Albert Santoni
ae85c278ea
Remove a WIP label temporarily
2015-11-12 10:09:09 -05:00
Duncan Sommerville
071de55329
Add some additional error handling and prevent disabled buttons from being triggered
2015-11-11 19:26:51 -05:00
Duncan Sommerville
8a5c25291e
Lower poll interval for checking import status of podcast episodes
2015-11-11 18:52:12 -05:00
Albert Santoni
c43b45a7ba
Renamed Radio Archive to Radio Podcast
2015-11-11 18:39:00 -05:00
Albert Santoni
e5c198b61b
Some minor style changes for podcasting
2015-11-11 18:01:09 -05:00
Duncan Sommerville
86b7dec6fb
SAAS-1200 - remove context menu from schedule tracks dialog (calendar)
2015-11-11 17:07:24 -05:00
Duncan Sommerville
5b325acb34
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-11 16:48:35 -05:00
Duncan Sommerville
74f7c454b5
* SAAS-1184 - more polish for publishing/podcasting
...
* Fix some issues with the station podcast feed
* Various small fixes
2015-11-11 16:47:07 -05:00
drigato
bec55dc73e
Radio page fix for un-supported mime types
2015-11-11 15:53:42 -05:00
drigato
faeaf5450b
SAAS-1203: Sort published tracks on radio page by publication date DESC
2015-11-11 15:35:07 -05:00
drigato
59cf6f6238
Radio page jPlayer fixes
2015-11-11 14:55:47 -05:00
Duncan Sommerville
5264bebe57
SAAS-1199 - stop user from dragging unimported podcast episodes
2015-11-11 11:16:02 -05:00
Duncan Sommerville
c5a5839eff
Better errors from podcast 'Add' dialog
2015-11-10 19:26:25 -05:00
Duncan Sommerville
de380369ed
* SAAS-1197 - fix publish dialog behaviour for tasks with pending states
...
* SAAS-1184 - more polish on publishing/podcasting
2015-11-10 17:54:31 -05:00
drigato
308457c9f4
SAAS-1174: Indicate on Radio Page which podcast tracks cannot be played
...
Also made some other UI changes and pagination fixes
2015-11-10 17:06:58 -05:00
Duncan Sommerville
b88bcfaa92
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-10 15:10:44 -05:00
Duncan Sommerville
bb7f8c1ed3
SAAS-1184 - bugfixes and polish
2015-11-10 15:10:36 -05:00
Albert Santoni
127eeda0b3
Improved styling of podcast subscribe dialog
2015-11-10 15:10:08 -05:00
Albert Santoni
f4e9328e57
Renamed View Podcasts to View Episodes
2015-11-10 10:57:56 -05:00
Duncan Sommerville
f352b61707
Add prefixes for flex properties
2015-11-09 18:32:46 -05:00
Duncan Sommerville
0360b5e460
* SAAS-1182 - added sanity checks and additional logic to rss import and episode generation
...
* SAAS-1184 - started work on podcast UI polishing
* Fixed pull request issues
2015-11-09 18:17:49 -05:00
Duncan Sommerville
1bc0f9e54b
Fix small bugs in table.js
2015-11-09 13:59:36 -05:00
Duncan Sommerville
48f09c44ca
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-09 13:57:17 -05:00
drigato
372e28f82e
SAAS-1158: Station podcast on Radio Page design implementation
...
Fix some pagination functionality
2015-11-09 13:44:45 -05:00
drigato
ea9f0c8929
SAAS-1158: Station podcast on Radio Page design implementation
...
added pagination to the station rss episodes list
2015-11-09 12:15:46 -05:00
Duncan Sommerville
ef5fd271e0
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-09 10:21:38 -05:00
drigato
4c3e05d5f0
SAAS-1158: Station podcast on Radio Page design implementation
2015-11-09 08:42:46 -05:00
Duncan Sommerville
a7881b8941
SAAS-1165 - implement simple one-item drag and drop for podcast episodes table; still needs work
2015-11-06 17:47:46 -05:00
Duncan Sommerville
729360e1a1
SAAS-1165, SAAS-1155 - add constraints to Table buttons, implement podcast + podcast episode constraints; finish left-hand podcast episode view functionality
2015-11-06 14:40:22 -05:00
Albert Santoni
0e6e82a0c6
Fixed session start issue with new API
2015-11-06 13:04:33 -05:00
Albert Santoni
e8a0ace018
Fixed up syntax error introduced by last commit
2015-11-06 12:57:35 -05:00
Albert Santoni
713a158bb3
Disable layout in recalculate-schedule API - XXXX-260
2015-11-06 12:50:47 -05:00
Albert Santoni
4a86544738
Skip non-files for XXXX-260
2015-11-06 12:50:30 -05:00
Albert Santoni
ee99a7304f
XXXX-260 - Recalculate schedule API as part of bugfix
...
Conflicts:
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Scheduler.php
2015-11-06 12:49:53 -05:00
Duncan Sommerville
7072762dd9
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-06 09:44:29 -05:00
drigato
093de68edb
Add station rss subscribe link to radio page
2015-11-05 20:46:33 -05:00
Duncan Sommerville
901ded1441
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-05 18:16:27 -05:00
Duncan Sommerville
0be26d621b
SAAS-1165 - implement most functionality for left-hand podcast episodes view
2015-11-05 18:15:58 -05:00
Albert Santoni
1efd0b815b
Removed October educational discount banner from billing page
2015-11-05 16:47:58 -05:00
drigato
e496072541
Small css fix
2015-11-05 14:42:52 -05:00
drigato
c476b69958
Add podcast icon to radio page
2015-11-05 14:41:31 -05:00
drigato
a35d3ad27c
SAAS-1175: Radio page should toggle playout between player bar and podcast tracks
2015-11-05 13:24:13 -05:00
Albert Santoni
685134d8bb
Better trial suspension notice
2015-11-05 12:45:09 -05:00
Duncan Sommerville
95fc432445
SAAS-1173 - Add escaping for XML elements
2015-11-04 17:08:25 -05:00
Duncan Sommerville
a984cee13a
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-04 15:58:11 -05:00
Duncan Sommerville
90ac2cc681
Fix bug where public station podcast feed would not display when logged out
2015-11-04 15:57:51 -05:00
Duncan Sommerville
6cb28e0911
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
...
Conflicts:
airtime_mvc/public/js/airtime/library/podcast.js
2015-11-04 15:18:50 -05:00
Duncan Sommerville
df467a24bf
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-04 15:16:35 -05:00
Duncan Sommerville
866b88dbb2
Style tweaks to publishing and podcast dialogs
2015-11-04 15:16:29 -05:00
drigato
8d19e11343
SAAS-1173: Station RSS link does not work
...
Set charset to UTF-8
2015-11-04 15:08:47 -05:00
Duncan Sommerville
ee19d90930
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-04 13:24:42 -05:00
Duncan Sommerville
e7869b54c7
SAAS-1165 - initial work on left-hand pane for podcast episodes
2015-11-04 13:22:33 -05:00
drigato
a7370de832
Bump code version
2015-11-04 13:21:36 -05:00
drigato
8a03892ff8
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-04 12:45:50 -05:00
drigato
b95ccd46e7
SAAS-1156: Podcast episode playback and download from Radio Page
...
Switched from using muses to jplayer for playback
2015-11-04 12:45:30 -05:00
Duncan Sommerville
b4ec3eeb3f
Add sharing token/download key to station podcast URL when set to private; tab middle click fix
2015-11-04 10:52:23 -05:00
Duncan Sommerville
69da2fa07e
Style tweaks
2015-11-04 09:45:16 -05:00
Duncan Sommerville
b12b08f0f4
SAAS-1164 - styling for publishing frontend
2015-11-04 09:29:03 -05:00
Duncan Sommerville
6683b712c4
Fix a couple of station podcast bugs
2015-11-03 17:13:38 -05:00
Duncan Sommerville
a1d9902b2a
Cosmetic tweaks
2015-11-03 16:40:09 -05:00
Duncan Sommerville
22f8b0f328
* SAAS-1153 - more work on station podcast frontend. Add delete and edit button functionality for episode table
...
* Various fixes and backend updates
* Move station podcast creation to id getter in Preferences
2015-11-03 16:23:17 -05:00
Duncan Sommerville
c0d8b8b39c
* SAAS-1168, SAAS-1153 - work on station podcast frontend
...
* SAAS-1164 - Styling fixes for publishing and podcast editors
2015-11-03 13:18:55 -05:00
drigato
4cd00b50ee
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-03 11:47:45 -05:00
drigato
569ea00787
Fix for PodcastController index action when station podcast does not exist
2015-11-03 11:45:01 -05:00
drigato
335c2fea11
Fix for radio page when station podcast does not exist yet
2015-11-03 11:40:22 -05:00
drigato
51ec5a0df5
SAAS-1073: Schema upgrade for podcasts
...
Delete station podcast id from cc_pref in downgrade sql
2015-11-03 11:29:50 -05:00
drigato
d20574dfb1
SAAS-1073: Schema upgrade for podcasts
...
Upgrade and downgrade done.
2015-11-03 10:57:55 -05:00
Duncan Sommerville
3654647170
Add some comments to podcast.js
2015-11-03 10:31:06 -05:00
Duncan Sommerville
def8e7280b
* SAAS-1161 - refactor backend so episodes are loaded separately from podcast data to speed up loading and improve API readability
...
* Decouple imported and station podcast behaviour on the frontend
2015-11-02 18:07:16 -05:00
Duncan Sommerville
c4be9aebb2
SAAS-1154 - hide RSS tab on Radio page when station podcast video is set to private
2015-11-02 11:22:02 -05:00
Duncan Sommerville
529a73d39d
Fun update for tab functionality - add tab sorting and close on middle mouse click
2015-11-02 11:04:30 -05:00
Duncan Sommerville
4f281a30ed
Add SoundCloud update and download tasks to Celery backend; requires airtime-celery reinstall
2015-10-30 16:10:16 -04:00
Albert Santoni
702ee97c7b
Refactored Facebook Widget stuff
2015-10-30 14:38:34 -04:00
Duncan Sommerville
bf97c42167
Fix tabs layout bugs
2015-10-30 11:43:09 -04:00
Duncan Sommerville
9af7f6dcdd
Fix tabs bugs and podcast auto-ingest error
2015-10-30 10:29:22 -04:00
Duncan Sommerville
d08e19a93a
More small TaskManager and auto-ingest fixes
2015-10-29 18:26:20 -04:00
Duncan Sommerville
e3feb17f0c
* Change the Celery timeout to 15 minutes (from 10) to better accommodate automatic ingest
...
* Fix various small bugs in auto ingestion and tab implementation
* Update TaskManager run conditions to piggyback on API calls - guarantees a certain frequency of requests and greatly reduces chances of lock contention
2015-10-29 17:53:45 -04:00
Duncan Sommerville
c92eceb60d
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-10-29 14:58:35 -04:00
Duncan Sommerville
b4db2ff4ca
SAAS-1083 - more work on publish dialog
2015-10-29 14:58:30 -04:00
drigato
f3f5b4f539
SAAS-1156: Podcast episode playback and download from Radio Page
...
Fix metadata html escaping
Tried some tinkering with codecs
2015-10-29 14:45:19 -04:00
Duncan Sommerville
706db9bc25
Fix bug where multiple file metadata editors couldn't be opened through context menu
2015-10-29 13:47:43 -04:00
Duncan Sommerville
40a2aa10d8
SAAS-1083 - Implement unpublishing
2015-10-29 13:09:50 -04:00
Duncan Sommerville
4b11979eff
Remove station podcast from podcast datatable; editor now opens from button in podcasts view
2015-10-29 12:17:52 -04:00
Duncan Sommerville
8c49477b9c
Add some comments to podcast.js
2015-10-29 11:54:35 -04:00
Duncan Sommerville
95aae317c6
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
airtime_mvc/public/css/dashboard.css
airtime_mvc/public/js/airtime/library/spl.js
2015-10-29 11:21:24 -04:00
Duncan Sommerville
1de8a24b59
CSS fixes for uploads page
2015-10-29 11:15:01 -04:00
Duncan Sommerville
ada7212823
Add TaskManager task to fail pending imports over an hour old
2015-10-29 11:03:28 -04:00
Duncan Sommerville
b5f31065a7
Fix merge error
2015-10-29 10:18:53 -04:00
Duncan Sommerville
59ad4fd7f5
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-10-29 10:12:31 -04:00
Duncan Sommerville
a6eb4dc3e8
Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2015-10-29 10:12:26 -04:00
Duncan Sommerville
8978c3692d
Fix annoying css error
2015-10-29 09:58:32 -04:00
Duncan Sommerville
14b35dcf18
Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
2015-10-29 09:37:39 -04:00
Duncan Sommerville
cd17a23d13
Fix download counter reset timer
2015-10-29 09:23:41 -04:00
Duncan Sommerville
1067e9f8ae
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-10-28 18:54:35 -04:00
Duncan Sommerville
e97aa199bd
SAAS-1083 - work on publish dialog
2015-10-28 18:54:30 -04:00
drigato
3065d56018
SAAS-1156: Podcast episode playback and download from Radio Page
...
Playback is working in HTML5 mode and integrated with player bar
2015-10-28 16:28:56 -04:00
Duncan Sommerville
05f51a9a2d
Refresh podcast tabs on focus to have better synchronization with auto-ingest backend
2015-10-28 13:43:21 -04:00
Duncan Sommerville
e8643e04eb
Add colreorder fixed columns to podcast + episodes datatables so checkbox column is fixed
2015-10-28 12:17:29 -04:00
Duncan Sommerville
cc9f1ea6d0
* Wrap station podcast feed contents on radio page in displayRssTab check
...
* Test fix for automatic ingest bug
* Move disable layout code in feeds controller to avoid error case
2015-10-28 10:58:22 -04:00
drigato
09efacf4d5
SAAS-1156: Podcast episode playback and download from Radio Page
...
Playback works in HTML mode for mp3 files only right now.
Added a function that changes the player iframe's src attribute
so it plays individual tracks.
2015-10-27 16:00:15 -04:00
Albert Santoni
323b54d239
Rename billing menu for trials
2015-10-27 15:01:34 -04:00
drigato
1211e8db7f
Fix typo
2015-10-26 15:55:03 -04:00
drigato
73e7e6e021
SAAS-1148: Add station podcast to Radio Page
...
Skeleton is done. Download link works. Play link not yet done.
2015-10-26 15:24:33 -04:00
drigato
7f05d5c05e
Return track metadata as part of PodcastEpisodes API
2015-10-26 15:09:06 -04:00
drigato
e994033109
Refactor podcast episodes rest controller index action
2015-10-26 11:28:10 -04:00
drigato
5a2d8b26a9
Fix for breaking uploads - fix cue regex
2015-10-23 16:09:38 -04:00
Albert Santoni
aed18c534d
SAAS-1150: Null mime type breaks the scheduled shows tab
2015-10-23 15:00:19 -04:00
Duncan Sommerville
e8980e7a79
Bugfixes and more work on station podcast frontend
2015-10-22 18:03:38 -04:00
drigato
58a7b9324b
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/PodcastEpisodesController.php
2015-10-22 15:03:38 -04:00
drigato
1aee6ba97a
SAAS-1140: Paginate station podcast feed episodes
...
Added pagination to PodcastEpisodes controller
2015-10-22 14:51:39 -04:00
Albert Santoni
3e97ee5d62
Localization and verbiage improvements for adding podcasts
2015-10-22 14:39:12 -04:00
Albert Santoni
01618b55af
Fixed a bug with our table widget toolbar not showing up with static data. Also fixed a race condition.
2015-10-22 14:28:12 -04:00
Duncan Sommerville
f94e462fe0
Revert polling interval for podcast ingest
2015-10-22 12:22:56 -04:00
Duncan Sommerville
9302027a2b
Fix issue with automatic ingest; shift episode ingest to PodcastEpisodesController
2015-10-22 12:12:41 -04:00
Duncan Sommerville
23ccc268d1
Forgot to add station podcast phtml
2015-10-22 10:44:47 -04:00
Duncan Sommerville
814fc67e90
Work on station podcast editor view
2015-10-21 19:21:52 -04:00
Duncan Sommerville
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
Albert Santoni
16a0172542
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:26:04 -04:00
Albert Santoni
a4b42344dd
CC-6140: Switch to Windows linebreaks for stream M3U
2015-10-21 16:25:59 -04:00
drigato
eba99728ae
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 16:14:54 -04:00
drigato
cb8c34c3d5
SAAS-1126: Make player widget localizable
2015-10-21 16:14:36 -04:00
Albert Santoni
3b81ea02c8
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:14:11 -04:00
Albert Santoni
4d1d96c8f7
CC-6140: M3U streaming link
2015-10-21 16:14:06 -04:00
Duncan Sommerville
92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -04:00
Duncan Sommerville
6c0055895c
Set auto ingest timestamp when updating
2015-10-21 11:18:33 -04:00
drigato
b98f573531
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 11:01:20 -04:00
drigato
1cfa708717
SAAS-1125: Cue in and out points should be editable in the track metadata editor
...
Also made improvement by showing errors when the form has invalid data
2015-10-21 10:58:22 -04:00
Duncan Sommerville
0b1df6baf3
* SAAS-1084 - initial work on publishing API backend
...
* More work on automatic ingest
* Add automatic_ingest_timestamp column to ImportedPodcast
2015-10-20 19:03:34 -04:00
Albert Santoni
6cbc2f5316
Slight CSS rework for SAAS-1136
2015-10-20 17:39:46 -04:00
Albert Santoni
f441f2d385
SAAS-1136: Disk usage div overflows if your disk usage is over 100%
2015-10-20 16:57:31 -04:00
Albert Santoni
f79ca8650f
Unpaid invoice usability hint and invoice page style fix - SAAS-1134
2015-10-20 15:44:24 -04:00
Albert Santoni
885f47c20e
Better solution for upgrade problems (SAAS-1133)
2015-10-20 14:52:17 -04:00
Albert Santoni
9d4cc6c205
Temporary workaround for upgrade problems
2015-10-20 12:28:18 -04:00
Albert Santoni
c8e1408dbe
Handle error case with bad user timezone strings break advanced search
2015-10-20 11:45:26 -04:00
Albert Santoni
195f1f0e9a
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-19 17:31:31 -04:00
Albert Santoni
f8a6721703
Increase transaction isolation level for track scheduling and moving
2015-10-19 17:31:26 -04:00
Duncan Sommerville
3a791ef9b5
Remove unnecessary field
2015-10-19 17:00:03 -04:00
Duncan Sommerville
12f6536e74
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-10-19 16:18:19 -04:00
Duncan Sommerville
1a5250205c
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-10-19 16:10:25 -04:00
Duncan Sommerville
bd3a16ae7b
SAAS-1110 - Fix header sizing at most screen resolutions
2015-10-19 16:10:20 -04:00
Duncan Sommerville
bcbd8a8050
Fix bug in auto ingest, immediately retry on failure
2015-10-19 15:36:34 -04:00
Albert Santoni
da6e613a24
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-19 15:23:57 -04:00
Albert Santoni
fb4aef405c
Increase transaction isolation level to avoid duplicate shows, SAAS-1111
2015-10-19 15:23:50 -04:00
Duncan Sommerville
9d0beabd3f
Make playout history page visible for Program Managers
2015-10-19 14:09:42 -04:00
Duncan Sommerville
c8069aaedd
Initial publishing fixes and tweaks
2015-10-19 13:42:27 -04:00
Duncan Sommerville
be3a3fbd9f
* Fix error in automatic podcast ingest
...
* Switch from text-scrolling to using title attributes to display overflowing text strings
2015-10-19 12:57:18 -04:00
Albert Santoni
97cc4050a4
CC-6139: User timezone setting displays incorrectly in user settings
2015-10-19 12:37:34 -04:00
drigato
14104a93ae
SAAS-1080: Station podcast feed
2015-10-19 11:54:53 -04:00
Albert Santoni
30d742af92
Added msising publish-dialog.phtml and fixed .gitignore file
2015-10-15 18:03:03 -04:00
Duncan Sommerville
bddc121c2d
Initial work on automatic ingest for imported podcasts
2015-10-15 14:44:17 -04:00
Duncan Sommerville
a2d725f2b9
Fix podcast episode ingest
2015-10-15 11:33:09 -04:00
drigato
40d0619f10
Override Podcast->fromArray
2015-10-15 08:06:01 -04:00
Albert Santoni
d98459a55d
Fix head title on Radio Page
2015-10-14 15:20:49 -04:00
Albert Santoni
eea5fff1fa
Fixed jQuery being broken on Radio Page
2015-10-14 15:15:25 -04:00
Albert Santoni
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04:00
Albert Santoni
591b3d1539
Fix SAAS-1128 more robustly to fix timezone/lang popup for sign up too
2015-10-14 14:40:23 -04:00
Albert Santoni
a90b97fb55
SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog
2015-10-14 14:28:39 -04:00
Albert Santoni
08344895d6
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-14 11:59:05 -04:00
Albert Santoni
9a03b1b50a
Force users to click OK in the language/timezone popup
2015-10-14 11:58:44 -04:00
Localizer
96e6038d87
updated translation resources
2015-10-14 15:49:16 +00:00
drigato
c166b4f00e
Merge branch 'saas-dev-publishing' into saas-dev-publishing-schema-change
...
Conflicts:
airtime_mvc/application/models/airtime/Podcast.php
2015-10-14 11:04:41 -04:00
drigato
d647bf67ea
Refactoring Podcast classes and services
2015-10-14 10:58:13 -04:00
drigato
7f64edafff
SAAS-1121: New link show instances don't get created sometimes if there is no show content
...
Fixed by checking if the linked show is empty before trying to copy its
tracks into new show instances
2015-10-13 11:08:17 -04:00
drigato
cfb21f8425
Bunch of schema changes
2015-10-13 10:14:23 -04:00
Duncan Sommerville
c3c4abdd0c
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/css/dashboard.css
airtime_mvc/public/css/styles.css
airtime_mvc/public/js/airtime/library/library.js
airtime_mvc/public/js/airtime/library/spl.js
2015-09-30 16:26:02 -04:00
Duncan Sommerville
ee70a0dbea
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:48 -04:00
Duncan Sommerville
b01fdc6805
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:06 -04:00
Duncan Sommerville
98d565ff3d
SAAS-1101 - add workaround for pages obstructed by livechat box
2015-09-30 14:24:21 -04:00
Duncan Sommerville
c0372c1745
Fix webstream tab change behaviour
2015-09-30 12:07:31 -04:00
Duncan Sommerville
2ee7e4bf71
SAAS-1088 - move 'All My Shows' checkbox to dropdown instead
2015-09-30 11:38:33 -04:00
Duncan Sommerville
258500f650
SAAS-1102 - fix datatables pagination layout issues
2015-09-30 11:24:29 -04:00
Duncan Sommerville
efa3999041
SAAS-1016 - fix some stream settings not being saved correctly
2015-09-30 10:30:32 -04:00
drigato
bdab0f7b1a
Revert medatdata editor fix
2015-09-30 10:03:34 -04:00
drigato
f91d28e3f2
Css fix for playlist editor
2015-09-30 09:02:35 -04:00
drigato
2e024bcfdd
Css fixes for metadata and playlist editors
2015-09-30 08:58:39 -04:00
drigato
c7dd2e7256
Working on changing schema
2015-09-30 08:53:13 -04:00
Localizer
4b882064f2
updated translation resources
2015-09-30 11:32:44 +00:00
Albert Santoni
8b33acacd3
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
Duncan Sommerville
70e538ebb4
SAAS-1069 - disable add button when track metadata tab is open
2015-09-29 16:39:54 -04:00
Duncan Sommerville
c08994a60b
Fix bug where user could open mutiple copies of same webstream tab
2015-09-29 16:34:23 -04:00
Duncan Sommerville
80515ef263
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-29 16:26:47 -04:00
Duncan Sommerville
d3e9665063
Fix bug where switching to a webstream tab would throw an error
2015-09-29 16:26:39 -04:00
drigato
81bf601a12
SAAS-1099: Dashboard messed up in Safari
2015-09-29 16:03:14 -04:00
Duncan Sommerville
3df1081c60
SAAS-1088 - fix broken 'all my shows' checkbox
2015-09-29 15:51:09 -04:00
Duncan Sommerville
3fcc3c507a
Fix tabs bug
2015-09-29 15:09:09 -04:00
Duncan Sommerville
0029844fa7
Fix layout of schedule tracks dialog
2015-09-29 13:54:43 -04:00
Albert Santoni
f25457d1eb
SAAS-1098: Max filesize restricted by new uploader
2015-09-29 13:29:06 -04:00
drigato
b00ac6750c
Testing
2015-09-29 13:04:22 -04:00
Albert Santoni
eb5fcec485
SAAS-1096: Tabs layout in Schedule Tracks broken in Firefox, sometimes Chrome
2015-09-29 13:02:22 -04:00
Albert Santoni
4c52bd99f6
Temporarily fix the Help video label breaking the Help page layout
2015-09-29 12:36:56 -04:00
Duncan Sommerville
c2cd768398
SAAS-1094 - fix selector for scheduled show selection + context menu
2015-09-29 12:27:45 -04:00
Duncan Sommerville
f4fad13eb8
SAAS-1086 - centre cursor when dragging
2015-09-29 12:07:24 -04:00
Duncan Sommerville
db1e69c00f
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-29 12:00:07 -04:00
Duncan Sommerville
8cc5e5835c
Fix double processing icon when adding/removing tracks from playlists
2015-09-29 12:00:02 -04:00
Albert Santoni
a9eb3f737d
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-09-29 11:50:18 -04:00
Albert Santoni
6f185d094b
SAAS-1095: Unknown schedule type: array
2015-09-29 11:49:53 -04:00
Duncan Sommerville
99a5f7facb
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
...
Conflicts:
airtime_mvc/build/sql/defaultdata.sql
2015-09-29 11:37:53 -04:00
Duncan Sommerville
f5afc0957f
SAAS-1087 - fix DJ list overflow + styling
2015-09-29 11:36:00 -04:00
Duncan Sommerville
7a44a05cb2
Style tweaks
2015-09-29 11:28:30 -04:00
Duncan Sommerville
a75a9676f2
More robust solution for not showing what's new popup to new users
2015-09-29 11:28:20 -04:00
Albert Santoni
41cf4b389a
Cleanup for defaultdata.sql
2015-09-29 11:03:19 -04:00
Duncan Sommerville
477708ecc9
Style tweaks
2015-09-29 10:29:21 -04:00
Albert Santoni
f1c5a8b244
Fix the timezone/language picker and fix the What's New dialog popping up for new users
2015-09-29 09:19:33 -04:00
Albert Santoni
6658fca10b
Some polish for the What's New popup
2015-09-28 22:17:34 -04:00
Albert Santoni
943048dd87
Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations
2015-09-28 17:48:04 -04:00
Duncan Sommerville
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
Duncan Sommerville
d09941dffa
Set TaskManager run interval back to 30 seconds
2015-09-28 14:15:08 -04:00
Duncan Sommerville
c1a16d7973
Add filter string to generic Table object; add call to refetch podcast episode table data
2015-09-28 14:14:01 -04:00
Duncan Sommerville
375d83ab43
Update to podcast frontend
2015-09-28 10:40:04 -04:00
Duncan Sommerville
febc5fa99d
SAAS-1089 - fix scrolling in metadata editor
2015-09-28 10:17:40 -04:00
Albert Santoni
d3f5b046f3
Colour palette improved for the calendar
2015-09-25 17:56:29 -04:00
Albert Santoni
e03428327c
Fixed missing return statement
2015-09-25 15:54:26 -04:00
Albert Santoni
8b6833180d
Refactored double Set-Cookie prevention code, and session reopening code
2015-09-25 12:03:10 -04:00
Albert Santoni
91c584ba16
Test alternate session reopening code to alleviate double Set-Cookie header
2015-09-25 11:37:36 -04:00
Albert Santoni
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
Duncan Sommerville
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
Duncan Sommerville
a24565669b
Fix bug where library would sometimes reference wrong table
2015-09-24 15:55:37 -04:00
Duncan Sommerville
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
Duncan Sommerville
dcb30b3aa7
Move file extension check to before database object insertion
2015-09-24 12:57:19 -04:00
Duncan Sommerville
778b67982b
Remove duplicate imports and add new table imports to ScheduleController
2015-09-24 12:56:32 -04:00
Duncan Sommerville
e5deae89a4
Generalize datatables style fixes
2015-09-24 12:54:24 -04:00
drigato
c587dcf4e4
Added extra fields to podcast table
2015-09-24 10:32:16 -04:00
Albert Santoni
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
drigato
07b63abfe1
Small Podcast API fix
2015-09-23 15:54:42 -04:00
drigato
e610ce8af7
Fix for switching to simplepie
2015-09-23 15:35:24 -04:00
drigato
4de42ada6e
Disable simplepie caching
2015-09-23 14:50:32 -04:00
drigato
727abac0b8
Switch Podcast reader to use simplepie
2015-09-23 14:47:40 -04:00
Duncan Sommerville
c5b00e56bb
Fix bug that prevented multiple podcast tabs from being opened
2015-09-23 12:38:08 -04:00
Duncan Sommerville
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
Duncan Sommerville
55d5fc62a2
SAAS-1071 - more work on celery backend
2015-09-22 20:22:06 -04:00
Duncan Sommerville
ee1ceb9281
Update TaskManager to be a bit easier to extend
2015-09-22 20:21:19 -04:00
Duncan Sommerville
576a457fdb
Small tweaks to tabs, fix merge conflicts in podcast
2015-09-22 20:19:57 -04:00
Albert Santoni
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
Albert Santoni
ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
Duncan Sommerville
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
Duncan Sommerville
50996a081f
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-22 15:27:18 -04:00
Duncan Sommerville
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
Duncan Sommerville
cf1de5fb66
SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service
2015-09-22 15:26:08 -04:00
Duncan Sommerville
79db208cd4
Refactor SoundCloud/Third party controllers to fit new service architecture
2015-09-22 14:18:48 -04:00
Albert Santoni
13d1534042
Merge pull request #124 from danielhjames/saas
...
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -04:00
drigato
d86b00c53e
SAAS-1077: REST API for podcast episodes
...
Empty PUT action
2015-09-22 11:19:39 -04:00
drigato
0fc324f3ba
SAAS-1077: REST API for podcast episodes
2015-09-22 11:13:18 -04:00
Albert Santoni
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
Albert Santoni
479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
Albert Santoni
2a79424a64
Increase the CSRF token timeout
2015-09-21 18:00:04 -04:00
Albert Santoni
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
Duncan Sommerville
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
Albert Santoni
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
Albert Santoni
73e489fdc8
Cleanup a comment
2015-09-21 15:41:24 -04:00
Duncan Sommerville
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
drigato
77a53491b0
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 14:51:55 -04:00
drigato
3198d822bf
SAAS-1058: Podcast table schema
...
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
Daniel James
ad2e26a1c3
IN-1956 Update Transifex project link
2015-09-21 17:44:00 +01:00
Duncan Sommerville
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
drigato
3db20bd3b5
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 07:08:55 -04:00
drigato
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
Duncan Sommerville
18fb0f3509
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 18:29:54 -04:00
Duncan Sommerville
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
Albert Santoni
515d892f6e
Fixed small table widget ctrl-selection bug
2015-09-18 16:11:49 -04:00
Duncan Sommerville
a6450353e5
Add missing phtml file
2015-09-18 15:52:54 -04:00