Commit Graph

378 Commits

Author SHA1 Message Date
James ed5b7bca5f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-31 16:28:40 -04:00
James 0a85d2ecf5 CC-2727: Limit number of streams and max bitrate
- renamed
SetNumOfStream() -> SetNumOfStreams()
GetNumOfStream() -> GetNumOfStreams() \
- default bitrate is 320
- removed debugging code
2011-08-31 16:28:20 -04:00
martin 0517bf0c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-31 15:14:44 -04:00
martin 5f56538bff CC-2363: Diagnostic screen in Web UI
-show hard drive space for /srv/airtime/stor
2011-08-31 12:52:12 -04:00
James c460519a88 Merge branch '1.9.1' into devel 2011-08-31 10:15:00 -04:00
James 982c8f9c20 CC-2746: Removing required attribute from all fields
- done
2011-08-31 10:13:57 -04:00
martin 03cb154bd1 CC-2737: Show disk space used/space available/ disk quota enforcement
-modify airtime-check-system to return values instead of printing
 them directly
-add ability to view select airtime-check-system via web interface
2011-08-30 18:00:03 -04:00
James b5645d238a CC-2746: Edit metadata loses data if required data is missing
- fixed
2011-08-30 16:50:46 -04:00
James cdd1da3963 CC-2740: Upload issue
- fixed a bug for uploading a file with "+" signs in IE
2011-08-30 15:35:03 -04:00
James d0ecd0acf1 CC-2740: Upload issue
- fixed a bug for uploading a file with "+" signs in IE
2011-08-30 15:25:33 -04:00
martin 1e70feda6b CC-2438: Add a button to listen to the stream immediately
-Pop-up. Just need a proper skin.
2011-08-29 15:30:00 -04:00
James 83bba9532e CC-2089: create "cancel show" command for pypo
- done
2011-08-29 11:54:44 -04:00
james b92793e80f CC-2727: Limit number of streams and max bitrate
- create airtime-stream php script to set number of streams and max bitrate
- the stream section itself is not displayed rather than grey out
2011-08-26 15:41:20 -04:00
james 56ad8c6b3d Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
2011-08-26 12:56:10 -04:00
James ad620577be - Version string fix 2011-08-25 17:16:09 -04:00
James 2901a7a7eb - Version string change for 1.9.3 2011-08-25 17:02:56 -04:00
James 14e1e15830 CC-2733: Resume play is broken: mp3 files skipped
- killing old pypo and liquidsoap processes
- comparing mime type againt old type of mime
2011-08-25 16:32:57 -04:00
martin 7cfde811c9 CC-2729: Items in a playlist delivered from the server via JSON aren't in the proper order
-fixed
2011-08-24 18:13:50 -04:00
James 58837ff89b CC-2706: Streams should have a username field
- adding "User" field on stream setting form
- change key name from "output_s1" to "s1_output" format to be consistent
- changed order of inserting in default.sql file
- hiding username field on shoutcast selection
- liquidsoap and pypo takes care of user field input
2011-08-24 17:13:56 -04:00
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
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 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 d7830785df CC-2717: Media Monitor forgets about watched directories after being restarted 2011-08-22 20:41:34 -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 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
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
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
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 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