Commit Graph

5292 Commits

Author SHA1 Message Date
James 30d0cedc34 CC-2718: Changes to the support page
- fixed a case when it didn't store 'privacy' flag when 'publicise'
is checked on support setting page
2011-08-24 16:49:47 -04:00
James 9eb21cb327 Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/Preference.php
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
2011-08-24 10:30:59 -04:00
martin db2d2fabcc -updated changelog for 1.9.2 2011-08-23 17:48:14 -04:00
James 405edcc5fa CC-2718: Changes to the support page
- "Help Airtime" button is enanbled solely depending on feedback checkbox
when user already agreed to Terms and condition
2011-08-23 16:46:29 -04:00
James 4c4b57fd31 CC-2718: Changes to the support page
- overriding isValid in RegisterAirtimeForm
2011-08-23 16:09:11 -04:00
James 796a762908 CC-2718: Changes to the support page
- only need to validate publicise fields when publicise is on
2011-08-23 15:42:36 -04:00
James 7bb7906ae4 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-23 15:14:17 -04:00
James 3e3391dfba CC-2718: Changes to the support page
- stroing and retreving new value "privact" to DB
- Displaying "Terms and Condition" link when user agrees it
2011-08-23 15:11:21 -04:00
martin e580c5ae0d CC-2438: Add a button to listen to the stream immediately
-initial commit
2011-08-23 12:45:03 -04:00
martin 4213b05a8d cc-2666: separate components
-virtualenv install file
2011-08-23 12:43:50 -04:00
martin 87431a24c1 -removed AirtimeInstall::SetDefaultTimezone(); (should only be in 2.0)
-reindent code
2011-08-23 12:42:45 -04:00
martin 4689484cd2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-23 12:31:37 -04:00
martin 4fe3baf591 cc-2666: try separating compononents
-moved python-virtualenv install to separate install file,
 so each component can install virtualenv
2011-08-23 12:31:27 -04:00
James 88d3fa73be CC-2721: Pypo doesn't restart when it gets new stream setting
- fixed
2011-08-23 11:13:06 -04:00
James 6c2f94dec7 Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-08-23 10:18:06 -04:00
James 8e6185855a CC-2719: update unique_id and import_timestamp on reinstall
-fixed
2011-08-23 10:17:46 -04:00
James 078aa1d05d CC-2607: Handling comments
- It handles comment lines
- adding warning text telling not to edit liquidsoap.cfg file
2011-08-23 10:12:18 -04:00
martin d7830785df CC-2717: Media Monitor forgets about watched directories after being restarted 2011-08-22 20:41:34 -04:00
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
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