042e441708
Radio Page Code Review Changes
...
Reset stylesheets in index controller.
Removed hardcoded days of week in WidgetHelper.
Display schedule widget with 6 days after the current day.
2015-06-10 11:13:03 -04:00
6126e8a51c
Merge branch 'saas' into saas-dev
2015-06-10 11:02:59 -04:00
ca8ca0abed
Merge branch 'saas-dev' into saas-landing-page
2015-06-10 09:07:12 -04:00
fb1fc6fb00
CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers
2015-06-09 17:14:33 -04:00
f031d13867
Merge branch 'saas-dev' into soundcloud
2015-06-09 14:03:03 -04:00
49165e91d9
SAAS-854 - celery-based SoundCloud backend uploader
2015-06-09 14:02:29 -04:00
d181a931b8
Fix schedule widget layout by removing table structure
2015-06-09 10:30:47 -04:00
87920c1fc1
SAAS-855: Default station description in Preferences
2015-06-09 09:01:15 -04:00
23dd6d4021
CC-6054: live-info-v2 returns future shows without ordering by start time
2015-06-08 16:38:17 -04:00
02d49864fa
Squash some error notices in UserController
2015-06-08 15:17:48 -04:00
060280d5a5
Merge branch 'saas-dev' into saas-landing-page
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/IndexController.php
2015-06-08 14:55:24 -04:00
1974774e0c
SAAS-851: Embed schedule widget loses format with long show names
2015-06-05 14:35:27 -04:00
ada6b97873
CC-6050: User management bugfix
2015-06-05 12:34:51 -04:00
14f37909d1
More robust error handling in show-logo action
2015-06-05 11:55:06 -04:00
dd4cbe5b63
CC-6051 - Route / generates invalid navigation bar links
2015-06-05 11:52:51 -04:00
f6e23ab075
Add more error handling to show-logo api
2015-06-04 18:45:00 -04:00
8386145cb9
SAAS-836: Create a new schedule widget skin
2015-06-04 16:09:19 -04:00
cae5f85b0a
Fix typo
2015-06-04 12:17:48 -04:00
6528a9b0a3
SAAS-843: Create Embeddable Schedule Widget View
...
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
2015-06-04 12:00:23 -04:00
63b726e6b2
SAAS-848 - Modify SoundCloud code to use external redirect
2015-06-04 11:38:46 -04:00
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
3593a13064
SAAS-842: Schedule widget show time formatting problem
2015-06-03 12:24:19 -04:00
305cb894c3
SAAS-841: Default station logo to the Airtime logo
2015-06-03 11:53:32 -04:00
d6ec9e99b5
Remove unused embed controller action
2015-06-03 10:12:19 -04:00
3de1d90241
Unhardcode premium style player
...
Had this is for testing purposes
2015-06-03 10:02:27 -04:00
3bf6619696
SAAS-833: Radio page UI improvements/fixes
...
Undo some previous css changes
2015-06-03 09:38:07 -04:00
9a42c4bf36
SAAS-833: Radio page UI improvements/fixes
...
Added width and height to schedule widget iframe tag
2015-06-03 09:18:38 -04:00
1add10c657
SAAS-833: Radio page UI improvements/fixes
...
Fixed schedule widget scrolling
Inserted default station description
2015-06-03 08:29:03 -04:00
2cf6cb549e
SAAS-833: Radio page UI improvements/fixes
...
Moved player bar buttons to float right
2015-06-02 16:27:37 -04:00
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
b5e72d673f
Next track in dashboard was wrong sometimes
...
Was not filtering by playout_status
2015-06-02 09:48:43 -04:00
a8d2290d00
SAAS-834: Login with WHMCS account doesn't work on suspended stations
2015-05-29 16:43:27 -04:00
30b81c398f
SAAS-814: Decide what to do with new Login Page
...
We decided to link to the existing login page for now
2015-05-29 14:25:00 -04:00
24bfdbaa7f
SAAS-811: Insert extra radio page buttons onto player bar
...
Insert extra buttons onto player bar once the iframe has loaded
2015-05-29 13:40:07 -04:00
77e518eec0
SAAS-821: Wire up new player bar with muses
...
Got metadata displaying
2015-05-29 09:40:50 -04:00
911c168765
SAAS-821: Wire up new player bar with muses
...
Play and stop is working
2015-05-29 09:14:23 -04:00
7a6184cf23
Merge branch 'saas' into saas-dev
2015-05-28 15:29:28 -04:00
187ef926ff
Allow public APIs to be accessed with the API key regardless of the public API setting.
2015-05-28 15:28:51 -04:00
8f8b0b7f4d
Merge branch 'saas-dev' into saas-landing-page
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/views/scripts/embed/player.phtml
2015-05-28 13:25:18 -04:00
450300ddd8
Small TuneIn validation fix
...
Was not setting error message when station id is invalid
2015-05-28 12:00:20 -04:00
018bb3a648
SAAS-823: Tunein preference check box issue
2015-05-28 11:54:23 -04:00
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
b50aa15587
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-27 15:16:13 -04:00
51a3f19f43
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-27 14:02:00 -04:00
1fa45bfc48
SAAS-777 - Changed deleteAllFilesAction to remove files and any current/future schedule items
2015-05-27 14:01:49 -04:00
27868fbfe5
SAAS-813: Wire up schedule widget on Radio Page
2015-05-27 13:50:25 -04:00
a569387c5a
Removed extra white space
2015-05-27 10:19:15 -04:00
a74a161936
SAAS-812: Remove live chat from radio page
2015-05-27 10:18:50 -04:00
2d577dbcb0
Small fix to embed player metadata
2015-05-27 10:09:13 -04:00
793e959cae
SAAS-811: Insert extra radio page buttons onto player bar
2015-05-27 10:08:51 -04:00
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
6fad0a3ee6
Merge branch 'saas-dev' into saas-installer-albert
2015-05-22 19:09:30 -04:00
6ca0e340a4
Merge branch '2.5.x-installer' into saas-installer-albert
...
Conflicts:
python_apps/pypo/pypo/pypofile.py
2015-05-22 18:26:16 -04:00
027adc7749
Three bugfixes
...
* Removed Support Settings nav link
* SAAS-801: pypo log configuration files are overkill and must be removed
* CC-6043: CTRL-C doesn't work in pypo / airtime-playout
2015-05-22 18:20:45 -04:00
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
c67549d9c6
Merge branch 'saas-temp-testing' into saas-dev
2015-05-22 10:54:04 -04:00
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
94b949adaa
SAAS-772: Send metadata to Tunein
...
Removed unused code
2015-05-22 10:35:36 -04:00
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
8b02002f5e
Merge branch 'saas-dev' into saas-temp-testing
2015-05-22 08:56:43 -04:00
c9a6260cc0
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Removed commented code
2015-05-22 08:53:29 -04:00
5330859f00
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
small fix
2015-05-22 08:51:32 -04:00
b80c102e99
SAAS-794: Schedule/get-current-playlist can take too long to respond
...
Fixes for webstreams
2015-05-22 08:09:59 -04:00
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -04:00
2b8e40a12c
Merge branch 'saas' into saas-speedy
2015-05-21 15:09:57 -04:00
3052e1f23b
Changed Preferences and Stream Settings pages to use new-style csrf token generation
2015-05-21 10:17:05 -04:00
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
506b9cb248
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-05-20 07:06:22 -04:00
e5a8f14a9a
Commented out request to tunein when station is offline
2015-05-20 07:05:26 -04:00
b8dd7f0df3
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-05-19 16:21:16 -04:00
ae3fef383e
Removed station_domain from messages to airtime_analyzer, unused.
2015-05-19 16:20:51 -04:00
a8bf8e5ec9
SAAS-786: Implement Landing Page Design
...
Fixed player iframe to bottom of screen
2015-05-19 16:03:59 -04:00
5b6a88f7fd
Fix bad merge that added soundcloud settings back into preferences page
2015-05-19 15:51:04 -04:00
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
2da4e264e5
SAAS-772: Send metadata to Tunein
...
Update metadata when station goes offline
2015-05-19 15:42:07 -04:00
c3457ae03f
tunein testing
2015-05-19 15:19:09 -04:00
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
1c88d6dccd
Merge branch 'saas' into saas-dev
2015-05-19 12:18:54 -04:00
20649f73bd
Added missing translation for disk quota error message
2015-05-19 12:18:01 -04:00
e91b520b42
SAAS-786: Implement Landing Page Design
...
- Separated embed player css from radio page css because I had to change
the responsive design a bit.
- Trying to embed the iframe on the radio page but there are some
conflicting styles
2015-05-15 16:19:18 -04:00
479dbc5525
SAAS-786: Implement Landing Page Design
...
Implemented logo, station name and description
2015-05-15 09:01:20 -04:00
b023f191e3
SAAS-772: Send metadata to Tunein
...
Added form validation by making a test request to the TuneIn API with
the user-entered values
2015-05-14 13:13:33 -04:00
70735e7bae
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-14 10:51:53 -04:00
612aa37738
Merge branch 'saas' into saas-dev
2015-05-13 19:32:53 -04:00
bff04820f2
Add quiet flag to StoredFile delete to avoid unnecessary sentry errors when clearing library
2015-05-13 17:58:11 -04:00
9d822b6e8b
Only use API authentication (not session) when validating termination requests
2015-05-13 17:58:02 -04:00
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
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
10ca987a51
SAAS-762: Implement schedule widget design
2015-05-12 11:56:35 -04:00
24ebc8c8e4
Merge branch 'saas' into saas-landing-page
2015-05-11 15:54:02 -04:00
77241bb6fc
Merge branch '2.5.x' into saas
2015-05-11 14:57:58 -04:00
2953576921
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 14:57:20 -04:00
aee5615cd3
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-05-11 14:34:40 -04:00
689a431867
Deprecated RabbitMQ::SendMessageToHaproxyConfigDaemon()
2015-05-11 14:34:21 -04:00
21886a509d
Merge branch '2.5.x' into saas
2015-05-11 12:18:09 -04:00
56e5e959ec
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2015-05-11 12:16:55 -04:00
28997344fc
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 12:16:32 -04:00
3d99c423a9
Merge branch '2.5.x' into saas
2015-05-11 11:08:52 -04:00
efad7be91a
CC-5120: Can't add PLS webstreams
2015-05-11 11:08:43 -04:00
4941ae1a6d
Separated weekly schedule widget css into separate file
2015-05-07 14:27:59 -04:00
9ad0628efa
SAAS-732: Clean up weekly program widget
2015-05-05 15:07:12 -04:00
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
f375115825
Merge branch 'saas' into saas-landing-page
2015-05-04 09:40:26 -04:00
fc36ff5797
Updated user manual constant to new manual url
2015-04-30 14:51:35 -04:00
272bb11fcf
Fixed player displaying nothing (instead of Offline) when no show is scheduled
2015-04-30 14:36:33 -04:00
e78bd82c8c
SAAS-749, SAAS-753 - Fix for odd linked and repeating show behaviour
2015-04-30 14:14:56 -04:00
59b90360a1
SAAS-755 - Updated User Manual link
2015-04-30 11:52:23 -04:00
0418cdbc04
Nerf a player console.log call
2015-04-29 17:26:51 -04:00
85cc373328
Embedded player: Display the show name during master/show source
2015-04-29 16:03:36 -04:00
e73a6df796
Fix for invalid date format issue in Firefox
2015-04-29 15:23:29 -04:00
1215eb1895
Prevent NaN from causing problems with player timeout
2015-04-29 12:58:32 -04:00
c72cdbc19d
More preventative coding for the player and fixed the live-info-v2 API
2015-04-29 12:17:44 -04:00
c0bd28f6d5
Prevent negative timeouts in player
2015-04-29 11:59:17 -04:00
9019377d0e
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-29 11:48:15 -04:00
b3a19ae49e
Bugfix for embedded player sending too many requests on load, quieter logging for boto
2015-04-29 11:46:44 -04:00
4e37788d92
Fix for SAAS-747
2015-04-28 11:42:18 -04:00
94fc2131ff
SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade
2015-04-27 16:19:15 -04:00
574fdf4b27
Merged 2.5.x into saas
2015-04-27 14:01:28 -04:00
4b307d6b47
Fix for vertical scrollbar issue
2015-04-27 13:52:55 -04:00
9b7acb24c6
SAAS-728: Make schedule widgets embeddable
2015-04-22 12:46:41 -04:00
7d1b112db9
Stopped redirecting to /login if no valid session
2015-04-21 11:26:48 -04:00
de8edf982a
SAAS-723: Add compatibility chart to player page
2015-04-20 10:52:49 -04:00
9cee7bcc86
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-20 10:05:55 -04:00
926d1704bf
SAAS-723: Add compatibility chart to player page
2015-04-20 09:59:17 -04:00
074ad31228
Squash warnings in ProvisioningController
2015-04-17 12:40:52 -04:00
1964cbb75e
Merge branch 'saas' into saas-suspend
2015-04-17 12:18:56 -04:00
bd7c0be514
Whoops, invert the suspension logic
2015-04-17 12:18:49 -04:00
3ca16db524
Comments
2015-04-17 12:09:05 -04:00
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -04:00
02dff34328
Fixed last day of month calendar view bug
2015-04-16 16:45:20 -04:00
acbaac0bc5
Fixed month view not displaying a full 42 days
2015-04-16 16:30:12 -04:00
d20c8e8df4
Merge branch 'saas' into saas-speedy
2015-04-16 15:59:08 -04:00
56716e9af6
Fixed preferences not saving in some cases
2015-04-16 15:11:46 -04:00
dc20b5c252
Bugfixes for my optimizations
...
* Fixed saving not working in the user settings page
* Fixed first day of week not loading correctly in week view
* Fixed timezone handling in functions off of EventPreloadAction
* Fixed show instance "percent filled" not being embedded in our JSON
response correctly if you started on the month view.
2015-04-16 14:58:28 -04:00
b61df4d681
Merge branch '2.5.x' into saas
2015-04-16 12:11:49 -04:00
aa0d0f959a
Remove unnecessary LOCK TABLE that can cause deadlocks in rare circumstances
2015-04-16 12:10:56 -04:00
8449194ca1
Merge branch 'saas' into saas-speedy
2015-04-15 16:44:43 -04:00
f0bcc1e42b
Merge branch '2.5.x' into saas
2015-04-15 16:44:26 -04:00
4267c4e86d
CC-6024: Cannot drag and drop tracks between shows in the Now Playing screen
2015-04-15 16:44:04 -04:00
7c7bacfcaf
Remove console.log
2015-04-15 14:20:31 -04:00
d5dfa9af81
player testing console.log
2015-04-15 13:53:24 -04:00
838f7e84bf
Merge branch 'saas-player-testing' into saas
2015-04-15 13:22:32 -04:00
880cca4733
SAAS-715: Indicate errors on the player
...
Fix error handling in flash mode
2015-04-15 13:21:54 -04:00
d5a29398c6
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-15 10:50:57 -04:00
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
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
3695049a6c
Added Admin_Only decorator and greyed out read-only text-areas
2015-04-14 14:35:37 -04:00
66a236a842
Better error handling for player in flash mode
2015-04-14 10:51:52 -04:00
83c21d4381
SAAS-715: Indicate errors on the player
...
logging for flash testing
2015-04-13 14:29:39 -04:00
24b6751eeb
Remove unused code from player
2015-04-13 09:18:36 -04:00
drigato
Albert Santoni
Duncan Sommerville