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

836 Commits

Author SHA1 Message Date
James ff428d2c4f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-17 11:35:48 -05:00
James dae7e73a84 CC-3250: UI design for mount monitor for media monitor 
( Manage Media Folder and Playlist Builder screen)

- initial commit
 2012-01-17 11:35:31 -05:00
Naomi Aro 3588cca654 CC-3258 : Deleting a rebroadcasting show deletes also the recorded show 2012-01-17 14:11:12 +01:00
Naomi Aro a69be24831 CC-3256 : Recorded/repeated/rebroadcast is invalid after show update 
only the original rebroadcasts are left when toggling the repeat option.
 2012-01-17 12:45:05 +01:00
Naomi Aro 424206b9a9 CC-3174 : Show Builder 
data tables column resizing, starting separating out events.
 2012-01-17 11:18:17 +01:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Naomi Aro df33a457b1 Merge branch 'devel' into CC-3174 2012-01-16 09:58:02 +01:00
Naomi Aro 859213b760 CC-3174 Show Builder 
experimenting
 2012-01-16 09:56:57 +01:00
James c82394b7a0 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:57:02 -05:00
James ccef97190a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:56:29 -05:00
James bcbbf42f62 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:56:02 -05:00
Yuchen Wang d753b0bb02 CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?" 
Done
 2012-01-13 16:46:37 -05:00
Yuchen Wang 9629e2bbae Merge branch 'group_action_playlist_builder' into devel 2012-01-13 14:21:29 -05:00
Yuchen Wang 258521ffbf CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
 2012-01-13 14:17:39 -05:00
James 41b072b412 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-12 17:55:25 -05:00
James 08a09e4096 CC-2977: Never delete files from the database 
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
 2012-01-12 17:55:05 -05:00
James 09d50e7e25 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 16:38:21 -05:00
James 04b592b831 CC-3245: upgrade 1.8->2.0 cause error in show recorder 
- fixed
 2012-01-12 16:36:14 -05:00
Yuchen Wang 044f511455 SAAS-141: Tweaks for trial balloon 
Done
 2012-01-12 15:47:08 -05:00
Yuchen Wang 6b7523513e Merge branch 'group_action_playlist_builder' into devel 2012-01-12 14:28:12 -05:00
Yuchen Wang 186aa9e898 CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
Fixed bugs introduced by backend changes from before
 2012-01-12 14:27:43 -05:00
Yuchen Wang 4a372715a3 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter 
Fixed
 2012-01-12 12:19:05 -05:00
Martin Konecny 67ddda4a2d -Remove phing path from conf.php 2012-01-12 12:16:10 -05:00
Martin Konecny 79141fa070 CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends 
-Fixed
 2012-01-12 12:14:38 -05:00
Martin Konecny d1de836a92 -make rabbitmq_host configurable via $_SERVER var (.htaccess etc.) 2012-01-11 16:28:03 -05:00
Martin Konecny 4f546a1bc3 CC-3238: When ICEcast is not on local host, Jplayer is not playing anything 
-fixed with workaround to show the user what ip they're listening on.
 2012-01-11 16:27:14 -05:00
James d5d4d50a9e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/om/BaseCcFiles.php
	airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
 2012-01-11 12:31:54 -05:00
James f6f1b143d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-11 12:18:28 -05:00
James 04b48d47cc CC-2977: Never delete files from the database 
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
 2012-01-11 12:17:48 -05:00
Yuchen Wang f3ce8e77d1 Merge branch 'group_action_playlist_builder' into devel 2012-01-11 10:42:35 -05:00
Yuchen Wang cf045652ec CC-1986: Configurable columns for media search 
- Fixed some hardcoded array access
- Fix js error in ColReorder
 2012-01-11 10:41:58 -05:00
Yuchen Wang ef141625a3 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 14:46:31 -05:00
Yuchen Wang d1d01e55ce CC-1986: Configurable columns for media search 
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
 2012-01-10 14:45:43 -05:00
Yuchen Wang 7f6d3cd942 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 09:54:55 -05:00
Yuchen Wang 7d9aa3ca5d CC-2299: Better column options in playlist/file list on playlist builder 
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
 2012-01-10 09:52:32 -05:00
Martin Konecny c3430e5411 -various optimizations 2012-01-09 17:47:58 -05:00
Yuchen Wang 7a27be878b CC-1986: Configurable columns for media search 
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
 2012-01-08 22:31:18 -05:00
Yuchen Wang a1ccb9c42a CC-1986: Configurable columns for media search 
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
 2012-01-08 10:33:11 -05:00
