228a9787a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 10:59:43 -05:00
df22ab21a6
CC-3359: Now Playing -> Day view has a bug with supporting UTC time
...
-fixed
2012-03-02 16:32:16 -05:00
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
6c749075ac
CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
...
chaning column name to playout_status
2012-03-02 12:22:08 +01:00
d03d01bce9
CC-3366: Pypo: Use local files instead of downloading them
...
-done
2012-03-01 18:00:46 -05:00
f8e7d6eae3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-01 15:35:21 -05:00
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
b813ba1035
CC-3174 : showbuilder
...
making a time filled formatter to take the code out of show builder.
2012-03-01 17:25:37 +01:00
1c43edb40b
CC-3174 : showbuilder
2012-03-01 17:05:50 +01:00
3bfbe036c7
CC-3174 : showbuilder
...
using the new status column in cc_schedule to colour boundary/overbooked tracks.
2012-03-01 15:09:13 +01:00
0f9800a6bd
CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
2012-03-01 14:59:06 +01:00
f8608f3511
CC-3174 : showbuilder
...
percent calculation for shows was off.
2012-03-01 12:13:21 +01:00
b7e5bfe4aa
CC-3174 : showbuilder
...
changing cues/cliplengths to be interval column type.
2012-03-01 11:48:57 +01:00
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
8b540017a5
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-29 14:55:30 -05:00
1deee3cb65
CC-3365: Airtime API returns a non-null value for next item when there is no next item.
...
- Improved check for determining if there is another element in the result set which is used to compute the next value.
2012-02-29 14:54:54 -05:00
a6413f2d1a
CC-3336: Refactor schedule API used by pypo
2012-02-28 22:33:19 -05:00
057e377c5f
Merge branch 'cc-3336-refactor-pypo' into devel
2012-02-28 19:49:48 -05:00
497715df44
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
11f31effca
CC-3336: Refactor schedule API used by pypo
2012-02-28 15:04:24 -05:00
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
a53d856e8d
CC-3336: Refactor schedule API used by pypo
...
-add comment
2012-02-28 14:56:21 -05:00
99c24ed038
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
413d669bbf
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
15552319aa
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- updated formating of file, removed tabs in favour of four spaces for some lines.
2012-02-28 13:47:57 -05:00
31abc21aaa
CC-3174 : showbuilder
...
make sure the scheduled item still exists, if not throw an error.
2012-02-28 17:16:43 +01:00
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +01:00
997782c73c
CC-3354 : playlist drag and drop
...
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
4514967ccd
CC-3359: Now Playing -> Day view has a bug with supporting UTC time
...
-fixed
2012-02-27 21:37:23 -05:00
fc2b18923e
CC-3337: Optimize Schedule/get-current-playlist/format/json
...
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
2012-02-27 18:09:30 -05:00
20a82abb23
CC-3174 : showbuilder
...
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
99d3699e71
CC-3174 : showbuilder
...
fades displayed in seconds.
2012-02-27 21:40:04 +01:00
43d67c921d
CC-3174 : showbuilder
...
adding cue/fade columns to table
fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
6ecf2f94b0
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-27 20:26:47 +01:00
e8f329aef1
CC-3336: Refactor schedule API used by pypo
2012-02-27 13:52:35 -05:00
f01a872bea
CC-3174 : showbuilder
...
remove extra ;
2012-02-27 14:59:48 +01:00
318a0345bb
CC-3174 : showbuilder
...
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
9c248bb34d
CC-3174 : showbuilder
...
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
4a02d12600
CC-3174 : showbuilder
...
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +01:00
36cf8ded18
CC-3174 : showbuilder
...
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +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
695535ae64
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 13:12:50 -05:00
4286de7b42
CC-3174 : showbuilder
...
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
3ff7d1ac18
CC-3174 : showbuilder
...
forgot to set cueout when scheduling just files.
2012-02-24 16:18:15 +01:00
c6edfc3208
CC-3174 : showbuilder
...
removing columns that no longer should be in cc_schedule.
changing cc_files length column to be of type interval.
adding length formatter to showbuilder.
2012-02-24 16:05:01 +01: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
28bb97acfa
CC-3174 : showbuilder
...
allow user to filter library by
files/playlists or all.
2012-02-24 00:55:20 +01:00
c665a3fa03
CC-3333 : showbuilder track colouring
...
tracks coloured if boundry/over.
needs better colour selection.
2012-02-23 22:23:21 +01:00
4631e199cc
CC-3336: Refactor schedule API used by pypo
...
-add comment
2012-02-23 15:20:25 -05:00
c433b08158
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-23 15:20:25 -05:00
bb300676cf
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-23 15:20:24 -05: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
da012af6ed
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-22 20:41:24 -05:00
c5c1dce4d6
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-22 17:29:49 -05:00
a1e8903a64
CC-3174 : showbuilder
...
fixing some errors found in apache log.
2012-02-22 22:25:14 +01:00
bb49914294
CC-3174 : showbuilder
...
bug fixed in datatables - thanks Allan!
2012-02-22 21:09:24 +01:00
8bbccb6f44
CC-3338: Optimize week display
...
The response time of the calendar varies depending on whether the week/day views filter or the month filter is used because of the additional percentage scheduled calculation per show instance. This added calculation results in more and heavier hits to the database, I've included the time_filled column in the original show query and have used that to calculate percentage and saved the db call.
2012-02-22 14:32:59 -05: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
80e33ee533
CC-3337: Optimize Schedule/get-current-playlist/format/json
...
- I've updated the logic to query the cc_schedule table directly for the previous, next, current shows which makes look up time much faster. If that doesn't work then I revert back to the previous logic, incase nothing is scheduled within an hour of the current time.
2012-02-22 11:36:48 -05:00
0ba3049528
CC-3174 : showbuilder
...
removing old scheduling method code to avoid confusion.
2012-02-22 13:19:49 +01:00
a633d69c8d
Merge branch 'CC-3174' into devel
2012-02-20 20:09:49 +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
17c3cdcfb2
CC-3174 : showbuilder
...
fix ordering problem with track column.
2012-02-20 11:41:44 +01:00
664584ec6b
CC-3331 : Optimize "Now Playing" to load in less than 1/2 second
...
- updated the CreateDatatableRows do perform a check and set on the last items end time. If the end time of the last item exceeds the show time's end I set the items end time to the show's end time.
2012-02-17 17:58:19 -05:00
c7f4b17e81
CC-3331: Optimize "Now Playing" to load in less than 1/2 second
...
- cleaned up sql statement Schedule's getScheduleItemsInRange
2012-02-17 17:08:47 -05:00
5dd94ce12c
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-17 16:49:44 -05:00
5cb99e9532
CC-3331: Optimize "Now Playing" to load in less than 1/2 second
...
- Reorganized the now playing to find all the scheduled items within two time frames instead of in a loop per show id.
- I've cut the time in half
2012-02-17 16:47:12 -05:00
0db3a45fcf
SAAS-196: Stats: Check if easy_install installation method detection
...
is working properly
- fixed
2012-02-17 15:40:37 -05:00
2ef6d230f9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-17 15:39:50 -05:00
bb1cdc4a8f
SAAS-196: Stats: Check if easy_install installation method detection
...
is working properly
- fixed
2012-02-17 15:39:31 -05:00
6d71ec8c9c
CC-3331 : Optimize "Now Playing" to load in less than 1/2 second
...
- The logic to build the NowPlaying list was updated to refactor the quering of the database for playlist tracks played from in the loop per show ID to outside the loop for a given duration. The resulting list was then partitioned off for each show.
2012-02-17 11:13:34 -05: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
9bed56a2c3
CC-3174 : showbuilder
...
incorrect variable name fixed for updating last scheduled timestamp.
2012-02-17 11:14:44 +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
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
eba84ee878
CC-3174 : showbuilder
...
disabling editing of past/current shows.
2012-02-14 14:44:46 +01: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
3df396756f
CC-3323: Don't send description text to Full Calendar since it is never used.
...
-Done
2012-02-13 12:10:23 -05:00
5059d13156
-handle case gracefully when pypo hasn't registered with Airtime server yet.
2012-02-12 01:34:53 -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
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
9fc0ed198e
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
2012-02-09 12:45:39 -05:00
cdc72beb6b
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
2012-02-08 17:56:26 -05:00
6254467e02
CC-3305: 404 Error after meta data edit on Airtime Pro
...
-Fixed
2012-02-08 16:17:18 -05:00
d257ddf482
CC-3285 : Nowplaying
...
nowplaying didn't show correct start date if show crossed 0:00 boundry.
2012-02-08 16:00:37 +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
529f3fa52f
CC-3174 : showbuilder
...
forgot to actually return fades.... heh
2012-02-07 17:52:04 +01:00
Daniel
Martin Konecny
Naomi Aro
James
Martin Konecny