Commit Graph

4443 Commits

Author SHA1 Message Date
Paul Baranowski 92f839b368 Removed install/uninstall scripts for twitter plugin 2011-06-21 11:49:47 -04:00
martin 8e62583bb2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-21 11:40:21 -04:00
martin 2efe2e67a8 CC-2410: Clean up install process
-fixed missing DB::connect
2011-06-21 11:40:07 -04:00
james 3dcb10c931 - adding link to who's using page( it was remove somehow ). 2011-06-21 11:20:02 -04:00
james ea78991d57 - removing one line from PreferenceController.php(the function
doesn't exist anymore)
2011-06-21 10:26:34 -04:00
james 60eff4c041 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-21 10:20:17 -04:00
james bcfc5507c6 CC-1724: Phone home statistics
- Email is not required field in Preference
- removed duplicate line from PreferenceController.php
2011-06-21 10:19:39 -04:00
Naomi Aro f755e41a9a propel classes 2011-06-21 15:49:31 +02:00
Naomi Aro 5f562b94ca replacing propel files 2011-06-21 15:40:40 +02:00
Naomi Aro e803b76fcf CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
removing watch/adding new watch when changing stor directory.
2011-06-21 15:11:42 +02:00
Naomi Aro 6adce1ba45 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding ability to move stor directory.
2011-06-21 14:58:38 +02:00
Naomi Aro f1893cebe6 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
making separate js file for music dirs page.
2011-06-21 11:57:56 +02:00
Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
2011-06-21 11:20:35 +02:00
Naomi Aro b6888489e0 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding music dirs concept to Airtime. New cc_music_dirs table/class.
2011-06-21 10:24:02 +02:00
James Moon dd4ea127fc CC-1724:Phone home statistic
- Fixed the bug where it didn't populate country dropdown box
This was due to default sql not popuplate country table correctly
- Changed 180*180 min log text to 200*200
- Changed text are size in support settings
- Client now sends base64encoded image to server.
2011-06-20 20:31:20 -07:00
james 2fb721167c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-20 18:11:25 -04:00
james 965b96047a Merge 2011-06-20 18:10:39 -04:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
2011-06-20 18:09:37 -04:00
martin d9c5e2b6d6 -add newline chars to Airtime-upgrade-disabled message 2011-06-20 18:03:07 -04:00
martin f03c0e5f10 -Disable upgrades for the 1.9.0 beta. 2011-06-20 18:00:26 -04:00
james e762633405 CC-1724:Phone home statistics
- Final commit for client side.
2011-06-20 17:58:38 -04:00
martin 5569a24aef CC-2410: Clean up install process
-Fix includes in airtime-upgrade.php
2011-06-20 17:43:06 -04:00
martin 9e4b4a0e93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-20 17:38:27 -04:00
martin aa56344a29 CC-2410: Clean up install process
-hiding a few more warnings.
2011-06-20 17:38:18 -04:00
Paul Baranowski 1bb2e79a78 CC-2397: Support output to Shoutcast
Simply added some config file variables and added the output type in
the liquidsoap script.
2011-06-20 17:34:16 -04:00
martin de436486fb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-20 17:24:24 -04:00
martin fe14113b58 CC-2410: Clean up install process
-reduced number of messages
-got rid of some warnings.
-moved airtime-install.php, airtime-upgrade.php, airtime-uninstall.php
2011-06-20 17:24:12 -04:00
Paul Baranowski 4c09054dca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-20 16:55:33 -04:00
Paul Baranowski f72d893ace Added credits for 1.9.0. 2011-06-20 16:53:50 -04:00
Paul Baranowski 5e733a4276 CC-2406: Reinstall + recreating the database tables doesnt work
This was caused because updating the build.properties file did not happen
unless you chose to overwrite your existing configuration files.

Changed it so that it always updates the build.properties file.
2011-06-20 16:53:23 -04:00
martin 9744507078 -Remove unused logging statements 2011-06-20 16:31:53 -04:00
martin 141002eb49 CC-2404: Downloading a file via the web UI shouldn't guide user away from page.
-fixed
2011-06-20 14:10:33 -04:00
martin 4d790ac42a CC-2015: On reboot, resume at the current time in the show
-added new liquidsoap binaries with cue-in/cue-out support
-revision hash c3c118e
2011-06-17 16:27:04 -04:00
martin fd1c202de9 CC-2381: Songs library search speed performance
-removed javascript alert popup
2011-06-17 15:18:09 -04:00
martin 2e4519f156 Merge branch 'cc-2015-on-reboot-resume-show' into devel
Conflicts:
	python_apps/media-monitor/airtime-media-monitor-init-d
2011-06-17 15:10:33 -04:00
martin 6bea1ab654 CC-2400: make sure we are using quotes when using rm -rf
-done
2011-06-17 15:00:39 -04:00
martin adae3e21d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-17 14:42:08 -04:00
martin b802ba9a42 cc-2381: slow library searching speed
-implemented 350ms keystroke delay before searching
2011-06-17 14:41:57 -04:00
Naomi Aro ea21da6b61 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
recursively copying the audio_samples directory.
2011-06-17 17:54:36 +02:00
martin 948a0e584d -added quotes to all paths in rm -rf statements 2011-06-17 11:16:27 -04:00
martin 2f5a1c4df6 cc-2055: switch to init.d
-monit is now temporarily disabled when intentionally stopped a service
2011-06-16 20:01:37 -04:00
martin ec6db96025 cc-2015: on reboot resume show
-use native capabilities of liquidsoap cue-in cue-out
 for song cue-in/cue-out
2011-06-16 18:59:15 -04:00
martin ec32047efa Merge branch 'cc-2015-on-reboot-resume-show' of dev.sourcefabric.org:airtime into cc-2015-on-reboot-resume-show 2011-06-16 17:31:21 -04:00
martin 662d0ebf85 -create-pypo-user scripts missing an "import sys"
-airtime-uninstall will now quit upon the first error
2011-06-16 17:30:16 -04:00
martin 4facadf521 -remove some symbolic links from /usr/bin. These are now
handled through init.d script
2011-06-16 17:29:05 -04:00
james 1fbaa7d5fb CC-1724:Phone home statistics
- Popup form validation is added( javascript )
2011-06-16 14:26:24 -04:00
martin e90e6d7c12 cc-2015: on reboot resume show
-liquidsoap is having some problems with cue points right now
 need to check if this is my fault.
2011-06-16 13:26:37 -04:00
martin e5ed11ee51 cc-2015: on reboot resume show
-removed cue file from pypo responibility
2011-06-16 13:26:37 -04:00
martin 0d13b9013b cc-2015: on reboot resume show
-calculating the amount of seconds since track began complete
2011-06-16 13:26:36 -04:00
martin 12ae5a289f cc-2015: on reboot resume show 2011-06-16 13:26:36 -04:00