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

668 Commits

Author SHA1 Message Date
Yuchen Wang a317d3904b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 15:18:58 -04:00
Yuchen Wang bae33b3e20 CC-1976: Auto-expand the playlist box as the list grows 
Fixed.
 2011-10-12 15:18:35 -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 aa3460963f CC-2929: More janitorial fixes for Debian/Ubuntu compatibility 2011-10-12 14:45:12 +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 d8c6b722ac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 10:00:39 -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
lukabazuka 1b1e389cf6 fixed issues CC-2836 and CC-2916 2011-10-10 23:38:51 +02:00
lukabazuka b3cf225d85 jPlayer CSS changes 2011-10-07 15:46:42 +02:00
James 1059cee80c CC-2922: Manage media folders text 
- done
 2011-10-06 15:39:42 -04:00
James 03a339bfeb CC-2937: Remove the word "Metadata" from metadata popup window 
- done
 2011-10-06 12:39:10 -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 7f2acb072b CC-2895: Manage Media Folder: Title disappears after adding watched 
folder

- fixed
 2011-10-03 17:35:43 -04:00
James 7648c8e318 CC-2917: Adding show, when inputting time and specifying a bogus time 
(like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- minified js file
 2011-10-03 17:22:29 -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 e2ff0a6a94 CC-2920: Playlist: soundcloud icon appears multiple time when 
click on reupload to soundcloud

- fixed
 2011-10-03 16:50:50 -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 79519e25c2 CC-2875: Soundcloud error icon 
- fixed
 2011-10-03 15:48:43 -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 4f11428b60 CC-2920: Playlist: soundcloud icon appears multiple time when 
click on reupload to soundcloud

- fixed
 2011-10-03 14:13:02 -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 c469f51eb3 CC-2908: Add "Live Stream" title to live stream popup window 
-done
 2011-09-30 11:45:51 -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 bd4c9f9651 CC-2899: Error on stream setting page can be hidden by a collapsed section 
- fixed
 2011-09-29 12:03:11 -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 ac13bba2db CC-2874: adding error icon 
- done
 2011-09-22 17:06:33 -04:00
James e722ff8c36 CC-2873: soundcloud error log to DB 
- fixed
 2011-09-22 16:59:13 -04:00
James dbb4183447 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 15:53:47 -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 350aaf2335 Merge branch '1.9.1' into devel 2011-09-22 14:33:14 -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 3fe823f84c CC-2363: Diagnostic screen in Web UI 
-Change disk numbers to start at one instead of zero.
 2011-09-22 12:28:21 -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