Commit Graph

5195 Commits

Author SHA1 Message Date
James 9b6ead98ae Merge branch '1.9.1' into devel 2011-08-19 14:58:56 -04:00
James 8e108e8596 CC-2704: Change text
- fixed
2011-08-19 14:58:31 -04:00
James 314749bf98 Merge branch '1.9.1' into devel 2011-08-19 13:11:11 -04:00
James bb97a0eede CC-2704: Support Setting UI tweak
- move station name under publicise
- make it required field
2011-08-19 13:09:10 -04:00
martin 75ac719b33 Merge branch '1.9.1' into devel 2011-08-19 12:30:14 -04:00
martin fa50c93914 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 12:29:41 -04:00
martin c0189e3c5d CC-2703: orange progress bar is playing when there is not content
-fixed
2011-08-19 12:29:26 -04:00
James e14e4f3713 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 12:23:34 -04:00
James ac448c8dbb CC-2704: Change "Stream Setting" -> "Stream Settings"
- done
2011-08-19 12:23:15 -04:00
James 8e0496d8c1 CC-2704: Support Setting UI tweak
Merge branch '1.9.1' into devel

Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
2011-08-19 12:22:08 -04:00
James db225dd610 CC-2704: Support settings UI tweaks
- Move station name to "Support Settins" page
2011-08-19 12:19:35 -04:00
martin a1c2b0f7d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 12:07:42 -04:00
martin b87e95126c CC-2379: "Add Show" uses browser time instead of server time
-added note about custom changes to fullcalendar.js
2011-08-19 12:07:34 -04:00
James 138ad06a0e Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 11:57:56 -04:00
martin 75040e867d CC-2697: airtime-user script is not working
-fixed
2011-08-19 11:53:03 -04:00
martin c30fd61ed9 CC-2697: airtime-user script is not working
-fixed
2011-08-19 11:38:29 -04:00
James 43298d60be Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 19:08:10 -04:00
James f855da0f45 Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/configs/navigation.php
	install_minimal/DoctrineMigrations/Version20110711161043.php
	python_apps/api_clients/api_client.py
2011-08-18 19:05:13 -04:00
James d83f9f1b96 CC-2701: Separate Support Settings from Preference page
- done.
2011-08-18 18:58:59 -04:00
martin f622aeb025 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 18:13:55 -04:00
martin 846e08699e CC-2628: update a repeated show start time cause the show to get corrupted
-disabled dragging + dropping repeated show instances
2011-08-18 18:13:43 -04:00
James 91df62a3dd CC-2684: fix for 1.9.1
- done
2011-08-18 17:48:21 -04:00
James 7ef7df86fb CC-2684: airtime_install script tries to copy without checking
- fixed
2011-08-18 17:47:18 -04:00
James 8ce4c6ae6a CC-2664: fixing bug on the code
- fixed
2011-08-18 17:36:20 -04:00
James 66d731437a CC-2664: fix for version 1.9.1
- done
2011-08-18 17:35:31 -04:00
James c544e0fb1b CC-2664: Airtime install should check if the DEB package is installed
and abort if so

- done
2011-08-18 17:34:26 -04:00
James 8c2e622552 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 15:59:39 -04:00
James e6003a0252 CC-2698: Fix for version 2.0
- fixed
2011-08-18 15:59:22 -04:00
martin fc66b1d1ba Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 15:44:57 -04:00
martin 99d2872566 -install now uses default PHP timezone 2011-08-18 15:44:49 -04:00
martin dd9ef5b9c8 CC-2379: "Add Show" uses browser time instead of server time
-Fixed
2011-08-18 15:44:16 -04:00
James 4240d45f5d CC-2698: Wrong sql statment
- fixed
2011-08-18 15:39:46 -04:00
James 873f7e1dae CC-2698: upgrading fail from 1.8.2->1.9.0
- fixed version string
- deleting entries from cc_schedule before adding "ON CASCADE" constraint
2011-08-18 15:32:33 -04:00
James 38256de606 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 13:54:17 -04:00
James 4275cc6667 CC-26027: Remove file
- removing old file
2011-08-18 13:53:50 -04:00
James cf55e92aa3 CC-2607: Ability to adjust stream bitrate, type, etc from UI
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
2011-08-18 13:53:12 -04:00
martin 58c1eff283 CC-2689: Build latest liquidsoap version
-Done
2011-08-17 18:34:45 -04:00
martin 266ee56d6d CC-2683: All times in the database are not stored in UTC.
-missed a spot where we need to use calculate in UTC
2011-08-17 16:35:03 -04:00
martin 4eaf56b93f -station name in preferences no longer required 2011-08-17 15:55:11 -04:00
martin 57834097e8 -remove unneeded -dev packages from install
-remove timezone check from pypo-fetch
2011-08-17 15:50:28 -04:00
martin 0cb9947980 cc-2683: not using utc time
-clean up recorder file
2011-08-16 16:49:35 -04:00
martin e392c8437a cc-2683: not using utc time
-clean up recorder file
2011-08-16 16:36:31 -04:00
martin 0a11160298 cc-2683: not using utc time
-fix install script inputting timezone preference even if
 it already existed
2011-08-16 15:34:19 -04:00
martin 8aa26b2eb0 cc-2683: not using utc time
-top panel now start at correct time
2011-08-16 15:07:55 -04:00
martin 41fd5f2543 cc-2683: not using utc time
-context menu showing options display correctly
-edit show fills in correctly
-Now Playing view shows up correctly
2011-08-16 15:07:55 -04:00
martin 03f8163764 cc-2682: not using pypo time
-Remove messages being sent to pypo to change its timezone
-fix time conversion bug in pypo-push
2011-08-16 15:07:55 -04:00
martin 61e1c56244 cc-2683-not-using-utc-time
-pypo now works in UTC time
2011-08-16 15:07:54 -04:00
martin 6ee3d2f5e0 cc-2683: not using utc time
-date/time values are converted to UTC before storing in database
 on show create
-cleanup
2011-08-16 15:06:02 -04:00
James 4f2b2dba6d CC-2607: Abilitiy to adjust stream bitrate, type, etc from the UI
interface

- dummy page "Stream Setting" page for the test
- StreamSetting model is added
- set owner and group as 'pypo' for liquidsoap.cfg
- pypofech handle 'update_stream_setting' command
2011-08-15 16:10:46 -04:00
James e18c0903cb -version string changes 2011-08-15 11:11:55 -04:00