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

659 Commits

Author SHA1 Message Date
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
Martin Konecny 3fee646e35 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 14:45:20 +02:00
Martin Konecny 24e208d1d6 CC-2438: Add a button to listen to the stream immediately 
-but is now available. Need to ask Vladimir to position it under the "On-Air"
 2011-10-12 14:26:18 +02:00
James e16c8f3411 CC-2945: Change "Storage Folder" to "Import Folder" 
- fixed
 2011-10-11 17:29:49 -04:00
James 600c480ac3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 17:27:12 -04:00
James 701094b743 CC-2946: "Record" should be renamed to "Record from Line In" 
- fixed
 2011-10-11 17:26:56 -04:00
Yuchen Wang 45aa38111c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 16:48:56 -04:00
Yuchen Wang 37e4fac560 CC-2387: Changing admin password requires entering first / last name 
Entering first and last name is no longer required when changing password.
 2011-10-11 16:47:53 -04:00
James 20e9002310 CC-2956: Undefined variable: endDateTime in 
/usr/share/airtime/application/models/Show.php on line 807,
referer: http://localhost/Schedule

- fixed
 2011-10-11 16:36:01 -04:00
James efbd2f53d0 CC-2745: Show status of liquidsoap/icecast connection on Stream 
Settings page

- temp commit
 2011-10-11 14:40:30 -04:00
james d3833f9a32 CC-2745: Show status of liquidsoap/icecast connection on Stream Settings 
page

- initial commit
 2011-10-10 20:14:27 -04:00
James 1059cee80c CC-2922: Manage media folders text 
- done
 2011-10-06 15:39:42 -04:00
James 04bcd47a31 CC-2936: Soundcloud: handle the case where the soundcloud server 
is not responsive

- fixed
 2011-10-05 17:48:25 -04:00
James c35f77a9aa CC-2932: Recorder: When show is recorded, the file name is generated 
with UTC time.

- fixed
- new pybundle is created with 'pytz' package
 2011-10-05 17:27:00 -04:00
James 75f57fc18c CC-2933: Add From When: Create custom decorator(phtml) for 
the section

- done
 2011-10-05 12:22:54 -04:00
James b90b69ebde CC-2926: Clicking "Choose File" in support settings to upload image 
defaults to "Audio/MPEG" type in Chrome

- fixed
- extra fix: removing debugging code from api_client.py
 2011-10-05 11:21:13 -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
martin 929e29182b CC-2908: Add "Live Stream" title to live stream popup window 
-custom logo
 2011-10-04 17:18:36 -04:00
martin 7dd14efe27 CC-2750: Ability to query health status for pypo, 
liquidsoap, media monitor, and recorder
 2011-10-04 15:49:02 -04:00
martin d54066fca8 -undo weird automerge by git. 2011-10-04 14:11:20 -04:00
martin cb3060623c Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
 2011-10-04 14:01:48 -04:00
martin 5190a0c24c Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
 2011-10-04 13:59:27 -04:00
James b682c2cd10 CC-2902: Broken link in interface: "Click the box below to advertise 
your station on Sourcefabric.org"

- fixed
 2011-10-04 12:04:09 -04:00
James b4d4c54c31 CC-2795: Give option to set download flag of recorded shows uploaded 
to Soundcloud by default

- fixed name of Soundcloud Model class
 2011-10-03 18:02:01 -04:00
James d4063a8234 CC-2873: Soundcloud plugin doesn't log any error when there is an 
error with soundcloud uploading through api controller

- changed constant name to 'SOUNDCLOUD_NOT_UPLOADED_YET'
 2011-10-03 17:38:57 -04:00
James 64a46294c9 CC-2910: Ability to collapse stream sections in "Stream Settings" 
- done
- only stream 1 is expanded by default
 2011-10-03 17:00:39 -04:00
