Duncan Sommerville
3f241b2f25
SAAS-1229 - add default bandwidth limit values
2015-11-25 15:04:45 -05:00
Duncan Sommerville
82544f34d9
SAAS-1229, SAAS-1230 - initial implementation of station suspend when over bandwidth limit
2015-11-24 13:36:54 -05:00
Duncan Sommerville
553299e9f5
Try to fix some schedule bugs
2015-11-23 14:55:37 -05:00
Duncan Sommerville
bac1e553d9
SAAS-1229 - add comments in Preference and set update timer
2015-11-23 10:53:25 -05:00
Duncan Sommerville
6c2d1f008b
SAAS-1229 - initial work on bandwidth limit within Airtime; overhaul TaskFactory to get tasks reflectively
2015-11-19 16:08:25 -05:00
Albert Santoni
ba832ffe3a
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
2015-11-18 12:38:22 -05:00
Albert Santoni
965a78c54a
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2015-11-18 12:38:18 -05:00
drigato
ceafccd685
Hide podcast from radio page for hobbyist plans
2015-11-18 12:12:57 -05:00
Duncan Sommerville
9a8e80f74b
Change station podcast RSS links back to https; style fix for menu in some browsers
2015-11-18 11:10:14 -05:00
Duncan Sommerville
eae8c7b638
Temporary fix to make enclosure urls iTunes compatible
2015-11-17 21:06:51 -05:00
Duncan Sommerville
4828e82d2a
Change download key parameter regex
2015-11-17 19:51:41 -05:00
Duncan Sommerville
1571887928
Change how station logo default is returned
2015-11-17 18:58:58 -05:00
Duncan Sommerville
bdddd6f6ce
Try to fix iTunes RSS compatibility
2015-11-17 17:50:16 -05:00
Albert Santoni
591f7d59f0
Slightly better error handling for uploads
2015-11-13 10:53:47 -05:00
Duncan Sommerville
c5a5839eff
Better errors from podcast 'Add' dialog
2015-11-10 19:26:25 -05:00
Albert Santoni
0e6e82a0c6
Fixed session start issue with new API
2015-11-06 13:04:33 -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
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
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
drigato
1211e8db7f
Fix typo
2015-10-26 15:55:03 -04:00
Duncan Sommerville
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -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
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
c8e1408dbe
Handle error case with bad user timezone strings break advanced search
2015-10-20 11:45:26 -04:00
Albert Santoni
f8a6721703
Increase transaction isolation level for track scheduling and moving
2015-10-19 17:31:26 -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
Albert Santoni
fb4aef405c
Increase transaction isolation level to avoid duplicate shows, SAAS-1111
2015-10-19 15:23:50 -04:00
drigato
14104a93ae
SAAS-1080: Station podcast feed
2015-10-19 11:54:53 -04:00
Duncan Sommerville
bddc121c2d
Initial work on automatic ingest for imported podcasts
2015-10-15 14:44:17 -04:00
drigato
40d0619f10
Override Podcast->fromArray
2015-10-15 08:06:01 -04:00
Albert Santoni
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04: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
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
drigato
c7dd2e7256
Working on changing schema
2015-09-30 08:53:13 -04: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
drigato
b00ac6750c
Testing
2015-09-29 13:04:22 -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
a75a9676f2
More robust solution for not showing what's new popup to new users
2015-09-29 11:28:20 -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
375d83ab43
Update to podcast frontend
2015-09-28 10:40:04 -04:00
Albert Santoni
d3f5b046f3
Colour palette improved for the calendar
2015-09-25 17:56:29 -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
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
drigato
c587dcf4e4
Added extra fields to podcast table
2015-09-24 10:32:16 -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
727abac0b8
Switch Podcast reader to use simplepie
2015-09-23 14:47:40 -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
drigato
0fc324f3ba
SAAS-1077: REST API for podcast episodes
2015-09-22 11:13:18 -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
Duncan Sommerville
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -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
7da1f86659
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 15:39:19 -04:00
Duncan Sommerville
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
drigato
11f3aa7b76
Fix typo
2015-09-18 14:36:54 -04:00
drigato
d95b5a9034
SAAS-1063: REST API for podcasts
...
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
drigato
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
drigato
f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
drigato
c1899f18af
remove comment
2015-09-16 15:07:38 -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
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
drigato
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
Duncan Sommerville
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
.
2015-09-14 18:29:43 -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
Duncan Sommerville
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -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
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
4b5980d898
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-09-02 18:17:19 -04:00
Duncan Sommerville
daf854af04
Fix some issues with search, hack to always display options buttons in library view
2015-09-02 18:17:11 -04:00
Albert Santoni
7a91677d01
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 16:25:35 -04:00
Albert Santoni
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -04:00
Duncan Sommerville
63ce022a8d
SAAS-1040 - station logo functionality improvements
2015-09-02 15:28:36 -04:00
Albert Santoni
6251fd62d5
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 10:42:23 -04:00
Albert Santoni
6959c459cd
Scheduler transaction improvement and preferences transaction removal
...
* Added a transaction to createAndFillShowInstancesPastPopulatedUntilDate
to ensure two requests don't trigger duplicate repeated show instances
in the calendar.
* Removed the transaction from setValue() in Preference and opt for
a row-level lock instead.
2015-09-02 10:40:38 -04:00
Duncan Sommerville
37df86723d
CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user
2015-09-01 16:10:33 -04:00
Albert Santoni
e1d5126e8b
Pick default colors for the calendar based on start time
2015-08-28 18:16:55 -04:00
Duncan Sommerville
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
Duncan Sommerville
84baef1996
CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen
2015-08-25 17:09:05 -04:00
Albert Santoni
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
Duncan Sommerville
371a26ff97
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 11:46:30 -04:00
Duncan Sommerville
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
Albert Santoni
3592eceb22
Merge branch 'saas' into saas-dev
2015-08-24 17:11:52 -04:00
Albert Santoni
e188fcde32
Merge branch 'saas-dev' into saas-showbuilder
2015-08-24 16:53:32 -04:00
Albert Santoni
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
Albert Santoni
249d3b1d2d
SAAS-1011: Files stored locally with incorrect file extensions won't play out
2015-08-11 09:33:29 -04:00
Albert Santoni
75914b791c
Merge branch 'saas-dev' into saas
...
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
Albert Santoni
fc5d20f4d6
Safen up getUsingCustomStreamSettings()
2015-08-10 08:57:21 -04:00
Duncan Sommerville
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
Albert Santoni
e760df0e5e
Added missing newline to password reset email
2015-08-07 14:29:10 -04:00
Albert Santoni
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
Duncan Sommerville
0c3d9a8af4
Merge branch 'saas-dev' into saas-showbuilder
2015-08-06 19:16:31 -04:00
drigato
f833ab9690
SAAS-838: Undefined variable previousMediaName
2015-08-06 17:09:54 -04:00
drigato
ea86675d07
SAAS-994: The Scheduled Play switch should not be able to be turned off without a warning message
...
Hid the element in the dashboard so it can never be turned off.
2015-08-06 11:14:43 -04:00
Duncan Sommerville
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -04:00
Albert Santoni
9c5a634754
Fix default Icecast hostname
2015-08-05 15:30:14 -04:00
Albert Santoni
1d39117b21
Merge remote-tracking branch 'origin/saas-email' into saas-dev
2015-08-05 14:50:58 -04:00
Albert Santoni
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
Albert Santoni
eef61a65fc
Cleanup and comments for the timezone/language popup
2015-08-05 14:49:43 -04:00
Albert Santoni
2aaba99b9a
Merge remote-tracking branch 'origin/saas-dev-lang-tz-setup' into saas-dev
2015-08-05 12:32:33 -04:00
drigato
23fe12651f
SAAS-838: Undefined variable previousMediaName
2015-08-05 09:48:31 -04:00
Albert Santoni
c934866063
Two small code improvements
2015-08-04 17:42:53 -04:00
Duncan Sommerville
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
drigato
7839a712e6
Merge branch 'saas-dev' into saas-dev-lang-tz-setup
2015-07-29 08:10:58 -04:00
Duncan Sommerville
5e58403c7f
Merge branch 'saas-dev' into saas-showbuilder
2015-07-27 15:38:30 -04:00
Duncan Sommerville
59d89b0b9e
SAAS-948 - ShowBuilder redesign editors and fixes
2015-07-27 15:37:55 -04:00
drigato
ee2bfe7664
SAAS-945: Language + Timezone Setup Popup
2015-07-27 07:06:22 -04:00
Duncan Sommerville
5c4803ddf2
SAAS-781 - password reset
2015-07-22 13:48:47 -04:00
Duncan Sommerville
abdc94ccc3
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-07-22 11:19:41 -04:00
Duncan Sommerville
a1a2bf9368
Test out existing email functionality
2015-07-22 11:19:37 -04:00
drigato
07f02260db
Fix undefined index: nextMediaName
2015-07-17 09:57:24 -04:00
Duncan Sommerville
8609934861
Merge branch 'saas-dev' into saas-showbuilder
2015-07-15 18:54:55 -04:00
Duncan Sommerville
ba38618235
Merge branch 'saas' into saas-dev
2015-07-15 18:54:38 -04:00
Duncan Sommerville
71ca2b0668
Merge branch 'saas-dev' into saas-showbuilder
2015-07-15 18:53:39 -04:00
Duncan Sommerville
d7d9a994d5
SAAS-948 - ShowBuilder redesign initial commit
2015-07-15 18:53:19 -04:00
Albert Santoni
ffaa076767
Second fix for SAAS-922, file extension improvements for S3
2015-07-15 17:51:37 -04:00
Albert Santoni
064e1bd4e0
Fix SAAS-922 for files on S3 too
2015-07-15 17:33:33 -04:00
Albert Santoni
7ecabffbe8
Avoid double dot in extension for SAAS-922
2015-07-15 13:41:03 -04:00
Albert Santoni
ffb55de566
SAAS-922 take 2
2015-07-15 13:12:56 -04:00
Duncan Sommerville
27fe32a3b4
Use mime-type array when checking for acceptable extensions
2015-07-15 12:58:05 -04:00
Duncan Sommerville
683c1a4641
SAAS-876 - use baseurl for default host value
2015-07-13 15:52:04 -04:00
Duncan Sommerville
9fdc08f88a
SAAS-876 - reset to default settings when using Airtime Pro streaming
2015-07-13 12:28:58 -04:00
Duncan Sommerville
37ed35f5b2
Merge branch 'saas-dev' into saas-stream-settings
...
Conflicts:
airtime_mvc/application/models/Preference.php
2015-07-10 10:29:38 -04:00
drigato
0601bd675e
SAAS-939: Add option to preferences to display login button on radio page
2015-07-09 14:38:44 -04:00
Duncan Sommerville
6b9d9e8063
Merge branch 'saas-dev' into saas-stream-settings
2015-07-08 12:47:24 -04:00
Duncan Sommerville
e246771af0
SAAS-922 - additional mime-type coverage
2015-07-07 15:09:06 -04:00
Duncan Sommerville
92c9fd30b5
SAAS-922 - expose mime-based file extensions from /rest/media
2015-07-07 13:54:19 -04:00
Duncan Sommerville
5cb396e512
SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null)
2015-07-06 18:03:44 -04:00
Duncan Sommerville
cb0593370a
Quick fix
2015-07-04 00:38:53 -04:00
Duncan Sommerville
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
Albert Santoni
1c8ccbf0cd
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-06-29 16:36:38 -04:00
Albert Santoni
cffc3b7e59
Add semi-colon to Shoutcast URLs to make them work with our player
2015-06-29 16:36:19 -04:00
Duncan Sommerville
04290e28dc
Fix error getting current schedule information if connected to master source
2015-06-29 14:25:00 -04:00
Duncan Sommerville
5cc8774e56
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
Duncan Sommerville
5fe70754bd
Replace all timestamp strings with constant
2015-06-26 14:42:52 -04:00
Duncan Sommerville
d91b05a0ae
SoundCloud - Add release_year metadata field and set default sharing and license types
2015-06-25 10:53:35 -04:00
Duncan Sommerville
67155b136a
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
2015-06-24 18:38:04 -04:00
Duncan Sommerville
8fcaf7fc74
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
Duncan Sommerville
e44e0de534
Add fields to SoundCloud upload
2015-06-24 15:46:53 -04:00
Duncan Sommerville
616cf143d5
SAAS-877 - Fix live-info-v2 behaviour
2015-06-24 14:28:04 -04:00
Duncan Sommerville
ef957fe0aa
SAAS-877 - Fix errors
2015-06-24 13:07:13 -04:00
Duncan Sommerville
fd8194e7d8
Fix error getting media
2015-06-24 12:40:51 -04:00
Duncan Sommerville
ffc3ef1bc9
SAAS-877 - Update live-info-v2 api
2015-06-24 12:31:32 -04:00
Duncan Sommerville
7645f67515
SAAS-877 - Update live-info-v2 api
2015-06-24 12:18:52 -04:00
Duncan Sommerville
065988f703
Return default value for disk quota if none set
2015-06-23 19:08:49 -04:00
Duncan Sommerville
76a7aa9a24
Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items
2015-06-18 18:18:48 -04:00
Duncan Sommerville
0cd9b1d0e5
Merge branch 'saas-dev' into soundcloud
2015-06-16 15:10:14 -04:00
Duncan Sommerville
8d2e476ff1
SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager
2015-06-16 15:10:08 -04:00
Duncan Sommerville
3902c8c746
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
2015-06-15 15:12:37 -04:00
Albert Santoni
5b6f4ca12a
SAAS-863: Streams not disabled properly in Liquidsoap config when downgrading
2015-06-15 12:19:03 -04:00
Duncan Sommerville
706d7db2b2
Merge branch 'saas-dev' into soundcloud
2015-06-15 11:03:37 -04:00
Duncan Sommerville
15c7ef5885
Celery backend and support for dev-env worker parallelization
2015-06-12 12:31:55 -04:00
Albert Santoni
0f3b68eed7
Default the Public Airtime API to being on
2015-06-10 17:55:04 -04:00
Duncan Sommerville
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
Duncan Sommerville
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
Albert Santoni
c18e728583
Merge branch 'saas-installer-albert' into saas-dev
2015-06-10 15:03:11 -04:00
drigato
8e8f8aa55b
Radio Page Code Review Changes
...
Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
2015-06-10 12:23:19 -04:00
Albert Santoni
3996e757b7
Merge branch 'saas-dev' into saas-installer-albert
2015-06-10 12:02:08 -04:00
drigato
0796f58878
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 11:14:02 -04:00
Albert Santoni
6126e8a51c
Merge branch 'saas' into saas-dev
2015-06-10 11:02:59 -04:00
drigato
ca8ca0abed
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 09:07:12 -04:00
Albert Santoni
fb1fc6fb00
CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers
2015-06-09 17:14:33 -04:00
Duncan Sommerville
f031d13867
Merge branch 'saas-dev' into soundcloud
2015-06-09 14:03:03 -04:00
Duncan Sommerville
49165e91d9
SAAS-854 - celery-based SoundCloud backend uploader
2015-06-09 14:02:29 -04:00
drigato
87920c1fc1
SAAS-855: Default station description in Preferences
2015-06-09 09:01:15 -04:00
Albert Santoni
23dd6d4021
CC-6054: live-info-v2 returns future shows without ordering by start time
2015-06-08 16:38:17 -04:00
Albert Santoni
ada6b97873
CC-6050: User management bugfix
2015-06-05 12:34:51 -04:00
Duncan Sommerville
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
drigato
305cb894c3
SAAS-841: Default station logo to the Airtime logo
2015-06-03 11:53:32 -04:00
Albert Santoni
01ea6f27ae
Merge branch 'saas-dev' into saas-installer-albert
...
Conflicts:
python_apps/api_clients/api_clients/api_client.py
2015-06-02 15:40:57 -04:00
drigato
b5e72d673f
Next track in dashboard was wrong sometimes
...
Was not filtering by playout_status
2015-06-02 09:48:43 -04:00
drigato
182b12e0e3
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
2015-05-28 09:47:58 -04:00
drigato
532bd1ea85
SAAS-772: Send metadata to Tunein
...
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
Albert Santoni
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
Albert Santoni
11c6818e61
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
2015-05-22 16:05:29 -04:00
drigato
c85457ec0b
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fix for undefined variable
2015-05-22 10:53:29 -04:00
drigato
099537a1b7
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Renamed function
Removed old function
2015-05-22 09:47:55 -04:00
drigato
8b02002f5e
Merge branch 'saas-dev' into saas-temp-testing
2015-05-22 08:56:43 -04:00
drigato
c9a6260cc0
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Removed commented code
2015-05-22 08:53:29 -04:00
drigato
5330859f00
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
small fix
2015-05-22 08:51:32 -04:00
drigato
b80c102e99
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fixes for webstreams
2015-05-22 08:09:59 -04:00
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
537fd2f148
SAAS-794 Schedule/get-current-playlist can take too long to respond
...
Replaced GetPrevCurrentNext function with new one that is much simpler
and less taxing on the database and web server.
2015-05-20 16:10:31 -04:00
Albert Santoni
b8dd7f0df3
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-05-19 16:21:16 -04:00
Albert Santoni
ae3fef383e
Removed station_domain from messages to airtime_analyzer, unused.
2015-05-19 16:20:51 -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
Duncan Sommerville
612aa37738
Merge branch 'saas' into saas-dev
2015-05-13 19:32:53 -04:00
Duncan Sommerville
bff04820f2
Add quiet flag to StoredFile delete to avoid unnecessary sentry errors when clearing library
2015-05-13 17:58:11 -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