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

208 Commits

Author SHA1 Message Date
Martin Konecny e91c96b90e CC-4090: Make code style PSR compliant 
StreamSetting.php
 2012-07-09 23:32:21 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise d02607ed94 CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-15 12:16:19 -04:00
James 73a7a76078 Merge branch 'CC-3963' into 2.1.x 
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
 2012-06-14 16:06:53 -04:00
denise 295a8ea5fe CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-14 13:44:56 -04:00
James b07b83f740 CC-3981: Record Show: Change streams settings during recording will 
cause record fail

- added warning message
 2012-06-13 14:44:38 -04:00
James 57397312f2 CC-3963: If DJ is scheduled to broadcast for show, then automatically 
enable source when DJ connects.

- done
 2012-06-12 15:38:03 -04:00
denise d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -04:00
denise 81c7eb7763 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked 
-fixed
 2012-06-11 18:08:36 -04:00
denise ca8187c9c2 CC-3718: Please enable user to input the mail server settings 
-done
 2012-06-11 12:53:09 -04:00
denise d8a75cf5c6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 17:06:54 -04:00
denise fda04295a6 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked 
-fixed
 2012-06-06 17:06:46 -04:00
James fb533bed07 CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station 
on Sourcefabric.org' if it's checked then saved.

- fixed
 2012-06-06 14:26:23 -04:00
James b23e3d0a54 CC-3927: Should automatically switch back to Master/Show stream if there is a 
connection interruption

- done
 2012-06-05 16:41:41 -04:00
denise f23582612a SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance 
-fixed
 2012-05-28 15:41:59 -04:00
Naomi Aro b6bed6ce7a CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 15:22:38 +02:00
James 1d91d1b11b CC-3659: Override on Master/Show Source connection needs to have 
better description about what the override field actually does.

- fixed description
- extra fix:
 - using variable instead of hard coded text
 - removed unnecessary code
 2012-04-16 18:21:28 -04:00
James 2e811dfef8 CC-3642: System->Streams->DJ URL changes are not reflected in Calendar 
->LiveStream

- fixed
 2012-04-16 15:23:37 -04:00
Naomi Aro b998a04c2e Merge branch 'devel' into CC-3174 2012-04-10 15:57:13 +02:00
James 32548de639 CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting 
entire text and typing does not erase the highlighted text.

- removed all the masking
- meioMask is very outdated so it's removed from the project.
 2012-04-09 16:35:39 -04:00
Denise Rigato 7fc575e750 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 15:51:37 -04:00
Denise Rigato ee0a08be15 CC-3487: Improved restart warning message for stream settings page 
-fixed
 2012-04-09 15:51:17 -04:00
Martin Konecny 54ec6445c6 CC-3606: System->Media Folders-> system seems to search 
-fixed. Need to check if directory actually exists.
 2012-04-09 12:43:40 -04:00
Naomi Aro 0b3809c379 CC-3110 : Password reset 
added sender email to preferences form, created db upgrade script.
 2012-04-05 14:18:42 +02:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition 
- done. changing fade value doesn't require LS to restart
 2012-03-20 22:16:17 -04:00
James e194ff0dc8 CC-3469: Stream settings: Connection URLs are not generated correctly 
- done
 2012-03-19 16:08:23 -04:00
Martin Konecny 5a7a502d45 CC-3436: Warn the user that the stream will be interrupted when pypo is restarted 
-Done
 2012-03-17 15:24:19 -04:00
James 79f8eabe2b CC-3405: Display to users how to connect a live stream to Airtime 
- Done
 2012-03-14 14:43:10 -04:00
James 540f262a77 CC-3224: "On-the-fly" stream rebroadcasting 
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
 2012-03-14 14:43:10 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting 
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
 2012-03-14 14:41:00 -04:00
James 1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting 
- Live source is created when only both port and mount point are specified
 2012-03-14 14:41:00 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting 
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
 2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting 
- web interface
- auth script for liquidsoap
- DB changes
 2012-03-14 14:41:00 -04:00
james 701ed82f40 CC-3224: "On-the-fly" stream rebroadcasting 
- interface implementation. subform within the show form.
 2012-03-14 14:41:00 -04:00
Paul Baranowski d250e2a297 CC-3380 Better names for items in the System menu 2012-03-02 17:50:52 -05:00
Naomi Aro b357b80054 CC-3174 : showbuilder 
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
 2012-02-23 12:13:00 +01:00
Naomi Aro d4c7b832c9 CC-3174 : showbuilder 
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
 2012-02-22 18:38:33 +01:00
Naomi Aro 2aae318a5a CC-3174 : showbuilder 
remembering state for the timeline datatable.
 2012-02-22 12:42:24 +01:00
