1bb04296a9
CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)
...
- the regular exp check in model class was wrong
2012-04-13 12:05:59 -04:00
ef908ee894
CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences)
2012-04-13 11:09:52 +02:00
6e1bf50009
CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly
...
- fixed
2012-04-12 18:49:24 -04:00
fd700c225c
CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files
...
be remover from server
- RecallByMd5() was checking against all cc_files entries which includes
deleted files
2012-04-12 17:37:14 -04:00
c706bc32fd
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- fixed
2012-04-12 17:23:26 -04:00
d4533ca545
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 17:19:03 -04:00
c6ad9462af
CC-3634: Media Folder: if file was deleted from file system, and the file
...
was scheduled in the future, it wasn't getting deleted from Airtime
- fixed a bug
2012-04-12 17:18:45 -04:00
62cd704d1c
--added comment
2012-04-12 17:12:43 -04:00
9d4a474521
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 17:07:27 -04:00
fe68d0fc87
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-12 16:25:01 -04:00
f522c7a7af
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 16:17:36 -04:00
53e37ee826
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't getting deleted from AIrtime
- fixed
2012-04-12 16:17:19 -04:00
c2db20f004
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-cleanup
2012-04-12 15:10:40 -04:00
bfed474b7b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:41:18 -04:00
a2fedaa3f1
CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show
...
-fixed
2012-04-12 13:36:45 -04:00
83d78eb0dd
-check if exec function is available before using it
2012-04-12 13:36:36 -04:00
380094b4cc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 13:29:58 -04:00
04718a88ae
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-done
2012-04-12 13:29:49 -04:00
4ef18fb00f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 12:22:36 -04:00
c90a8006cc
CC-3622: When changing location of the stor directory, the "organize"
...
ubfolder is not being created.
- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
2012-04-12 12:22:20 -04:00
0486d33e27
Merge branch 'CC-3174' into devel
2012-04-12 18:12:01 +02:00
adddd1085c
CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment
...
added a flag whether to check user permissions or not.
2012-04-12 18:00:38 +02:00
8303eb728e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-12 11:54:58 -04:00
5a8df0321e
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-12 11:54:51 -04:00
d06b3573e9
CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO")
...
-fixed
2012-04-11 19:22:47 -04:00
bdd3444acf
CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
...
-in progress
2012-04-11 16:45:03 -04:00
f0be7cc995
- comments and removing logging
2012-04-11 16:06:10 -04:00
8f197115ae
CC-3618: Current playing Text Field in Dashboard alternates between "Nothing
...
Scheduled" and "current playing song"
- fixed
2012-04-11 15:54:03 -04:00
13502b4c08
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-11 12:27:54 -04:00
f82aef2a85
CC-3566: Preferences->"Fade In" is not respected when Show starts
...
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
2012-04-11 12:27:41 -04:00
a09a31bc88
CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
...
-pypo side fixed
2012-04-10 23:13:52 -04:00
428d04d77f
CC-3605 : Create 2.1 upgrades
2012-04-10 18:07:39 +02:00
b998a04c2e
Merge branch 'devel' into CC-3174
2012-04-10 15:57:13 +02:00
1dcced18ac
CC-3605 : Create 2.1 upgrades
2012-04-10 14:45:48 +02:00
954fa2bceb
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
35a89e0308
CC-3174 : timeline
2012-04-05 15:52:16 +02:00
0b3809c379
CC-3110 : Password reset
...
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
cde8e07c0b
CC-3581: Calendar->It should not be possible to change the duration for
...
the recorded show
- fixed
2012-04-04 16:26:28 -04:00
5da7d42290
CC-3548: Schedule: Separate repeate show template and single instance on
...
'When' section
- UI portion of the feature
2012-04-04 14:53:26 -04:00
366ea78fce
CC-3532: Now Playing GUI-> Progress bar is still playing after end of show
...
-fixed
2012-04-03 18:29:36 -04:00
edcce7432d
CC-3409: System status page times out if monit is not running.
...
-Fixed
2012-04-03 17:38:59 -04:00
4cb64b0eb1
CC-3569: Update total track metric to only report tracks that exist
...
- fixed
2012-04-03 15:53:55 -04:00
057ca55074
CC-3589 : Send cancel recording message to pypo
2012-04-03 18:43:13 +02:00
711105aade
CC-3588 : Cancelling Empty Show gives "Invalid Request"
2012-04-03 18:26:04 +02:00
d2d45dcae6
CC-3587 : index problem in scheduling.
2012-04-03 17:56:50 +02:00
079862d2f2
CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date"
2012-04-03 16:11:53 +02:00
5dfaa00c25
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-03 11:15:22 +02:00
2e88801dad
CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next
...
-fixed
2012-04-02 17:28:05 -04:00
c5b761bff3
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:31:02 +02:00
eeb7273909
CC-3542 : When you delete the current show it takes all songs from that show out of the playout history
2012-04-02 15:20:13 +02:00
b39db57d0c
CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed
2012-03-30 14:45:30 +02:00
9e9ae11725
CC-3551 : Change Cue Out for currently deleted track
2012-03-30 12:24:55 +02:00
5b65b56b93
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-29 16:57:49 -04:00
7325d51ada
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
2012-03-29 16:57:28 -04:00
cea37774ca
CC-3551 : Change Cue Out for currently deleted track
2012-03-29 19:20:02 +02:00
5a24331ef6
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 17:37:18 +02:00
12b23443db
CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog.
2012-03-29 16:27:08 +02:00
0746115d2c
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-29 11:06:57 +02:00
4f5d7efaa1
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- done
2012-03-28 15:12:01 -04:00
d12ef1c7a2
CC-3536 : Work out ACL with library on NowPlaying when it's a guest User
2012-03-28 18:43:44 +02:00
4904a16ebb
CC-3534 : Check Scheduling Edge Cases
...
extracting out error checking in scheduling, added created column to cc_showinstances
2012-03-28 14:23:25 +02:00
b70773489a
CC-3534 : Check Scheduling Edge Cases
...
not allowing users to add to a show that has ended.
2012-03-28 10:50:02 +02:00
9c52b2ee1f
CC-3174 : showbuilder
...
fixing jplayer preview
2012-03-27 16:27:43 +02:00
296a5c583a
CC-3407 : Timeline: Display if tracks are missing on disk
2012-03-27 15:16:07 +02:00
451b573c52
Merge branch 'CC-3174' into devel
2012-03-27 14:14:58 +02:00
2956009f42
CC-3451 : Ability to delete the currently playing clip
2012-03-27 14:11:36 +02:00
10e4ae781f
CC-3451 : Ability to delete the currently playing clip
2012-03-27 12:44:48 +02:00
3f713ca8dc
CC-3426: apache log errors from plupload
...
-fixed
2012-03-26 19:00:40 -04:00
d7af91f306
CC-3520: Change default password of monit
...
-done
2012-03-26 17:59:44 -04:00
1a4e6c563b
cc-3476: dynamic timeout
2012-03-26 14:33:33 -04:00
c301cd5256
cc-3476: dynamic timeout
2012-03-26 14:33:33 -04:00
275faa1881
CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time
2012-03-26 19:08:52 +02:00
1ccf63ab0b
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-22 16:24:38 -04:00
f8d3a8c8bb
CC-3449: Live Stream: Kick out live dj at the end of the show
...
- PHP side implementation
2012-03-22 16:23:59 -04:00
1fdb3cf163
CC-3360 : Timeline Css
...
adding Css to timeline.
2012-03-22 18:04:22 +01:00
6b768c2f99
CC-3483: Live Stream: default fade in/out for live stream transition
...
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
d4142f8b8b
CC-3484: Pypo: On bootup, it should grab station name and stream
...
label for liquidsoap
- fixed
- created new function set_bootstrap_variables()
2012-03-20 16:41:15 -04:00
e76cffd8b0
CC-3463 : timeline usability
...
moving multiple files within the timeline.
2012-03-20 17:55:35 +01:00
8105c6571c
CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added
...
if something is added after a footer, it will be added to the end of whatever is before the footer.
2012-03-19 14:48:11 +01:00
9509c70595
CC-3453 : Playlist
...
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
2012-03-19 14:09:05 +01:00
22cc362f1c
CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore
...
-done
2012-03-17 23:51:58 -04:00
9be6f1bd0e
CC-3464: Playout forward cache should be configurable
...
-Done
2012-03-17 14:53:15 -04:00
77e1c1c0cb
CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled.
...
-added check to make the code do nothing when a previous, current and next show id aren't specified.
2012-03-16 17:13:32 -04:00
8a34023336
CC-3465: Now playing should show tracks over shows for previous and next
...
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
2012-03-16 14:02:53 -04:00
5b953443c6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
ae0d3c560c
CC-3394: Add play button to timeline table.
...
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
4595da9087
CC-3452: Live Stream: DJs assigned to the show and Program Managers should
...
be able to control switches and able to kick out connection
- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
2012-03-15 14:29:31 -04:00
79f8eabe2b
CC-3405: Display to users how to connect a live stream to Airtime
...
- Done
2012-03-14 14:43:10 -04:00
540f262a77
CC-3224: "On-the-fly" stream rebroadcasting
...
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
f193047a1c
CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
...
are connected and give user the ability to block those streams
- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
d4a387e113
- adding switch to liquidsoap
2012-03-14 14:41:00 -04:00
dfe87723f0
- bug fix in stream setting
...
- testing lisquidsoap
2012-03-14 14:41:00 -04:00
128a497059
CC-3224: "On-the-fly" stream rebroadcasting
...
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
1ebe3d1812
CC-3224: "On-the-fly" stream rebroadcasting
...
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
30901aa0d6
CC-3224: "On-the-fly" stream rebroadcasting
...
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
48bb19d758
CC-3224: "On-the-fly" stream rebroadcasting
...
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
701ed82f40
CC-3224: "On-the-fly" stream rebroadcasting
...
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
ca04a7a686
CC-3224: "On-the-fly" stream rebroadcasting
...
- Form in preference section
2012-03-14 14:41:00 -04:00
f399c7adab
CC-3426: apache log errors from plupload
...
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
and normal uploads that are small enough to be copied
2012-03-14 11:14:22 -04:00
a65ea6d058
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
2012-03-13 17:46:13 -04:00
48c8607d17
CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
...
-added brackets around other if condition
2012-03-13 11:34:43 -04:00
13e3197ebf
CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song
...
- added brackets to an statement
2012-03-13 11:31:24 -04:00
1e4d34447a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2012-03-13 10:23:44 -04:00
cbaeda1d6b
CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table
...
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
- if the previous track is null the previous show is sent back as an example of the algorithm.
2012-03-13 10:21:01 -04:00
6f270bfb3d
Merge branch '2.0.x' into devel
...
Conflicts:
VERSION
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
install_minimal/include/airtime-constants.php
python_apps/api_clients/api_client.py
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
3145c24ba2
CC-3174 : showbuilder
...
changing queries for datatables to use the Datatables model class.
2012-03-12 15:32:24 +01:00
41a46b3144
CC-3174 : showbuilder
2012-03-12 15:02:34 +01:00
3b32a16813
CC-3174 : showbuilder
...
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25:03 +01:00
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
c66b55ec17
CC-733 : playout history
...
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01:00
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +01:00
fe3c340a90
CC-3174 : showbuilder
...
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
a4d07b3060
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +01:00
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
157078b963
Merge branch 'CC-3174' into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
6c5f710329
CC-3174 : showbuilder
...
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
c0f83a0e02
CC-3387: Error with accessing database on Now Playing view
...
-fixed
2012-03-06 00:05:06 -05:00
0dfcb77f1a
CC-3386: array access for "media_played" flag is hardcoded to 0
...
-fixed
2012-03-05 23:53:25 -05:00
348011dbc3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 19:03:23 -05:00
9715de11f5
CC-3372: Improved pypo cache delete
...
-Done
2012-03-05 19:02:46 -05:00
a09b63b8d0
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
a246f85a5b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
51f004933b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated icon in library
2012-03-05 19:00:14 -05:00
2de81c6027
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated logic removed when doing a rebase with devel
2012-03-05 19:00:14 -05:00
b8452928da
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
2012-03-05 19:00:14 -05:00
1aab682104
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
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
aa7afce245
CC-3174 : showbuilder
...
modifying times to work with scheduling times.
2012-02-07 17:29:52 +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
f651024a6e
CC-3174 : showbuilder
...
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
2012-02-07 13:29:50 +01:00
58b4576ae1
CC-3297: Depend on zendframework and php-pear as external packages
...
-DB dependency should now be externalized
2012-02-06 14:18:03 -05:00
d9947b622a
CC-3174 : showbuilder
...
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
613006e69c
CC-3174 : showbuilder
...
merge
2012-02-06 12:57:08 +01:00
e487b4a444
CC-3174 : showbuilder merges
...
adjusting format of default fade to not confuse DateTime.
2012-02-06 12:48:53 +01:00
9e08f857bf
CC-3174 : showbuilder
...
fixing merge with playlist tooltip
2012-02-06 11:59:20 +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
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
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
1deebedf11
CC-3174 : showbuilder
...
throwing an exception if playlist doesn't exist.
2012-02-03 18:28:35 +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
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
09ccac3384
CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
...
- Fixed refresh bug that results in storing to database a 00.000000 value instead of 00:00:00
2012-02-02 15:30:05 -05:00
James
Naomi Aro
denise
Martin Konecny
James
Daniel
james
Martin Konecny