James 0e29dfa617 CC-2917: Adding show, when inputting time and specifying a bogus 
time (like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- fixed by implementing masking on the fields
- used meioMask jquery plugin
 2011-10-03 16:43:32 -04:00
James aebcfb9450 CC-2905: Add indentation on checkboxes on SoundCloud setting 
- fixed
 2011-10-03 15:35:31 -04:00
James 441b983665 CC-2748: Make Airtime look good in IE 
- fixed
 2011-10-03 15:27:10 -04:00
James 3ac50b0183 CC-2904: Space missing between two boxes on "Playlist Builder" 
- fixed
- extra change: bug on flag name change
 2011-10-03 15:25:55 -04:00
James 1d172ca630 CC-2904: Space missing between two boxes on "Playlist Builder" 
- fixed
 2011-10-03 14:26:10 -04:00
James dcda08e17a CC-2919: Media Monitor: recorded show doesn't show on library after 
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
 2011-10-03 14:17:56 -04:00
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
James 5e9aec93a8 CC-2919: Media Monitor: recorded show doesn't show on library after 
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata
 2011-10-03 14:10:47 -04:00
martin 27892c8b46 CC-2906: Airtime Volume Control is invisible when turned on. 
-fixed
 2011-09-30 15:48:12 -04:00
martin 20c2405f20 CC-2907: Stream player window gets a 404 when clicked 
from "Stream settings" page

-fixed
 2011-09-30 14:46:09 -04:00
martin 1bdcff1119 CC-2750: Ability to query health status for pypo, 
liquidsoap, media monitor, and recorder

-renamed CcComponent to CcServiceRegister
 2011-09-30 14:08:15 -04:00
martin a31920e982 CC-2438: Add a button to listen to the stream immediately 
-Streams selectable by their description
-Repeatedly clicking on the ON-AIR, focus()es the window
 instead of reloading it.
 2011-09-30 12:58:49 -04:00
martin 0613c6db3a CC-2908: Add "Live Stream" title to live stream popup window 
-done
 2011-09-30 12:07:44 -04:00
martin 421f543f99 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-29 18:19:08 -04:00
martin b9863e660e CC-2806: Create upgrade template file 
-initial commit
 2011-09-29 18:18:08 -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
James bf15b4cf0d Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-09-29 15:22:40 -04:00
James 3775e5f4a7 CC-2882: Airtime cannot delete watched folder when is been renamed 
- done
 2011-09-29 15:02:34 -04:00
James 46146d1216 cc-2882: Airtime cannot delete watched folder when is been renamed 
- initial commit

Conflicts:

	airtime_mvc/application/models/MusicDir.php
 2011-09-29 15:02:30 -04:00
James 89a4c2e1e3 - Changing -3 to PHP constant 2011-09-29 14:47:07 -04:00
James 1593313805 CC-2898: put button within the form 
- done
 2011-09-29 12:12:41 -04:00
James 2e49ffdebe CC-2898: Put "Save" button at top of stream settings 
- fixed
- extra fix: removed incorrect description text for mount point field
 2011-09-29 12:10:25 -04:00
James 1c652b6416 CC-2873: Soundcloud plugin doesn't log any error when there is an error 
with soundcloud uploading through api controller

- Changed constant names
- added -1 constant
 2011-09-29 10:30:40 -04:00
martin 3ded56fdc2 CC-2724: Play Stream Icon + jPlayer popup styling 
-changed to use <select> box instead of radio buttons
 2011-09-28 16:36:16 -04:00
martin 4e105e6151 CC-2891: Unicode error with metadata that contains unicode strings 
-fixed
 2011-09-28 16:04:40 -04:00
James 28f1d885f2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-28 13:46:10 -04:00
James d1542b0d89 CC-2882: Airtime cannot delete watched folder when is been renamed 
- done
 2011-09-28 13:45:21 -04:00
martin f697e475fd CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 
-remove icecast monitoring for now
 2011-09-28 12:45:19 -04:00
martin 5418ce4601 CC-2724: Play Stream Icon + jPlayer popup styling 
-Everything looks to be working.
 2011-09-27 16:37:03 -04:00
martin 3dbedc3a56 CC-2724: Play Stream Icon + jPlayer popup styling 
-#of streams and stream bitrates now fetched from database.
 2011-09-27 15:26:40 -04:00
James b1fa8901ca cc-2882: Airtime cannot delete watched folder when is been renamed 
- initial commit
 2011-09-27 14:49:03 -04:00
martin fef0392e43 CC-2724: Play Stream Icon + jPlayer popup styling -upgraded to jplayer 2.1 2011-09-27 14:02:12 -04:00
martin df4bf9e1c7 CC-2833: Use ClassLoaders for PHP Files 2011-09-26 17:01:43 -04:00
martin fb9ab448b7 CC-2833: Use ClassLoaders for PHP Files 2011-09-26 15:43:58 -04:00
martin 685cc87951 CC-2833: Use ClassLoaders for PHP Files 
-temporarily reenable some files from being always loaded
 2011-09-26 15:32:56 -04:00
martin 9e6a1ebf44 CC-2833: Use ClassLoaders for PHP Files 
-autoload DateHelper class
 2011-09-26 15:29:12 -04:00
martin b8838a5bda CC-2833: Use ClassLoaders for PHP Files 
-autoload AtSoundcloud class
 2011-09-26 15:25:03 -04:00
martin dfe43c98bb CC-2833: Use ClassLoaders for PHP Files 
-autoload RabbitMq class
 2011-09-26 15:19:23 -04:00
james e1fe877ac6 CC-2873: Use PHP constants 
- done
 2011-09-25 17:29:57 -04:00
martin 5cc7de95ee CC-2833: Use ClassLoaders for PHP Files 
-Done for class User
 2011-09-23 17:00:55 -04:00
martin 1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files 
-Done for class Schedule and ScheduleGroup
 2011-09-23 16:50:00 -04:00
martin cd95170b06 CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead 
-done
 2011-09-23 16:26:19 -04:00
martin e60db9e031 CC-2860: When recording a show, UTC time is displayed on the 
text field of right progress bar.
 2011-09-23 15:37:45 -04:00
martin 1dd78d0584 CC-2833: Use ClassLoaders for PHP Files 
-Found out ClassLoaders only want one class per file. Moved
 ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
 2011-09-23 12:33:28 -04:00
martin 693c72c396 -change Shows.php to Show.php 2011-09-23 10:56:12 -04:00
martin 9bb901945e CC-2833: Use ClassLoaders for PHP Files 
-shows.php
 2011-09-23 10:54:20 -04:00
martin 7bb9e92ac9 cc-2864: upgrade from 1.7 broken 
-fixed
 2011-09-22 17:30:05 -04:00
James e722ff8c36 CC-2873: soundcloud error log to DB 
- fixed
 2011-09-22 16:59:13 -04:00
Paul Baranowski 48b08893f0 CC-2306: Uploading a file that already exist error message does not have styling 
Tweaked message to the user.
 2011-09-22 15:31:21 -04:00
James 965a649d0e CC-2591: Change function name 
- done
- extra fix: fix was needed due to class name change
 2011-09-22 14:01:05 -04:00
James 95a2c179c2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 13:40:32 -04:00
James 6d23ea4b49 CC-2308: 404 page 
- done
 2011-09-22 13:40:16 -04:00
martin c84690adaa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
 2011-09-22 12:25:30 -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 43ba92a535 CC-2866: progress icon not showing 
- fixed
 2011-09-22 12:15:03 -04:00
James b3654c62bc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 11:48:07 -04:00
James 73dc4b851d CC-2591: Allow upload of any audio clip to Soundcloud 
- done
- need more styling
- note there were changes in style.css
 2011-09-22 11:47:24 -04:00
martin 046f98db8f CC-2363: Diagnostic screen in Web UI 
-everything working
 2011-09-22 10:45:43 -04:00
martin 19d61ad780 CC-2363: Diagnostic screen in Web UI 
-working with ajax now!
 2011-09-19 17:55:26 -04:00
martin 787e0375ed Merge branch '1.9.1' into devel 2011-09-19 16:19:56 -04:00
martin a61b48a795 CC-2834: Playlist items drag underneath playlist editor layer 2011-09-19 16:18:49 -04:00
martin a11dba1469 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-19 15:46:15 -04:00
martin 5a5430f468 CC-2363: Diagnostic screen in Web UI 
-add vladimirs design
 2011-09-19 15:45:23 -04:00
martin 62f0d1c7b2 Merge branch '1.9.1' into devel 2011-09-17 12:37:15 -04:00
martin d824eb7622 CC-2837: Invalid SQL statement 
-fixed
 2011-09-17 12:36:35 -04:00
martin 9861587dec -CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-16 22:05:52 -04:00
martin e1e34d297c -CC-2750: Ability to query health status for pypo, liquidsoap, 
media monitor, and recorder
 2011-09-16 21:30:50 -04:00
martin 3485b5a39f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-16 17:53:37 -04:00
martin 659e412eb7 CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 
-progress being made
 2011-09-16 17:51:28 -04:00
James 7c94734277 CC-2810: More chmnod fixes for scripts 
- removed shebang from .py files
- removed cron folder and its content as we don't use them
- .js files are from 3rd party(datatable) so we should leave them as they are
 2011-09-16 14:01:23 -04:00
James 1e4bcdf831 CC-2814: Login error messages need to be highlighted 
- done
- Recaptcha box and submit button is moved to center
 2011-09-14 17:50:00 -04:00
martin 583a5faf72 CC-2750: Ability to query health status for pypo, liquidsoap, 
media monitor, and recorder
 2011-09-13 18:43:16 -04:00
James ebf5c75af3 CC-1929: login page: username should get focus on loading 
- done
 2011-09-13 15:29:01 -04:00
martin 9fc2932be6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-13 14:56:48 -04:00
martin 2c2bb86698 CC-2750: Ability to query health status for pypo, 
liquidsoap, media monitor, and recorder

-fixed rabbitmq not delivering messages
 2011-09-13 14:56:24 -04:00
James f25304bcb7 CC-2789: Prevent brue-force password guessing attacks 
- add recaptcha on login page
 2011-09-13 14:16:16 -04:00
martin d942e476c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-13 13:55:34 -04:00
martin 0546633ac7 CC-2750:Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-12 17:15:46 -04:00
James e918f3b29a CC-2791: "Port" should only allow numbers and 5 digits 
- fixed
- fixed scrolling when errors
 2011-09-12 13:57:26 -04:00
James 0591c9d76f CC-2790: Stream type "OGG" should be "OGG/VORBIS" 
- fixed
 2011-09-12 13:16:34 -04:00
martin 362cf93643 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-09 15:07:56 -04:00
martin 9c7bab616d Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
 2011-09-09 15:07:43 -04:00
martin 8b09f82aa3 -when returning a file url for download, use the server address 
that the server was contacted with.
 2011-09-09 11:45:19 -04:00
martin 53306dffa4 -update version string to 1.9.4 2011-09-08 15:18:54 -04:00
Paul Baranowski 2ed4dc9218 Forgot to add in the "About" page. Here it is. 2011-09-08 13:45:07 -04:00
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 b73016550b CC-2265: Date Start is not updated after dragging show to new day 
- fixed
 2011-09-07 17:30:25 -04:00
Paul Baranowski 1f84cd8b84 Tweaked labels on the Stream Settings page. 2011-09-07 17:06:43 -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
James 78ffa74bab CC-2755: trial ending date 
- add functions in Preference.php
 2011-09-02 11:30:47 -04:00
James c6557e1280 CC-2756: Ability to set plan level 
- created setter and getter in Preference.php for plan level
- renamed airtime-stream to airtime-system
- airtime-system is removed from this repository(moved to airtime-saas)
 2011-09-02 10:37:15 -04:00
James 39b688c256 CC-2661: Uptrade script for stream config feature 
- codes for conserving user's liquidsoap.cfg and porting into new stream
setting config.
- extra fix: fixed a bug with shoutcast(default value has to be set for
some variables)
 2011-09-01 16:02:06 -04:00
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
James 22c9416c31 CC-2747: When metadata contains non utf-8 encoding, we should handle it 
- we cover some cases with cp1252 encoding for now.
- extra fix: Logging.php (copied from 2.0.0)
 2011-08-31 14:46:21 -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
James db225dd610 CC-2704: Support settings UI tweaks 
- Move station name to "Support Settins" page
 2011-08-19 12:19:35 -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 846e08699e CC-2628: update a repeated show start time cause the show to get corrupted 
-disabled dragging + dropping repeated show instances
 2011-08-18 18:13:43 -04:00
martin fc66b1d1ba Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 15:44:57 -04:00
martin dd9ef5b9c8 CC-2379: "Add Show" uses browser time instead of server time 
-Fixed
 2011-08-18 15:44:16 -04:00
James 873f7e1dae CC-2698: upgrading fail from 1.8.2->1.9.0 
- fixed version string
- deleting entries from cc_schedule before adding "ON CASCADE" constraint
 2011-08-18 15:32:33 -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 266ee56d6d CC-2683: All times in the database are not stored in UTC. 
-missed a spot where we need to use calculate in UTC
 2011-08-17 16:35:03 -04:00
martin 4eaf56b93f -station name in preferences no longer required 2011-08-17 15:55:11 -04:00
martin e392c8437a cc-2683: not using utc time 
-clean up recorder file
 2011-08-16 16:36:31 -04:00
martin 0a11160298 cc-2683: not using utc time 
-fix install script inputting timezone preference even if
 it already existed
 2011-08-16 15:34:19 -04:00
martin 8aa26b2eb0 cc-2683: not using utc time 
-top panel now start at correct time
 2011-08-16 15:07:55 -04:00
martin 41fd5f2543 cc-2683: not using utc time 
-context menu showing options display correctly
-edit show fills in correctly
-Now Playing view shows up correctly
 2011-08-16 15:07:55 -04:00
martin 03f8163764 cc-2682: not using pypo time 
-Remove messages being sent to pypo to change its timezone
-fix time conversion bug in pypo-push
 2011-08-16 15:07:55 -04:00
martin 61e1c56244 cc-2683-not-using-utc-time 
-pypo now works in UTC time
 2011-08-16 15:07:54 -04:00