Naomi Aro 9b5a0fc565 CC-3174 : showbuilder 
working on trying to save/load state serialized into the db for datatables.
 2012-02-21 17:31:54 +01:00
James 33fcbddcb9 CC-3284: Don't make browser users clear their cache when Airtime is upgraded 
- use airtime version string instead of filemtime function

Conflicts:

	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-08 16:21:57 -05:00
James df73726961 CC-3293: Stream settings page does not remember the stream metadata format 
- fixed
 2012-02-01 12:10:31 -05:00
james e05e2ea49c CC-3284: Version the javascript directories so that upgrades 
work correctly for clients.

- appended timestamp of last modified time on all js and css file import

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
 2012-01-27 15:37:53 -05:00
James bcbbf42f62 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:56:02 -05:00
James 30b192a809 CC-3218: tream-settings: Spaces and other illegal characters should not 
be allowed in the fields: server, username, password, URL, and mount point

- masking was added on the front end and validators were added for the
server side.
- extra fix: fixed php undefined index notice problem.
 2011-12-21 17:30:42 -05:00
Naomi Aro 3cd11c696f CC-3184 : Preferences: "Stream Label" needs to be moved to "Stream Settings"->"Global" 2011-12-13 12:10:25 +01:00
James 043f0c29a1 CC-3074: Give users the choice of which hardware sound API they wish to 
use (instead of hardcoded to ALSA)

- finished everything except LS part(including upgrade and UI)
 2011-12-02 13:39:14 -05:00
James 9c65bfeba7 CC-3131: Latency of stream authentication warning in Stream Settings page 
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
 2011-11-29 20:15:38 -05:00
James c9644d4a73 CC-3077: Preference/stream-setting page has no Vorbis metadata option 
- cleaning up some code
 2011-11-25 15:38:29 -05:00
James a886b53d74 CC-3077: Preference/stream-setting page has no Vorbis metadata option 
- done
 2011-11-23 17:03:30 -05:00
James a723430462 SAAS-69: Support Settings: Change/hide some sections for SaaS 
- Some sections are hidden when saas is enabeld
as described in the ticket.
 2011-11-15 16:10:40 -05:00
James 2529570546 SAAS-67: "Hardware Audio Out" shows when SaaS is enabled 
- minor fix.
- it was returning error when saving stream setting.
 2011-11-14 16:23:23 -05:00
james 68f142470a SAAS-67: "Hardware Audio Out" shows when SaaS is enabled 
- "Hardware Audio Out" is not visible when plan-level is not diabled
 2011-11-13 13:58:47 -05:00
James f2bf92297a CC-2745: Show status of liquidsoap/icecast connection on Stream Settings page 
- fixed a case where it was displaying "OK" when liquidsoap was not running
 2011-10-23 06:29:06 -04:00
Yuchen Wang d9186a3bf2 CC-2951: Allow users to select the starting day of the week 
Added system preference in Preference page for user to select the start day of a week
(defaults to Sunday).

Calendar will utilize this information and update the calendar UI accordingly.
 2011-10-19 12:42:22 -04:00
james faba5aec57 CC-2745: Show status of liquidsoap/icecast connection on 
Stream Settings page

- commit w/o design
 2011-10-13 14:22:28 -04:00
James 3f495e7532 CC-2795: Give option to set download flag of recorded shows uploaded 
to Soundcloud by default

- changed function name
- changed database flag name
 2011-10-04 17:38:21 -04:00
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
Paul Baranowski 44481d2776 SAAS-41: Changed name of boolean value from disable-stream-conf to 
enable-stream-conf for easier logic.
 2011-09-29 18:11:22 -04:00
James 7e3d25eeaa CC-2795: Give option to set download flag of recorded shows 
uploaded to Soundcloud by default

- done
 2011-09-29 17:10:17 -04:00
martin dfe43c98bb CC-2833: Use ClassLoaders for PHP Files 
-autoload RabbitMq class
 2011-09-26 15:19:23 -04:00
martin 2be0960ed5 CC-2833: Use ClassLoaders for PHP Files 
-made MusicDir, Playlist and StoredFile autoload
 2011-09-22 12:24:17 -04:00
James 0591c9d76f CC-2790: Stream type "OGG" should be "OGG/VORBIS" 
- fixed
 2011-09-12 13:16:34 -04:00
James fa929d45a6 CC-2753: Ability to disable stream 1 but still show it in the interface 
- interface change
- all elements becomes 'disabled' depending on 'disable_stream_conf' flag
 2011-09-02 16:13:30 -04:00
