e05e2ea49c
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2012-01-27 15:37:53 -05:00
5026da56cb
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:14:27 -05:00
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
3a8ba36e0d
SAAS-155: Add possibility to show additional information on
...
login page (for demo site)
- username and password are auto filled on demo site
- added informative msg on demo site about username and password
2012-01-17 14:47:26 -05:00
ff428d2c4f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-17 11:35:48 -05:00
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
3588cca654
CC-3258 : Deleting a rebroadcasting show deletes also the recorded show
2012-01-17 14:11:12 +01:00
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
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
c82394b7a0
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:57:02 -05:00
ccef97190a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-13 16:56:29 -05:00
bcbbf42f62
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:56:02 -05:00
d753b0bb02
CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?"
...
Done
2012-01-13 16:46:37 -05:00
9629e2bbae
Merge branch 'group_action_playlist_builder' into devel
2012-01-13 14:21:29 -05:00
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
b215d816ac
CC-3186: Design tweaks for tooltip
...
Updated the icon to make it stand out more
2012-01-13 10:28:42 -05:00
41b072b412
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-12 17:55:25 -05:00
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
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
04b592b831
CC-3245: upgrade 1.8->2.0 cause error in show recorder
...
- fixed
2012-01-12 16:36:14 -05:00
044f511455
SAAS-141: Tweaks for trial balloon
...
Done
2012-01-12 15:47:08 -05:00
6b7523513e
Merge branch 'group_action_playlist_builder' into devel
2012-01-12 14:28:12 -05:00
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
4a372715a3
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-12 12:19:05 -05:00
67ddda4a2d
-Remove phing path from conf.php
2012-01-12 12:16:10 -05:00
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
d1de836a92
-make rabbitmq_host configurable via $_SERVER var (.htaccess etc.)
2012-01-11 16:28:03 -05:00
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
561b508162
Merge branch 'group_action_playlist_builder' into devel
2012-01-11 15:38:05 -05:00
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
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
f6f1b143d7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-11 12:18:28 -05:00
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
f3ce8e77d1
Merge branch 'group_action_playlist_builder' into devel
2012-01-11 10:42:35 -05:00
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
ef141625a3
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 14:46:31 -05:00
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
7f6d3cd942
Merge branch 'group_action_playlist_builder' into devel
2012-01-10 09:54:55 -05:00
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
6e48d6eafc
CC-3229: JavaScript files under airtime_mvc/public/js/datatables/unit_testing/tests_onhold are chmod executable
...
-fixed by removing
2012-01-09 17:57:08 -05:00
c3430e5411
-various optimizations
2012-01-09 17:47:58 -05:00
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
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
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
f025dccc4f
CC-1986: Configurable columns for media search
...
Modified dataTables.ColVis.js plugin to make it work...
2012-01-07 11:55:55 -05:00
6597f6701a
CC-1986: Configurable columns for media search
...
Adding ColVis plugin for datatable, this plugin can be used to Show/Hide columns
2012-01-07 10:03:54 -05:00
61c5355e8a
cc-2977: getting close!!!
2012-01-06 15:47:11 -05:00
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
14b7fd03bb
-remove show-recorder from status page if saas enabled.
2012-01-04 18:57:28 -05:00
722306928b
CC-3114: Show Content Dialog doesn't display total time
...
Done
2012-01-04 17:15:15 -05:00
james
James
Naomi Aro
Martin Konecny
Yuchen Wang