44dccf15ce
CC-3335 : Timeline - Drag and drop usability improvements
...
dragging and dropping multiple files is working.
2012-02-17 15:53:10 +01:00
ac11d8bcf6
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
b2d0565ec4
CC-3174 : showbuilder
...
checking to make sure UI is up to date with db
2012-02-16 19:46:14 +01:00
e1d5d6de73
CC-3174 : showbuilder
...
checking modification time before deleting items.
Throws a ScheduleOutdatedException
2012-02-16 16:29:11 +01:00
f14ebce239
CC-3174 : showbuilder
...
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
2012-02-15 18:27:59 +01:00
190490d6f4
CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0)
...
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
2012-02-15 11:21:21 -05:00
b1fbeeb448
CC-3174 : showbuilder
...
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
54cbc86a0a
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Nowplaying.php
airtime_mvc/application/models/Show.php
airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
b7b1c401f6
CC-3174 : showbuilder
...
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
2012-02-14 13:33:25 +01:00
4f5b5d8562
CC-3174 : Show Content Builder
...
adding time filled/empty row data.
2012-02-13 18:29:39 +01:00
238abd6f87
CC-3324: Uncaught TypeError: Cannot read property 'length' of undefined - if watched dir not defined
2012-02-13 12:24:55 -05:00
fbd6df1986
CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
2012-02-12 15:31:17 -05:00
8493180243
CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.
...
-use clearstatcache function
2012-02-12 11:43:34 -05:00
941da1fe44
CC-3174 : showbuilder
...
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
fdd962f5ce
CC-3174 : showbuilder
...
replacing context menus on calendar screen.
2012-02-09 21:19:21 +01:00
103b4abdeb
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 11:42:44 -05:00
6c0f035b0b
CC-3307: airtime-full-install fails on Ubuntu 11.10
2012-02-08 11:42:21 -05:00
624669a6bf
CC-3273 : flash player
...
mp3 latency problem in firefox needed an extra option set in JPlayer
2012-02-08 17:39:16 +01:00
252777c3f9
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-08 15:14:33 +01:00
c23491b257
CC-3285 : show over booked error message
...
checking if percentage is over 100.
2012-02-08 15:13:17 +01:00
a2f38b94a2
CC-3174 : showbuilder
...
changing show context menus
2012-02-08 13:12:08 +01:00
581f86a1de
CC-3174 : showbuilder
...
show editing menu added.
2012-02-08 12:53:46 +01:00
216ce80ceb
CC-3174 : showbuilder
...
have to replace context menus on calendar page.
2012-02-08 11:16:23 +01:00
3728ffaddc
CC-3174 : showbuilder
...
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1
need to replace context menu on the page, old one doesn't work anymore anyways.
2012-02-07 23:58:36 +01:00
668e214371
CC-3174 : showbuilder
...
unsetting playlist id in the session properly.
2012-02-07 18:42:34 +01:00
251f3a3e5b
CC-3174 : showbuilder
...
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
2012-02-07 14:58:16 +01:00
5dcb033c84
CC-3297: Depend on zendframework and php-pear as external packages
...
-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
2012-02-06 20:28:38 -05:00
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
776d1b65e8
CC-3174 : showbuilder
...
fixing merge, testing that affected functionality still works.
2012-02-06 11:23:10 +01:00
42452b8ea9
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/models/Playlist.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
8212624c4a
CC-3174 : showbuilder
...
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
2012-02-06 01:51:22 +01:00
16863ee95e
CC-3174 : showbuilder/library
...
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
fbec92cb0d
CC-3174 : showbuilder/library
...
soundcloud icon stuff is back.
2012-02-05 19:48:23 +01:00
072e13a943
CC-3174 : showbuilder
...
add/delete buttons functions
still not displaying enable/disable when needed.
2012-02-05 19:11:48 +01:00
226a3ffbea
CC-3174 : showbuilder/lib refact
...
add button now functional for playlist,
still need to enable/disable when appropriate.
2012-02-05 18:46:52 +01:00
6c2475bf1f
CC-3174 : showbuilder
...
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
2012-02-05 18:19:22 +01:00
da5e1ac302
CC-3174 : showbuilder/library
...
adding new context menu, link to view on soundcloud doesn't seem to work.
2012-02-05 13:56:07 +01:00
e8f2506474
CC-3174 : showbuilder
...
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
2012-02-04 21:26:21 +01:00
38f3d6bfb0
CC-3174: showbuilder/library refactoring
...
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
46fdf56b70
CC-3174 : showbuilder
...
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
bdc9707052
CC-2970 : playlist drop indicator
...
looking into customizing the placeholder, connected library to playlist sortable.
2012-02-04 02:07:32 +01:00
19f069b602
CC-3174 : showbuilder
...
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
0afa904ffe
CC-3174 : showbuilder
...
refactoring playlists for the group add/delete
2012-02-03 18:15:10 +01:00
3b172f9c0c
CC-3174 : showbuilder
...
reset button is working.
2012-02-03 00:56:14 +01:00
11e7d813b6
CC-3174 : show builder
...
small modifications removing uneeded things.
2012-02-02 23:58:36 +01:00
7f9b497816
CC-3174 : showbuilder
...
removing unecessary things from the events.
2012-02-02 23:31:32 +01:00
6da4397a96
CC-3174 : show builder
...
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01:00
7317b1d5af
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
2012-02-02 15:59:35 -05:00
61fb8a4fb9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2012-02-02 14:49:08 -05:00
03329ad2cf
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00
e001cd24c1
CC-3174 : show builder
...
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
0199f572bd
CC-3174 : showbuilder
...
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +01:00
8b93b98e24
CC-3174 : show builder
...
removing widths where unneeded.
2012-02-02 01:33:53 +01:00
942cfaac25
CC-3174 : show builder
...
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
3aab811a3e
CC-3174 : showbuilder
...
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
f5b2a23eb1
CC-3174 : showbuilder
...
group add/delete is working
2012-02-01 18:47:08 +01:00
81d24b7825
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:49:53 -05:00
80d99f013a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:48:29 -05:00
fbda0e733b
CC-3174 : showbuilder
...
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
3f3117cf0e
CC-3174 : Show builder
...
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
f5761fd03c
CC-3174 : show builder
...
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
b0c3bace1c
CC-3174 : show builder
...
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01: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
2027db3609
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:12:19 -05:00
ecaebbeb67
CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones.
2012-01-23 19:07:07 +01:00
93dfb253c1
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-18 10:28:41 -05:00
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -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
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
424206b9a9
CC-3174 : Show Builder
...
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01:00
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
df33a457b1
Merge branch 'devel' into CC-3174
2012-01-16 09:58:02 +01:00
859213b760
CC-3174 Show Builder
...
experimenting
2012-01-16 09:56:57 +01: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
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
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
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
722306928b
CC-3114: Show Content Dialog doesn't display total time
...
Done
2012-01-04 17:15:15 -05:00
Naomi Aro
Daniel
Martin Konecny
James
Yuchen Wang