James 903c3474c7 CC-2654: Remove abilities that don't apply to SaaS 
- not displaying manage folder option when saas is true
- not displaying record and rebroadcast section when saas is true
 2011-09-02 15:24:35 -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
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 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 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 4ca480ba5e Merge branch '1.9.1' into devel 2011-08-19 17:07:59 -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 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
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
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
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
martin 84ec62eeca CC-1942: Add ability to set timezone in preferences 
-Can change the timezone for PHP. Need to change for python as well.
 2011-08-15 10:06:42 -04:00
James 05b2a9679b CC-2651: Prevent chaning the storage dir while import is happening 
- done
 2011-08-08 17:07:52 -04:00
James 9ff5bdaf0f CC-2652: display info about import 
- temp commit
 2011-08-08 14:44:05 -04:00
Naomi Aro c7279f74ca CC-2558 : Only delete files from disk that are in stor directory and not scheduled etc. 2011-07-18 19:48:20 +02:00
James 2b1a0b4f72 CC-2551:airtime-import:Script doesnot send msg to media monitor 
- move all error checking and RabitMq calls into MusicDir
functions
- fix in PreferenceController.php so it works with new functions
from MusicDir
 2011-07-14 15:43:38 -04:00
james be7af45c66 CC-2524:Manage Media Folders:No error msg 
- fixed
- changed error msg text
 2011-07-13 09:01:48 -04:00
martin 67df619c90 CC-2272: Ability to change storage directory location 
-done
 2011-07-06 14:42:43 -04:00
james daf6f9963f CC-2511:Phone Home Metric: add error display on popup 
- refactoring was needed to solve this problem.
- javascript error check is not necessary anymore.
- The form is preloaded to nowplaying page, only when
it's needed, hence ajax call to pull up the form is not
needed anymore.
 2011-07-05 15:53:50 -04:00
james 883cacd220 CC-2509:Phone Home stat: not able to upload logo via popup 
- fixed
 2011-07-05 14:21:32 -04:00
james cb72db4a31 CC-2460:Popup shouldn't show after X is pressed 
- changed function name to "donotshowpopup"
 2011-07-04 13:11:35 -04:00
james 6de8b09184 CC-2460: popup doesn't popup again after press X 
- fixed
 2011-07-04 09:54:44 -04:00
Naomi Aro 4a478117c6 CC-2411 : Interface for Music Folders Preferences 
applying html/css changes to music folder preference page.
 2011-06-27 11:46:23 +02:00
James c5ec6b5a53 CC-2425:Tweak phone home 
- privacy check box is uncheck by defalut
- 'Yes' button is disabled on popup form by default
- custom error msg is added for privacy checkbox on preference
form
- promote form is hidden by default
 2011-06-26 23:13:49 -04:00
James 195588ecc4 CC-2451: Not storing data 
- fixed
- additional fix: promote data will not be stored if promote
checkbox is not checked
 2011-06-26 01:47:21 -04:00
James 7aca2e25d0 CC-2432:After choosing to register from still pops up 
- fixed
 2011-06-24 10:15:18 -04:00
james ea78991d57 - removing one line from PreferenceController.php(the function 
doesn't exist anymore)
 2011-06-21 10:26:34 -04:00
james bcfc5507c6 CC-1724: Phone home statistics 
- Email is not required field in Preference
- removed duplicate line from PreferenceController.php
 2011-06-21 10:19:39 -04:00
Naomi Aro 6adce1ba45 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding ability to move stor directory.
 2011-06-21 14:58:38 +02:00
Naomi Aro f1893cebe6 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
making separate js file for music dirs page.
 2011-06-21 11:57:56 +02:00
Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
 2011-06-21 11:20:35 +02:00
Naomi Aro b6888489e0 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding music dirs concept to Airtime. New cc_music_dirs table/class.
 2011-06-21 10:24:02 +02:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
 2011-06-20 18:09:37 -04:00
james e762633405 CC-1724:Phone home statistics 
- Final commit for client side.
 2011-06-20 17:58:38 -04:00
Naomi Aro ea21da6b61 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
recursively copying the audio_samples directory.
 2011-06-17 17:54:36 +02:00
james 1fbaa7d5fb CC-1724:Phone home statistics 
- Popup form validation is added( javascript )
 2011-06-16 14:26:24 -04:00
james 5adfb79981 CC-1724:Phone home statistics 
Temp commit
 2011-06-15 17:51:44 -04:00
james cf654f1a45 CC-1724:phone-home-statistics 
Rebase from devel into this branch
 2011-06-15 12:06:50 -04:00
james 11b601308e CC-1724:Phone home statistics 
Temp commit
 2011-06-15 11:17:03 -04:00
Naomi 23105b9d67 CC-2184 : Hardcoded CSS path should be relative path instead 
using baseURL zend provides in path.
 2011-04-18 11:02:09 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00