3e60713590
SAAS-962: "Now" option should not be available for linked shows
...
Also added fix for SAAS-957
2015-07-20 15:20:50 -04:00
ba90b1f1eb
Merge branch 'saas-dev' into saas-showbuilder
...
Conflicts:
airtime_mvc/public/css/styles.css
2015-07-20 12:23:11 -04:00
0324c59100
Don't reload datatable when selecting same media type
2015-07-18 17:28:17 -04:00
a6854ea507
SAAS-957: Error on "update show"
2015-07-17 16:28:33 -04:00
1816be156f
SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types
2015-07-16 16:26:52 -04:00
d7d9a994d5
SAAS-948 - ShowBuilder redesign initial commit
2015-07-15 18:53:19 -04:00
b37b574cea
Real fix for calendar context menu width problem
2015-07-15 10:30:59 -04:00
dddc6e6591
Fix for context menu on calendar being too small sometimes
2015-07-15 07:19:48 -04:00
8309289356
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 11:52:10 -04:00
e5c574229f
SAAS-940: Provide usability hints to user
...
fix hint message transitions
2015-07-14 11:51:50 -04:00
2693c9f02c
Small bugfix for CC-6064
2015-07-14 11:25:11 -04:00
30b8ada622
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 10:56:18 -04:00
45b09a0d24
Merge branch 'saas-dev' into saas-dev-usability-hints
...
Conflicts:
airtime_mvc/public/js/airtime/schedule/add-show.js
2015-07-14 10:56:12 -04:00
e24307180c
Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 10:40:10 -04:00
794a4a21d8
SAAS-940: Provide usability hints to user
...
Update hints after library table has changed
2015-07-14 10:39:58 -04:00
5a2ef8d3db
Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints
2015-07-14 10:35:47 -04:00
66caf2574a
CC-6064: Allow shows to be started "now"
2015-07-14 10:35:21 -04:00
71e8909365
SAAS-940: Provide usability hints to user
...
Fixed bug where hints were not showing up sometimes
2015-07-14 10:08:56 -04:00
25ef70767b
SAAS-940: Provide usability hints to user
...
Customized hints depending on what page the user is on and what action
they just completed.
2015-07-13 17:02:31 -04:00
755ec79e7d
SAAS-876 - frontend tweaks
2015-07-13 15:17:47 -04:00
c05d4bac2f
Merge branch 'saas-dev' into saas-stream-settings
2015-07-13 13:27:34 -04:00
6d883d2fa4
Fix Add Show button bug and update styling
2015-07-13 13:23:24 -04:00
c99165a8dd
SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options
2015-07-10 13:17:20 -04:00
ac2e1a2d4b
SAAS-876 - More work on stream settings page
2015-07-08 16:04:09 -04:00
6b9d9e8063
Merge branch 'saas-dev' into saas-stream-settings
2015-07-08 12:47:24 -04:00
31ce52b857
CC-6062 - Fix stretching last column after adding show in calendar view
2015-07-06 11:52:04 -04:00
457230ba07
SAAS-876 - Initial commit
2015-07-03 13:32:41 -04:00
e3101e90b2
Resize player windows to correct dimensions on open
2015-07-02 16:07:49 -04:00
a8f214803b
Fix javascript error on some browsers
2015-06-29 17:07:17 -04:00
19fb67c8d6
Fix broken delete button
2015-06-29 11:28:27 -04:00
5cc8774e56
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
ca9c805ce4
SAAS-906 - Change wording on Add to Show button
2015-06-26 15:25:58 -04:00
c79e4fb9ea
CC-4922
2015-06-26 15:12:52 -04:00
c44bae8140
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-06-26 10:37:30 -04:00
79f51f77cb
Merge branch '2.5.x-installer' into saas-dev
2015-06-25 18:21:40 -04:00
c59f401eb1
Fix shift selection in library and builder views
2015-06-25 18:21:22 -04:00
6497bc28c5
Show collapsible sections (other than 'dangerous settings') by default on preferences page
2015-06-25 17:43:15 -04:00
6fb9c6a30c
SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences
2015-06-25 14:13:09 -04:00
67155b136a
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
2015-06-24 18:38:04 -04:00
8fcaf7fc74
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
a3f1cf1d56
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:47:34 -04:00
e36c8a16d4
CC-6060 - Fix breaking tooltips when viewing context menu in library
2015-06-22 10:46:29 -04:00
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
8c9981a155
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/public/index.php
2015-06-16 10:37:06 -04:00
3902c8c746
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
2015-06-15 15:12:37 -04:00
459f9494c3
Merge saas-dev into soundcloud
2015-06-10 16:08:52 -04:00
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -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
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -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
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
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
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
8aea86b451
SAAS-744 - Updated double click and Add button functionality on Now Playing and Add/Remove content screens
2015-04-30 16:23:52 -04:00
f382b1338f
Layout fixes for library and Now Playing screens
2015-04-29 13:41:52 -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
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -04:00
8449194ca1
Merge branch 'saas' into saas-speedy
2015-04-15 16:44:43 -04:00
f3c8f40183
Tweaks to fix up my optimizatinos
...
* Fixed a rendering glitch with empty shows in the Now Playing screen
* Changed drag and drop placeholder to show the track name. Reverted it
from the default DataTables placeholder, which unfortunately gets the
column widths wrong.
2015-04-14 17:39:52 -04:00
a48ae75907
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-14 11:36:22 -04:00
a606fef5af
Gracefully handle bad ColReorder deserialization
2015-04-14 11:36:13 -04:00
b1ea1f27a3
Fixed empty show Showbuilder bug and started making checkboxes work like cursors used to
2015-04-14 11:30:18 -04:00
1194a0f959
Some big performance optimizations to Now Playing JavaScript.
...
* Big decrease in page load time
* Big decrease in load time during schedule operations (drag and drop)
2015-04-10 22:53:39 -04:00
b11e98ea24
Reduced the Now Playing screen AJAX on load from 9 to 2.
2015-04-10 19:52:06 -04:00
f238faa937
SAAS-712: UI Improvements
2015-04-09 14:22:50 -04:00
1734cc35c8
Refactored session_write_close() optimization and dashboard preloading
...
hack
2015-04-09 13:03:06 -04:00
3e255bfd37
Merge branch 'saas' into saas-speedy
2015-04-09 12:20:23 -04:00
4429117f6a
SAAS-712: UI Improvements
2015-04-09 09:43:15 -04:00
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
778df97d3c
SAAS-662: Make player auto-connect if there is a problem with the stream
...
Kind of working in HTML5 mode
2015-03-31 16:51:14 -04:00
dab9cc775c
Hide the show form after updating a show because it was broken at that point anyways
2015-03-31 15:39:06 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -04:00
e32744668f
SAAS-661: Add mobile stream identifier on Stream Settings page
2015-03-23 16:06:35 -04:00
e2ca218ac2
Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player
2015-03-23 15:54:04 -04:00
2ae4d6c1c3
Embed Player
...
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
5c4533d785
SAAS-644: Embed Player -> Update embed src code and preview when an option changes
2015-03-23 10:11:33 -04:00
0764ca60e6
Delete muses skin files
2015-03-20 09:09:09 -04:00
16ddf09d6d
SAAS-655: Extract muses player events into our own js object
2015-03-19 16:59:05 -04:00
875ed0e41e
Got muses working without a skin
...
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
2015-03-19 13:42:19 -04:00
bafd9eeb6f
Cleaning up player code
2015-03-18 15:03:34 -04:00
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04:00
34de6da2c7
Major performance improvements to the Dashboard and Calendar views
...
* Close the PHP session for writing as early as possible in most AJAX
calls for those views
* Reduce the number of roundtrips to the server in both the Dashboard
and Calendar views by putting the data in our HTML response (this
makes a massive difference)
* Eliminated a couple of unneccessary AJAX calls
* Use lazy loading in full calendar
* Fixed a bug in the week view that only occurs near the end of the
week (date->gmdate bug!)
2015-03-13 18:22:27 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
d61b75f105
Added a working 4th stream
2015-03-03 16:08:53 -05:00
6082738439
Merge branch 'saas' into saas-media-refactor
2015-03-02 16:02:34 -05:00
17d51eb0f9
Added csrf verification to show image upload and deletion
2015-03-02 16:00:11 -05:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
3a1141d4c8
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
562c2f0100
Remove widget JS snippet animation because it's bugged
2015-02-24 15:18:39 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
3c064b13a9
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
2015-02-18 16:03:14 -05:00
68cd5b027a
CC-5998: Prevent users from spamming the delete button in the library
2015-02-18 15:56:28 -05:00
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
6e43505379
Merge branch '2.5.x' into 2.5.x-installer
2015-01-22 17:36:12 -05:00
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
7e2cc65f32
Merge branch '2.5.x' into saas
2015-01-21 15:15:58 -05:00
6492128ce9
Hide Now Playing toolbar for Guest users
2015-01-21 15:15:22 -05:00
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
2b882cc313
Reorder final setup steps
2015-01-12 12:45:52 -05:00
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
4dfd49d12c
Initial work on monitless installation
2014-12-16 12:24:41 -05:00
5f315abb79
Updated final install step
2014-12-15 09:52:10 -05:00
ad56d6cafb
Show the plan and station URL in Live Chat
2014-12-11 17:40:34 -05:00
f5b4928538
More work on web installer
2014-12-09 17:48:16 -05:00
9fed113f74
More work on setup/installation process
2014-12-03 18:04:47 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
4dab2abf4e
Replaced reoccurring strings with string formatting to aid dynamic translations
2014-11-06 18:40:19 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
3046003a1b
Removed unnecessary cookie declaration for default locale
2014-11-05 17:27:41 -05:00
3b588dcce8
Removed unnecessary call to set locale data on the Login page
2014-11-05 17:27:08 -05:00
273afaa126
Added Japanese language text files to js i18n datatables
2014-11-05 16:47:09 -05:00
00e85de3c8
Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change
2014-11-05 10:06:59 -05:00
8616cee9a3
Merge pull request #73 from RobertElder/2.5.x-relder-jplayer-upgrade
...
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st Sep...
2014-10-31 15:49:45 -04:00
359727fc66
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-10-29 18:01:31 -04:00
ceb51100ec
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-29 17:58:56 -04:00
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
d467714f84
Fixed bug where timezone wasn't adjusting correctly when adding or editing a show
2014-10-27 15:42:30 -04:00
e1b2c51130
Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st September 2014) to resolve playback issues.
2014-10-21 20:15:05 +00:00
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
c4692cc0d7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/PluploadController.php
airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
26d875ed66
Added confirmation prompt when deleting current logo
2014-09-19 12:54:03 -04:00
1d658867f7
Updated front-end validation to work in FireFox
2014-09-18 17:11:56 -04:00
ee92f41a8d
Updated look and feel and added front-end validation for image elements in add-show
2014-09-18 16:28:52 -04:00
096556fa74
Added show_logo_name field to data object to avoid deleting current logo when none is being uploaded
2014-09-18 10:32:56 -04:00
b89a764442
Updated to include show image functionality
2014-09-17 19:41:17 -04:00
f73432931c
Updated js functionality for adding shows to POST show image to ShowController on success
2014-09-16 18:22:30 -04:00
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
563fcf0342
Japanese Plupload i18n file
2014-09-16 16:54:20 -04:00
afa9a27bb9
Japanese Plupload i18n file
2014-09-16 16:51:53 -04:00
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
9fe0830dfd
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 11:59:41 -04:00
20a5649dbe
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
10cb5484fe
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-25 18:33:15 -04:00
drigato
Duncan Sommerville
Duncan Sommerville
Albert Santoni
Albert Santoni
Robert Elder