Commit Graph

466 Commits

Author SHA1 Message Date
Martin Konecny 42738c98a3 Merge branch '2.1.x' into devel 2012-08-03 11:14:05 -04:00
Martin Konecny f98bd5b8f2 CC-4147: Make Airtime work nicer with Debian package generation scripts.
-add "--disable-deb-check" option
2012-08-03 11:13:17 -04:00
Martin Konecny eb4b3cfcfa Merge branch '2.1.x' into devel
Conflicts:
	install_full/ubuntu/airtime-full-install
2012-08-03 09:45:55 -04:00
Martin Konecny 3f10f94d8f CC-4147: Make Airtime work nicer with Debian package generation scripts.
-liquidsoap is installed from sofab repo
-make sure new deb-multimedia name takes effect
2012-08-03 09:42:41 -04:00
Martin Konecny cf2f96ecf1 remove commented code 2012-07-26 14:49:31 -04:00
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2
Conflicts:
	python_apps/api_clients/api_client.py
2012-07-16 17:41:36 -04:00
Martin Konecny 832eafdea1 CC-4104: airtime-uninstall should not purge airtime database be default
-small fix
2012-07-16 15:43:17 -04:00
Martin Konecny 35d3d63e08 CC-4104: airtime-uninstall should not purge airtime database be default
-on reinstall use the database
2012-07-16 15:34:09 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
2012-07-16 14:31:03 -04:00
Martin Konecny 6a4fd4973e CC-4104: airtime-uninstall should not purge airtime database be default
-done
2012-07-16 14:18:40 -04:00
Martin Konecny 583695f98c CC-430: Audio normalization (Replaygain Support)
-values are now written through to database
2012-07-15 22:22:42 -04:00
Martin Konecny 35655f9462 -no longer require "cell_phone" column for 2.1.3 upgrade 2012-07-10 19:05:27 -04:00
Martin Konecny aecee0574d Random commits gathered and put into one
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
2012-07-09 18:58:22 -04:00
James b7ca858506 CC-3921: Add mobile phone number field to user record
- added a line to upgrade.sql which takes care of db upgrade
2012-07-09 16:50:51 -04:00
Martin Konecny 9612adf72e CC-430: Audio normalization (Replaygain Support)
-add required package dependencies on full install
2012-07-05 23:35:51 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
denise bc93119adc Merge branch '2.1.x' into devel 2012-07-04 09:46:30 -04:00
Martin Konecny 0286aa364e 2.1.3 preparation 2012-07-03 16:43:10 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
James ffe3bdab0c Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-28 12:25:38 -04:00
James 63020cf288 CC-3955: System -> Preferences: Timezone setting is the first one in the list,
not the current (local) timezone

- adding some code to validate the timezone that is parsed
2012-06-28 12:25:15 -04:00
james 04c36b9ea0 CC-3994: Install script hard-codes storage path, instead of using value
in airtime-install.ini

= fix
2012-06-27 22:32:10 -04:00
Martin Konecny b6483cd952 CC-4023: Make clearer install error when Airtime fails due to incorrect postgresql encoding
-done
2012-06-26 22:39:17 -04:00
James 8a2d548d5c CC-4001: Warnings in apache error log
- upgrade script for 2.1.3
2012-06-25 17:25:57 -04:00
James b081a9eb5f CC-3955: System -> Preferences: Timezone setting is the first one in the list,
not the current (local) timezone.

- fixed
2012-06-20 18:24:28 -04:00
James 832e210609 CC-3994: Install script hard-codes storage path, instead of using value
in airtime-install.ini

- done
2012-06-20 15:20:26 -04:00
denise f029124447 Merge branch '2.1.x' into devel 2012-06-19 17:57:27 -04:00
Martin Konecny 27a6326c58 Merge branch '2.1.2' into 2.1.x
Conflicts:
	python_apps/pypo/pypofetch.py
2012-06-18 14:57:22 -04:00
Martin Konecny c8559cc88c 2.1.2 preparation 2012-06-17 23:44:36 -04:00
Martin Konecny 142289146e better naming of function in upgrade script 2012-06-17 22:53:19 -04:00
denise 6b990f8712 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel 2012-06-14 13:45:14 -04:00
denise dbd6b7444b CC-3921: Add mobile phone number field to user record
-committing Doctrine migartion file for new cell_phone column
2012-06-13 14:48:24 -04:00
Martin Konecny 1b5ad43197 upgrade script for 2.1.1 2012-06-13 12:37:56 -04:00
Martin Konecny f188eeada2 preparation for 2.1.1 release 2012-06-13 11:35:14 -04:00
Martin Konecny 747ae539f3 convert some propel code into native sql 2012-05-30 16:37:12 -04:00
Martin Konecny 073837efc6 -make sure that new default database values are populated 2012-05-30 16:31:22 -04:00
Martin Konecny 4e6a821314 CC-3899: After upgrade from 2.0.3 to 2.1.0, the uploaded time of media files looks like "17:25:36.587707"
-fixed
2012-05-29 11:22:58 -04:00
Martin Konecny d8ae8002d2 -make sure to autogenerate liquidsoap.cfg before liquidsoap starts 2012-05-28 18:48:40 -04:00
Martin Konecny b9c6eab39c make sure we explicitly need to tell Airtime services to start 2012-05-28 17:42:48 -04:00
Martin Konecny 2ee6b144f3 CC-3814 Calendar: Switch view between "day" and "week" will cause some Notice in apache's error.log
-fixed
2012-05-25 12:14:20 -04:00
James 6da923ace1 CC-3859: Playout History: Filter out songs that are not played out
- db change and upgrade.
2012-05-22 16:11:25 -04:00
Martin Konecny 817212ada8 CC-3683: Upgraded database not equivalent to fresh install database part 1
-Add Naomi's Doctrine changes to here
2012-05-20 22:31:45 -04:00
Martin Konecny 11e8867731 CC-3813: Update to 2.1.0, cannot display the metadata of Playlist in Media Library
-fixed
2012-05-18 17:59:51 -04:00
Martin Konecny c91f1cc0c9 incorrect sql statements 2012-05-17 13:12:13 -04:00
Martin Konecny 0991b00c55 CC-3839: Remove "-s" option from airtime-install
-done
2012-05-17 10:24:32 -04:00
Martin Konecny 6098fa20e2 CC-3841: Remove "airtime-show-recorder" initd script on upgrade
-fixed
2012-05-16 16:55:40 -04:00
Martin Konecny a4716ac36f CC-3839: Remove "-s" option from airtime-install
-done
2012-05-16 16:39:13 -04:00
Martin Konecny 30b0aa5d48 -remove double quotes from sql statements 2012-05-16 15:39:05 -04:00
Martin Konecny 07afbc77ce -more description in 2.1.0 upgrade script 2012-05-16 15:38:44 -04:00
Martin Konecny 9cff3cf3fe CC-3835: Backup database before performing database upgrade to 2.1
-done
2012-05-16 13:30:00 -04:00