Yuchen Wang 8833f4462e CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
 2012-01-07 23:37:37 -05:00
James 61c5355e8a cc-2977: getting close!!! 2012-01-06 15:47:11 -05:00
Yuchen Wang 1044881666 CC-3114: Show Content Dialog doesn't display total time 
Somehow this file didn't get committed...
 2012-01-05 10:30:37 -05:00
Martin Konecny 14b7fd03bb -remove show-recorder from status page if saas enabled. 2012-01-04 18:57:28 -05:00
Yuchen Wang 722306928b CC-3114: Show Content Dialog doesn't display total time 
Done
 2012-01-04 17:15:15 -05:00
Yuchen Wang 1c9b134748 CC-3183: recorder shows have extra 1ms which cause the now playing to report the show exceeding its time 
Done
 2012-01-04 17:10:14 -05:00
Yuchen Wang 0df23305a0 CC-2237: Default fade time should be non-zero number of seconds 
Done
 2012-01-04 17:09:16 -05:00
Yuchen Wang 476484a269 CC-2985: Pop-up metadata box in Playlist Builder does not show Language field 
Done
 2012-01-04 17:08:38 -05:00
Yuchen Wang a63d975fce CC-2355: Repeating show should default to 'No End' 
Done
 2012-01-04 17:06:58 -05:00
Martin Konecny e9634f94a1 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-04 14:31:50 -05:00
Martin Konecny 7247f75563 SAAS-135: Airtime status page reporting free space being incorrectly for Gluster FS mounts 
-Done
 2012-01-04 14:18:40 -05:00
James 5fa92f3d17 - temp commit on group action 2012-01-04 12:47:27 -05:00
Naomi Aro 905775552d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-27 14:34:27 -08:00
Naomi Aro 53d504f26e CC-3110 : Password reset 2011-12-27 14:33:22 -08:00
james 9216da7f03 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-24 11:03:02 -05:00
james c9c6a08a1c CC-3220: Stream Setting: Status box is stuck on waiting if nothing is 
changed and click save

- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
 2011-12-24 10:59:09 -05:00
Martin Konecny f4449865cc Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-22 17:21:43 -05:00
Martin Konecny a55b47efff -Allow etc and stor directories to be configurable 2011-12-22 17:21:18 -05:00
james 9665c970af CC-3218: Stream-settings: Spaces and other illegal characters should not be 
allowed in the fields: server, username, password, URL, and mount point

- adding an another mask for domain name. Front and backend
 2011-12-22 15:35:46 -05:00
Naomi Aro 52b0e3c5f9 CC-3110 : Password reset 
basic functionality password reset using sendmail
 2011-12-21 16:01:29 -08: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
James 8b37c5d4da CC-3215: When you click on Playlist Builder, for a brief instant you see 
the library table headings with different columns

- fixed
 2011-12-20 11:32:46 -05:00
James 7086444247 SAAS-94: Phone home metrics: Gather info about streaming setup 
- fixed comment
 2011-12-19 15:45:44 -05:00
James 018fa1d79c CC-3213: Customer is unable to save Fade Out/Cue out for playlists 
- fixed cue out/in issue
 2011-12-19 14:55:23 -05:00
Martin Konecny cdcdd9227d -add vhost support 2011-12-19 00:11:45 -05:00
Martin Konecny 8d369e662d -make airtime.conf selectable in conf.php 2011-12-18 23:44:19 -05:00
Yuchen Wang f6670b001f CC-3202: Airtime/Sourcefabric/GNU GPL v.3 links in Help->About should be opened in a new tab 
Done
 2011-12-14 22:29:02 -05:00
Yuchen Wang 150ea0baaf Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-14 22:21:58 -05:00
Yuchen Wang b42d217684 CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show 
Show the menu item when the show is rebroadcasting.
 2011-12-14 22:21:02 -05:00
James 7c81fa29eb CC-3192: Problem with web uploads for Airtime 2.0.0 beta2 
- The bug was introduced with CC-3086. When file is large enough so
the pluload use chucking, it would create different temp name for each
chuck.
- Fixed it by using unique_name feature on plupload
 2011-12-14 15:58:26 -05:00
Yuchen Wang 7542d86b94 CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show 
Fixed by checking if the show is a repeating show.
 2011-12-14 10:12:17 -05:00
