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

242 Commits

Author SHA1 Message Date
martin a20bdb941c CC-2260: Liquidsoap and Show contents window do not respect cue-out point 
-fixed
 2011-09-07 17:50:00 -04:00
james ea305bd793 CC-2759: Stream settings "Hardware Audio Out" UI tweaks 
- used same styling as "Stream" sections.
 2011-09-07 16:27:51 -04:00
james b66a923d5f CC-2654: corrected spelling 
- fixed
 2011-09-07 16:19:35 -04:00
james f6f27bf0ff CC-2654: use id 
- added id to navigation
- using id instead of label
 2011-09-07 09:55:21 -04:00
james f1c311acb6 CC-2775: Better layout for Stream Settings page 
- layout is done
- need to implement status update part
 2011-09-07 09:48:02 -04:00
Paul Baranowski 37415f33d4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-06 15:28:57 -04:00
Paul Baranowski 7379da83c6 CC-2049: Log in/out versus sign in/out of admin interface 
Fixed by removing "Sign in" terminology.

Moved "About" link to underneath the "Help" menu.
Simplified the upper right hand corner of the Admin interface.
 2011-09-02 17:29:08 -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 0c72b8b6bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-02 15:24:53 -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
Paul Baranowski aa58225e68 Changed the "Configure" menu item to "System". 
Changed Help->About to Help->Getting Started.
Added Help->"User Manual"
Added ability to specify a "target" in the main menu navigation - this allows
us to open up a new tab for the User manual. Adde
 2011-09-02 14:37:40 -04:00
James ce2ce0a13a CC-2755: Displaying trial ending information 
- it only displays about remaining date when the plan level is 'trial'
 2011-09-02 12:10:46 -04:00
James 1a8214fccc CC-2755: Ability to set trial ending date 
- codes for front end.
- design needs to be integrated.
 2011-09-02 12:02:02 -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
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 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 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 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 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
James dc6ed33b47 Merge branch '1.9.1' into devel 2011-08-19 16:43:16 -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 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
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
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 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 61e1c56244 cc-2683-not-using-utc-time 
-pypo now works in UTC time
 2011-08-16 15:07:54 -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 b9d969e45a CC-2656: Change user manual link on help page 
- done
 2011-08-09 11:35:25 -04:00
James 968c0f96a2 CC-2651: import idicator 
- Threshold is 10 seconds
- record timestamp once every 5 seconds
- "File import inprogress..." displays above search box
- pyinotify read_freq changed to 0.1 from 1
 2011-08-09 10:40:10 -04:00
James f95e881ec5 CC-2501:Registration:wording changes 
- fixed
 2011-07-14 16:06:13 -04:00
james 947647ed89 CC-2506:'choose folder' should be 'Choose folder' 
-fixed
 2011-07-06 13:50:32 -04:00
james acf5dbd6df CC-2515:Phone Home Metric:prevent parent window refreshing 
- fixed.
 2011-07-06 11:32:57 -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 5e93bb999e CC-2501:Registration wording changes 
- modified text and look on preferences
 2011-07-04 17:54:33 -04:00
martin ae156c85b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 14:29:19 -04:00
martin 429d8b234c cc-2419: media monitor import on startup 
-new method of querying db on startup.
 2011-07-04 14:29:09 -04:00
james 4ca7b3cf16 CC-2501:registration-workding-change 
- temp commit. Styling is still broken
 2011-07-04 13:07:46 -04:00
james 2bc108e8ae CC-2504:Show me box in preferences does not show promotinal data 
-fixed
 2011-07-04 12:54:10 -04:00
james 7cc6e54f21 CC-2461:Change text of OK in Manage Music Folders 
-fixed
 2011-06-29 17:36:11 -04:00
james 43c8a28633 CC-2455:Show what i am sending heading 
-fixed
 2011-06-29 17:28:51 -04:00
james f9f6296e2c CC-2466 Manage Music Folders should be Manage Media Folder 
-fixed
 2011-06-29 16:40:49 -04:00
james a018466b80 CC-2468:Manage Users Say DJ and add show says host 
-fixed
 2011-06-29 16:33:20 -04:00
