1622 Commits

Author	SHA1	Message	Date
drigato	ce7765a8cb	Merge branch 'saas' into saas-dev	2015-07-21 11:03:31 -04:00
drigato	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
drigato	a6854ea507	SAAS-957: Error on "update show"	2015-07-17 16:28:33 -04:00
Duncan Sommerville	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
drigato	b37b574cea	Real fix for calendar context menu width problem	2015-07-15 10:30:59 -04:00
drigato	dddc6e6591	Fix for context menu on calendar being too small sometimes	2015-07-15 07:19:48 -04:00
drigato	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
drigato	e5c574229f	SAAS-940: Provide usability hints to user ... fix hint message transitions	2015-07-14 11:51:50 -04:00
Albert Santoni	2693c9f02c	Small bugfix for CC-6064	2015-07-14 11:25:11 -04:00
Albert Santoni	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
Albert Santoni	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
drigato	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
drigato	794a4a21d8	SAAS-940: Provide usability hints to user ... Update hints after library table has changed	2015-07-14 10:39:58 -04:00
Albert Santoni	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
Albert Santoni	66caf2574a	CC-6064: Allow shows to be started "now"	2015-07-14 10:35:21 -04:00
drigato	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
drigato	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
Duncan Sommerville	6d883d2fa4	Fix Add Show button bug and update styling	2015-07-13 13:23:24 -04:00
Duncan Sommerville	31ce52b857	CC-6062 - Fix stretching last column after adding show in calendar view	2015-07-06 11:52:04 -04:00
Duncan Sommerville	e3101e90b2	Resize player windows to correct dimensions on open	2015-07-02 16:07:49 -04:00
Duncan Sommerville	a8f214803b	Fix javascript error on some browsers	2015-06-29 17:07:17 -04:00
Duncan Sommerville	19fb67c8d6	Fix broken delete button	2015-06-29 11:28:27 -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	ca9c805ce4	SAAS-906 - Change wording on Add to Show button	2015-06-26 15:25:58 -04:00
Duncan Sommerville	c79e4fb9ea	CC-4922	2015-06-26 15:12:52 -04:00
Duncan Sommerville	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
Duncan Sommerville	79f51f77cb	Merge branch '2.5.x-installer' into saas-dev	2015-06-25 18:21:40 -04:00
Duncan Sommerville	c59f401eb1	Fix shift selection in library and builder views	2015-06-25 18:21:22 -04:00
Duncan Sommerville	6497bc28c5	Show collapsible sections (other than 'dangerous settings') by default on preferences page	2015-06-25 17:43:15 -04:00
Duncan Sommerville	6fb9c6a30c	SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences	2015-06-25 14:13:09 -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	a3f1cf1d56	CC-6060 - Fix breaking tooltips when viewing context menu in library	2015-06-22 10:47:34 -04:00
Duncan Sommerville	e36c8a16d4	CC-6060 - Fix breaking tooltips when viewing context menu in library	2015-06-22 10:46:29 -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
Albert Santoni	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
Duncan Sommerville	3902c8c746	Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs	2015-06-15 15:12:37 -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
Duncan Sommerville	b0b6e037ac	CC-6046, CC-6045, CC-6047 - New SoundCloud implementation	2015-06-03 16:57:17 -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
Albert Santoni	e86e1cb4ac	Merge branch 'saas-dev' into saas-speedy	2015-05-21 15:10:01 -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	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
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
Duncan Sommerville	15bebc6267	Dangerous options subform on Preferences page and Delete all tracks button	2015-05-13 15:56:08 -04:00
Duncan Sommerville	8b380086c3	Merge branch 'saas-dev' into saas-speedy	2015-05-04 13:09:51 -04:00
Duncan Sommerville	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
Albert Santoni	f382b1338f	Layout fixes for library and Now Playing screens	2015-04-29 13:41:52 -04:00
Duncan Sommerville	574fdf4b27	Merged 2.5.x into saas	2015-04-27 14:01:28 -04:00