Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6084 commits 3 branches 0 tags 405 MiB
Commit graph

834 commits

Author SHA1 Message Date
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