508c623850
-remove comments that should not have been committed
2012-03-01 18:00:46 -05:00
92f19139b9
CC-3336: Refactor schedule API used by pypo
...
-done
2012-02-29 21:27:42 -05:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
057e377c5f
Merge branch 'cc-3336-refactor-pypo' into devel
2012-02-28 19:49:48 -05:00
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
b572b26b68
CC-3336: Refactor schedule API used by pypo
...
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
8ae303de83
CC-3174 : showbuilder
...
need up to date version of datatables.
2012-02-27 12:42:04 +01:00
3cc1506086
CC-3358 : Metadata Qtip
2012-02-27 12:23:22 +01:00
446233fbd4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-24 14:15:06 -05:00
2f689ed583
CC-3346: Recorder: Merge recorder with pypo
...
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
19d13889af
CC-3351 : Track length should only show to tenths of a second in the library
...
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
d93041edb9
CC-3174 : showbuilder
...
change default value to prevent apache error logs.
2012-02-23 18:06:08 +01:00
753c05ce5b
CC-3335 : Timeline: Drag and drop usability improvements
...
cursor must be used to add tracks to timeline, not check boxes.
2012-02-23 17:46:07 +01:00
b357b80054
CC-3174 : showbuilder
...
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.
starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
aabcaafff0
CC-3174 : showbuilder
...
nowplaying uses current datatables.
2012-02-23 11:10:49 +01:00
4bc51cbad1
CC-3174 : showbuilder
...
forgotten unused var.
2012-02-23 11:01:52 +01:00
a1e8903a64
CC-3174 : showbuilder
...
fixing some errors found in apache log.
2012-02-22 22:25:14 +01:00
d4c7b832c9
CC-3174 : showbuilder
...
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
2012-02-22 18:38:33 +01:00
0ba3049528
CC-3174 : showbuilder
...
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
2aae318a5a
CC-3174 : showbuilder
...
remembering state for the timeline datatable.
2012-02-22 12:42:24 +01:00
5703508beb
CC-3174 : showbuilder
...
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
2012-02-22 11:43:37 +01:00
5f89975c64
CC-3174 : showbuilder
...
datatables state restore needs real booleans not strings.
2012-02-22 00:02:35 +01:00
9b5a0fc565
CC-3174 : showbuilder
...
working on trying to save/load state serialized into the db for datatables.
2012-02-21 17:31:54 +01:00
c0f16fac3c
CC-3174 : showbuilder
...
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
2012-02-20 18:24:04 +01:00
09ae26a531
CC-3174 : showbuilder
...
fixing bug moving item to beginning of show
2012-02-17 12:19:42 +01:00
ac11d8bcf6
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +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
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
14a9225b97
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-14 18:12:51 -05:00
14cd9ed0e9
CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which I've set ApiController and PluploadController todo on receipt of error code.
2012-02-14 18:12:29 -05: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
eadf68cb61
CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback
...
-fixed
2012-02-10 18:43:40 -05:00
babfa1830c
CC-3317: PHP Undefined variable error in SystemstatusController
...
-fixed
2012-02-10 13:12:18 -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
a4a41f301f
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-09 15:05:36 -05:00
b603726a39
CC-3289: Widgets should have a version string so users can make sure widgets are up to date
...
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
2012-02-09 15:04:52 -05:00
4691799326
Merge branch 'devel' into CC-3174
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2012-02-09 19:41:31 +01:00
33fcbddcb9
CC-3284: Don't make browser users clear their cache when Airtime is upgraded
...
- use airtime version string instead of filemtime function
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/ScheduleController.php
2012-02-08 16:21:57 -05:00
ba3cc45d36
CC-3284: Don't make browser users clear their cache when Airtime is upgraded
...
- use airtime version string instead of filemtime function
2012-02-08 15:57:42 -05:00
5d31e4c2a0
CC-3289: Widgets should have a version string so users can make sure widgets are up to date
...
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
2012-02-08 14:57:48 -05: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
9e08f857bf
CC-3174 : showbuilder
...
fixing merge with playlist tooltip
2012-02-06 11:59:20 +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
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
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
d6bf95500c
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
2012-02-03 18:19:13 -05: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
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
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
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
df73726961
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:10:31 -05:00
026bdebacc
CC-3293: Stream settings page does not remember the stream metadata format
...
- fixed
2012-02-01 12:09:59 -05:00
4ffe79a286
CC-3290: A file should be removed from playlists if it is removed
...
through the interface
- fixed
2012-02-01 10:59:04 -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
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
9f2d0fc8d5
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
2012-01-27 15:30:44 -05: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
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
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
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
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
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
Martin Konecny
Naomi Aro
James
Daniel
Martin Konecny
james
Yuchen Wang