Martin Konecny 9bbe1d14fa -remove persistent connections from DB connections 2011-12-13 17:16:45 -05:00
Naomi Aro e81c14c1db CC-3185 : Live show can be dragged into a future date after the rebroadcasting 2011-12-13 13:04:03 +01: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
Naomi Aro 9275b21f48 CC-3177 : editing a show in the calendar brakes show edit form 2011-12-13 11:10:04 +01:00
Naomi Aro c887fec86b CC-3179 : shows populated date must be timestamp. 2011-12-12 21:11:05 +01:00
Naomi Aro 85b2bf6e55 CC-3181 : re-uploaded to soundcloud creates the file name in a different format 2011-12-12 16:04:16 +01:00
Naomi Aro 72952024b7 CC-3177 : editing a show in the calendar brakes show edit form 
will only update shows if the duration is 24:00 or less.
 2011-12-12 12:11:31 +01:00
Yuchen Wang 1b8e1455d6 SAAS-101: "Buy Now" link needs to pop up a new window when you click on it 
Done
 2011-12-09 13:51:20 -05:00
Yuchen Wang 106b54b6f4 CC-3168: Stream Settings: "Vorbis Metadata" confusing string 
href='#' is not needed, removing it
 2011-12-09 13:50:55 -05:00
Yuchen Wang c3b6203628 CC-3168: Stream Settings: "Vorbis Metadata" confusing string 
Done
 2011-12-09 13:42:03 -05:00
Yuchen Wang e583511b21 SAAS-57: Add LiveChat to Airtime Pro 
Didn't consider the case of client_id being an empty string,
thus making the javascript syntax invalid
 2011-12-09 12:37:31 -05:00
Yuchen Wang 343cd8274d SAAS-57: Add LiveChat to Airtime Pro 
Forgot to remove the code from ApiController...
 2011-12-09 11:25:50 -05:00
Yuchen Wang 764d6c3347 SAAS-57: Add LiveChat to Airtime Pro 
Create a javascript variable to hold the client_id
 2011-12-09 11:12:42 -05:00
Yuchen Wang 2d04d7eb83 SAAS-57: Add LiveChat to Airtime Pro 
Fixing the issue of livechat showing up in the stream player pop-up
 2011-12-08 18:04:32 -05:00
Yuchen Wang 83f02c3408 SAAS-57: Add LiveChat to Airtime Pro 
Adding client_id getter/setter to preference
 2011-12-08 17:23:46 -05:00
Yuchen Wang c49cd436fa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-08 16:46:13 -05:00
Yuchen Wang 201667936c SAAS-57: Add LiveChat to Airtime Pro 
Adding code to non-saas side
 2011-12-08 16:45:11 -05:00
Naomi Aro 36d9b15435 CC-3150 : Editor box still open with show details for a deleted show 2011-12-08 17:49:00 +01:00
James fd10393b01 SAAS-94: Phone home metrics: Gather info about streaming setup 
- changes in Airtime repo side
- phone home stat sends stream info to data collection server
 2011-12-07 10:31:16 -05:00
Yuchen Wang af3b75bab4 SAAS-95: Trial Box: Change "Keep Going On" to "Buy Now" 
Done
 2011-12-05 19:50:42 -05:00
Yuchen Wang 9523174a0f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-05 16:27:27 -05:00
Yuchen Wang 6591523452 SAAS-93: Switch link for Trial box 
Done.
 2011-12-05 16:27:17 -05:00
Martin Konecny 73c0408315 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed. 
-fixed
 2011-12-05 12:56:16 -05:00
Martin Konecny 0440eb7539 CC-3160: Once Hardware dropdown is changed, stream information does not refresh 
-fixed
 2011-12-05 12:34:11 -05:00
Martin Konecny 20f0f5e523 CC-2926: Clicking "Choose File" in support settings to upload image defaults to "Audio/MPEG" type in Chrome 
-Fixed.
 2011-12-05 12:04:02 -05:00
Martin Konecny 2bf4c93e5c CC-3160: Once Hardware dropdown is changed, stream information does not refresh 
-Fixed one error...a few more to go.
 2011-12-04 21:47:11 -05:00
Martin Konecny 5a4b4ba421 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-02 16:23:03 -05:00
Martin Konecny efbaebbbf5 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed. 
-fixed
 2011-12-02 16:22:54 -05:00
Martin Konecny 82f3a25f69 -set log path earlier 2011-12-02 15:06:21 -05:00
Yuchen Wang ee5b675562 CC-3147: Change text in help > Getting Started: "Only admins can add shows." 
Fixed
 2011-12-02 13:57:40 -05:00
Yuchen Wang 9991cbd16b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-02 13:55:39 -05:00