Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,627 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

5627 Commits

Author SHA1 Message Date
martin e5579228bd Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-22 20:19:49 -04:00
martin ca65c32e1c CC-2716: Moving Directory->Media Monitor exception 
-fixed
 2011-08-22 20:19:14 -04:00
James 9547410bb0 CC-2693: Apache reconfigure and restart 
- done
 2011-08-22 15:16:31 -04:00
James 7668b3cf97 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-22 13:40:56 -04:00
James 0e72906d17 CC-2696: Upgrade: modify apache2 file and restart 
- done
 2011-08-22 13:19:21 -04:00
martin 8e884baefc CC-2710: CreateSymlinksToUtils() used twice in airtime-upgrade.php 
-fixed
 2011-08-22 13:17:13 -04:00
James b3733fc4d1 Merge branch '1.9.2' into 1.9.1 2011-08-22 13:12:12 -04:00
James 376ae1370c CC-2693: Copy PHP files to /usr/shar/airtime instead of /var/www/airtime 
- done for new install
- upgrade need some more work
 2011-08-22 12:03:09 -04:00
James 4b16d4928d Merge commit 'airtime-1.9.1' 2011-08-22 11:59:24 -04:00
martin c61759a1da CC-1942: Add ability to set timezone in preferences 
-fixed spelling mistake
 2011-08-22 11:37:48 -04:00
martin 6c368174b4 CC-2702: Upgrade script for UTC times 
-initial commit
 2011-08-22 11:27:21 -04:00
martin 009c75b217 CC-2683: All times in the database are not stored in UTC. 
-playlist mtime now uses UTC
 2011-08-22 10:14:06 -04:00
martin fdf1b4c100 CC-2692: Integrate ZFDebug into Airtime 
-done
 2011-08-22 10:12:53 -04:00
martin f9d062959b -update changelog for 1.9.1 release 2011-08-19 17:33:40 -04:00
martin 46133166f3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 17:08:10 -04:00
martin 4ca480ba5e Merge branch '1.9.1' into devel 2011-08-19 17:07:59 -04:00
martin d2b0040256 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 17:05:55 -04:00
martin a47044c50c CC-2697: airtime-user script is not working 
-added script to system path
 2011-08-19 17:05:41 -04:00
James dc6ed33b47 Merge branch '1.9.1' into devel 2011-08-19 16:43:16 -04:00
James d6692b7cf9 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 16:43:01 -04:00
James 30fcb0b95d CC-2704: Support settings UI tweaks 
- adding server name again under Preference
 2011-08-19 16:42:46 -04:00
martin e53c6d8061 CC-2697: airtime-user script is not working 
-added support for new user types
 2011-08-19 16:40:53 -04:00
James 56a21a524e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 16:35:54 -04:00
James a73612afd2 CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface 
- Modified "Descriptioin" to "Name/Description"
- mount point is not append with extension anymore
- fix on auto generated stream url
- name is used in shoutcast
 2011-08-19 16:35:23 -04:00
martin ea2981574c Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-19 15:46:45 -04:00
martin 1272c172b7 CC-2703: orange progress bar is playing when there is not content 
-previous and future shows are now ignored as well
 2011-08-19 15:46:35 -04:00
martin 5a84ad4e9d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-19 15:45:20 -04:00
martin 7859783ccb CC-2703: orange progress bar is playing when there is not content 
-fix it so that previous and future shows are ignored as well.
 2011-08-19 15:45:07 -04:00
martin 13f7a73850 -convert playlist.js to all spaces (instead of tabs) 2011-08-19 15:30:00 -04:00
James f2f599f723 CC-2704: String change 
-fixed
 2011-08-19 15:00:45 -04:00
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