james cfeff13c4e - changing word 'publicise' to 'promote' 2011-06-27 16:04:28 -04:00
Naomi Aro e8265614ba CC-2456 : Multiple storage folders show up on the same line 2011-06-27 18:05:28 +02: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 1243c60442 CC-2425:Tweak phone home 
- removed original privacy text
 2011-06-26 01:54:05 -04:00
James a936212355 Merge branch 'cc-2425-tweak-phone-home' into devel 2011-06-26 00:45:30 -04:00
James 194ad31c9f CC-2425:Tweak phone hom 
- done
 2011-06-26 00:45:02 -04:00
James cc542797c7 CC-2425:Tweaks to phone home metric 
- Done
 2011-06-24 17:26:37 -04:00
James cace4c6d89 CC-2446:Crash in playlist builder 
- fixed.
 2011-06-24 17:00:59 -04:00
James eef1927f07 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-24 16:30:05 -04:00
James b83420874c CC-2425:Tweak phone home stat 
- fixed as requested. Just need to add the link
 2011-06-24 16:29:24 -04:00
martin a5d2597875 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-24 16:02:01 -04:00
martin 21cf476bfb cc-2444: audio preview is broken 2011-06-24 16:01:40 -04:00
James e05645f523 CC-2415:Subsecond offset 
- temp commit. not sure what needs to be done yet
 2011-06-24 12:29:55 -04:00
Naomi Aro fbf5f85509 CC-2423 Undefined property in StoredFile::$md 
uses the new file metadata access now.
 2011-06-24 10:40:31 +02:00
James Moon 3c3850db29 CC-2305:Create playlist out of range 
- HTML is fixed as Valdimir requested.
- CSS is fixed.
 2011-06-22 23:37:26 -04:00
james 3dcb10c931 - adding link to who's using page( it was remove somehow ). 2011-06-21 11:20:02 -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 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 Moon dd4ea127fc CC-1724:Phone home statistic 
- Fixed the bug where it didn't populate country dropdown box
This was due to default sql not popuplate country table correctly
- Changed 180*180 min log text to 200*200
- Changed text are size in support settings
- Client now sends base64encoded image to server.
 2011-06-20 20:31:20 -07: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 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
james ad3ef3ec30 CC-2255: Separate user types admin and program manager 
- New user type 'Program Manager' added
- 'Program Manager' gets same previlage as Admin but doesn't
have access to Configure menu
- Changed user type name 'Host' to 'DJ'
 2011-06-07 14:31:39 -04:00
james 75ffe91325 CC-1919:Playlist builder show time offset 
Fixed.

- I wasn't sure if I had to wait for html/css code from Vladmir.
I just did what I could do.
 2011-05-31 16:49:01 -04:00
Naomi d4a4c4be2a CC-1939 Ability to edit name & description of a playlist, display the description somewhere 
now can edit title/description of a playlist without leaving the main playlist builder screen
 2011-05-18 14:33:41 -04:00
martin 1d8f323a27 cc-2235: help says right-click to add playlist to show 
-fixed
-also renamed "Add Audio" to "Add Media"
 2011-05-17 13:55:51 -04:00
James Moon 95613f40f1 cc-2188: Download action for all media file. 
Download action were added in two placese.

1. Playlist Builder. jjmenu now showing 'Download'.
2. Calendar-> Show Content. Click on the file, you will see
Downlaod menu.

Limitation:

File name is set to original file name.
On the ticket it said, file format should be like
"show_name-12012011-2130.mp3". However, in my opinion,
this is only possible, if a user downloads it from
calender->show content. We know what the show names and etc,
but, if the user downloads it from Playlist Builder, we cannot
retrive such information. To be consistent in both area, I just
set the file name to original file name. This can be easily
modified in the future.
 2011-05-04 19:05:14 -04:00
Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime 
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
 2011-04-25 17:24:53 -04:00
martin 4b7ea32c7d -syntax errors discovered by eclipse 2011-04-21 17:23:59 -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
Naomi b992801a45 hiding/showing show overflow message properly. 2011-04-15 12:11:06 -04:00
Naomi eb312ae454 fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
Naomi c3a02e2569 some fixes to display rows in form. 2011-04-15 10:04:16 -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