Commit Graph

6362 Commits

Author SHA1 Message Date
Martin Konecny 9a64c49ef0 CC-3237: Remove phing dependency of end user database installation
-Done
2012-01-16 13:48:43 -05:00
Martin Konecny 9d7a0f31ca CC-3254: lsb-release package should be installed by install_full scripts
-fixed
2012-01-16 13:47:50 -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
martin 6add525fb1 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-13 18:31:21 -05:00
martin 229db4cdb0 -small fix for debian upgrade-test script 2012-01-13 18:30:59 -05: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 d8ca0cc393 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:46:56 -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
James f9aab1b5ac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:26:38 -05:00
James ecdd957525 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
2012-01-13 16:25:56 -05:00
James a24310e690 CC-3245: upgrade 1.8->2.0 cause error in show recorder
- new cofig field was missing from recorder.cfg.200
- better log when execption happens
2012-01-13 16:24:16 -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
Yuchen Wang b215d816ac CC-3186: Design tweaks for tooltip
Updated the icon to make it stand out more
2012-01-13 10:28:42 -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
Martin Konecny fd622a630e Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 15:50:05 -05:00
Martin Konecny 69275066af CC-3237: Remove phing dependency of end user database installation
-remove phing from airtime-full-install
2012-01-12 15:49:53 -05:00
Yuchen Wang d7f2341725 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 15:48:05 -05:00
Yuchen Wang 044f511455 SAAS-141: Tweaks for trial balloon
Done
2012-01-12 15:47:08 -05:00
Martin Konecny e70b490327 -fix for when airtime dir exists from previous Airtime installation (fab_release_test.py) 2012-01-12 15:07:55 -05:00
Martin Konecny 793909bafc Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 14:31:48 -05:00
Martin Konecny 982a55371d -another debian fix 2012-01-12 14:30:28 -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
martin 95e746f102 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 14:22:42 -05:00
martin e8157d1f5d -small fix to upgrade test script 2012-01-12 14:22:36 -05:00
Martin Konecny e0828c9b82 --force-yes on apt-get for debian's sake. 2012-01-12 14:09:39 -05:00
Martin Konecny 461044fdd5 re-add required apt repository for debian..not sure why I commented this out. 2012-01-12 14:06:21 -05:00
Martin Konecny cb3cb5b48c CC-3237: Remove phing dependency of end user database installation
-Done
2012-01-12 13:34:27 -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
Yuchen Wang 561b508162 Merge branch 'group_action_playlist_builder' into devel 2012-01-11 15:38:05 -05:00
Yuchen Wang 09df61d027 CC-1977: Allow multiple files to be selected and acted upon in the library and playlist
Fixed the bug where checkbox change events get handled multiple times
2012-01-11 15:36:45 -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