58957cc919
CC-2301 : running dos2unix on 3 files.
2013-04-29 17:01:08 -04:00
410d298272
CC-2301 : creating an offset column to help create crossfades in the playlist.
...
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
1384c5d39d
Function call was missing an argument
2013-04-29 15:57:59 -04:00
71526a94cc
Merge branch 'cc-4961-show-linking'
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
de8f7b0ff7
CC-4961: Show linking
2013-04-29 15:27:14 -04:00
acfc72f422
use sendJson, instead of manually disabling layouts + encoding data
2013-04-26 18:06:07 -04:00
3a931f27bf
CC-4417: Opus codec support
2013-04-26 17:54:29 -04:00
a5264aac1e
CC-4961: Show linking
2013-04-26 16:10:01 -04:00
a4731d4af2
CC-2301 : automatically updating the fadein/fadeout for a track in the fadein/fadeout states.
...
Can enable states on a per track basis.
2013-04-26 15:57:02 -04:00
52655ab375
CC-4961: Show linking
2013-04-26 13:43:30 -04:00
8fea97d580
CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor.
2013-04-25 17:10:37 -04:00
0f1383d541
CC-4961: Show linking
2013-04-25 09:00:37 -04:00
0e3b4da52f
clear unused function
2013-04-24 15:17:06 -04:00
179621d687
CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks.
2013-04-24 14:15:07 -04:00
956bcccd24
CC-2301 : creating different states for the fade editor:
...
cursor, fadein, fadeout.
2013-04-23 16:36:35 -04:00
8f6b583fcb
CC-5061:
...
Use propel transactions for StoredFile class
2013-04-19 20:40:31 -04:00
243dda60f8
remove useless comment
2013-04-19 20:25:26 -04:00
fd78ad29bf
cleanup of function names
2013-04-19 20:24:05 -04:00
923f4ee180
CC-5062:
...
Add "error" logging level
-done
2013-04-19 20:11:33 -04:00
f39f9329cc
CC-4992:
...
Decouple pypo from Airtime install
-first commit
2013-04-19 20:10:51 -04:00
018ec9231e
don't print out anything extra after printing json
2013-04-18 16:20:34 -04:00
a9b5d00d87
CC-4961: Show linking
2013-04-18 16:12:26 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
04a0d9c54e
CC-2301 : waveform editor
...
current cues being set.
2013-04-17 18:00:16 -04:00
0d3c0912ba
CC-2301 : Waveform Editor
...
Cue editor can save values to the playlist.
2013-04-17 17:17:39 -04:00
0385285741
CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor.
2013-04-16 17:24:30 -04:00
13c8e5f146
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
2013-04-16 14:37:08 -04:00
1a2a05c3cf
CC-4961: Show linking
2013-04-12 16:34:36 -04:00
9b4a0ba9c1
CC-4961: Show linking
...
Removed stamp tables
2013-04-12 10:52:13 -04:00
9b2fb3bece
CC-4961: Show linking
2013-04-09 15:55:18 -04:00
e64f6fb3fd
CC-4961: Show linking
...
-modified db
2013-04-08 14:43:27 -04:00
76bfce21b1
CC-4961: Show linking
...
-modified db
2013-04-08 14:42:37 -04:00
cfee74693b
CC-4961: Show linking
...
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
62d1b22fcc
CC-4961: Show linking
...
created new cc_show_stamp table
2013-04-05 12:27:54 -04:00
f9d7167638
CC-4961: Show linking
2013-04-04 16:30:33 -04:00
fcbac2a044
Merge branch '2.3.x' into devel
2013-04-04 15:15:19 -04:00
301115c035
CC-5039: Encoded forward slash causing lots of apache error logs
...
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
d1e72cfeea
Merge branch '2.3.x' into devel
2013-04-03 17:12:28 -04:00
a748b05125
CC-5040:
...
All API actions need to have consistent return value
-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
81dbb17922
CC-4961: Show linking
...
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
5ac51e289d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-04-01 19:15:02 -04:00
6ae8da98e4
removing logging
2013-04-01 19:14:55 -04:00
ab10ae68a2
CC-5036: Add back edit show instance functionality
2013-04-01 14:42:35 -04:00
1eba09fc4c
Show linking
2013-03-28 16:19:05 -04:00
d0691b114c
Show linking
2013-03-28 14:25:40 -04:00
731b86b36c
Added back editing a repeating show instance feature
2013-03-27 16:25:39 -04:00
e259639d1a
Removed scheduleController private variable, currentUser
...
Removed showService private variable, currentUser
2013-03-27 09:02:49 -04:00
ee617c8a70
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/UserController.php
2013-03-26 16:34:11 -04:00
d9646994e9
remove airtime-demo specific code
2013-03-26 16:33:14 -04:00
5dc0a4477b
disable deletion of users
2013-03-26 16:10:42 -04:00
418bf0b5ff
Created calendar service and moved the context menu creation there
2013-03-26 16:03:53 -04:00
894887bd62
Merge branch '2.3.x' into devel
2013-03-26 15:02:17 -04:00
230d1a6aa9
Fixed bug where shows weren't populating when moving forward in the calendar
2013-03-26 10:33:06 -04:00
ef8f87df5d
Show linking
2013-03-25 16:28:53 -04:00
5b69761833
CC-4961: Show linking
...
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
2013-03-25 13:48:11 -04:00
265ac49f2e
remove duplicate cc_config
2013-03-24 23:11:55 -04:00
b1160afeab
cleanup
2013-03-22 18:05:49 -04:00
d12f793578
remove potential password change exploit in airtime-demo
2013-03-22 18:05:34 -04:00
327d0dd6c9
CC-4961: Show linking
...
Add front-end for creating a show with monthly repeats on same day of week
2013-03-22 15:57:15 -04:00
187e49e4b2
CC-4961: Show linking
...
Added back-end functionality for creating monthly repeating shows on
the same day of the week
2013-03-22 14:57:02 -04:00
6766d208aa
CC-4961: Show linking
...
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
a7601d290f
CC-4961: Show linking
...
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
2013-03-21 10:05:11 -04:00
bae9f1202a
CC-4961: Show linking
...
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
2013-03-19 10:09:28 -04:00
4bdd89f747
CC-4961: Show linking
...
Fixed edit show start/end time bug
2013-03-18 12:34:27 -04:00
896e03d76b
CC-4961: Show linking
...
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
5735baf237
CC-4961: Show linking
...
Made progress on ShowInstanceService
2013-03-13 11:08:16 -04:00
f9f4e4f1fb
CC-4961: Show linking
...
Made some progress on show editing
2013-03-12 18:01:12 -04:00
438200425a
CC-4961: Show linking
2013-03-12 11:33:32 -04:00
c721b81a13
CC-4961: Show linking
...
Refactoring
2013-03-12 10:30:31 -04:00
7347be35b1
Created a new service for show days
...
Created a new user service
Started refactoring edit show action
2013-03-11 16:18:40 -04:00
1cc823ef0e
Inital edit show reconfiguration changes
2013-03-08 17:10:35 -05:00
116d98a81b
Removed comment
2013-03-08 16:10:07 -05:00
d8ced29dd0
Refactored adding show forms to the view
2013-03-08 16:08:43 -05:00
8415dfdf6f
Add comments
2013-03-08 12:18:24 -05:00
5111f74494
Created function to set the next populate until date for repeating shows
2013-03-08 12:17:55 -05:00
9be6b82d97
Fixed rebroadcast date bug
2013-03-08 12:06:45 -05:00
846e940f82
Merge branch 'cc-4961-show-linking' of dev.sourcefabric.org:airtime into cc-4961-show-linking
...
Conflicts:
airtime_mvc/application/services/ScheduleService.php
airtime_mvc/application/services/ShowInstanceService.php
airtime_mvc/application/services/ShowService.php
2013-03-08 11:24:54 -05:00
4a86da5f87
Created function to create repeating show instances
...
Created function to create rebroadcast show instances
2013-03-08 11:19:03 -05:00
5ceeb88899
Merge branch '2.3.x' into devel
2013-03-06 13:46:01 -05:00
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
af622eb4b8
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-03-06 09:58:35 -05:00
c29e11fa0f
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-03-06 09:58:35 -05:00
d497cfa857
Created show service
2013-03-06 09:58:35 -05:00
99c07272fd
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
bdab294fce
Added comments to Schedule Service
2013-03-06 09:58:35 -05:00
d08f6cf3e1
CC-4961: Show linking
...
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
d7d1170ee1
CC-5003:
...
Some tracks are being cut off before fully playout out
-fixed
2013-03-04 18:52:51 -05:00
00d577fd5b
CC-4985: Ensure files deleted via the UI are deleted from stor directory.
...
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
c7203aa40d
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-02-26 17:41:35 -05:00
8c8a7d11e1
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-02-26 13:21:39 -05:00
2717c0845b
Created show service
2013-02-26 10:20:02 -05:00
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
9f0baba4f8
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-02-25 17:31:43 -05:00
3e49421221
Added comments to Schedule Service
2013-02-25 09:15:03 -05:00
22f52ca195
CC-4961: Show linking
...
-initial schedule service experimentation
2013-02-21 17:57:56 -05:00
c8d7d23d62
CC-4963: Add cue in and cue out to smart block criteria list
...
Done
2013-02-19 16:38:58 -05:00
8bdf3508b0
CC-4951: Add cue in and cue out to library filter columns
...
Done
2013-02-19 13:38:35 -05:00
9113853e41
Removed logging messages from Library controller, index action
2013-02-19 11:51:26 -05:00
c0c6ac5d75
CC-4954: Please make Library page remember the status per user
...
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
2013-02-19 11:37:22 -05:00
14f1d5572f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-19 10:59:03 -05:00
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -05:00
542553bbc1
Merge branch '2.3.x' into devel
2013-02-15 17:05:36 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
74291cc248
Merge branch 'cc-3627-close-playlist' into devel
2013-02-13 17:57:41 -05:00
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -05:00
6bbb603bcd
CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality
2013-02-13 16:05:11 -05:00
04ed640756
CC-3885: Deleted open playlist is not closed until a new item is added to it
...
-fixed
2013-02-13 15:44:52 -05:00
76cb04e296
CC-4538: Cannot edit title or change time of repeating show if first instance has ended
...
- fixed by populating the edit show form with the next repeating show that is not in the past
2013-02-13 11:55:27 -05:00
4ff1e8e78a
CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
...
-fixed
2013-02-13 11:29:43 -05:00
50613dd9a8
CC-4907: Library -> Adding items to show doesn't add the correct item sometimes
...
-fixed
2013-02-12 17:21:21 -05:00
2c1fa283da
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed for playlists that contain dynamic blocks
2013-02-11 14:17:18 -05:00
51ade73e85
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed
2013-02-11 13:45:51 -05:00
3c73535f70
Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents
2013-02-11 12:37:20 -05:00
6071dea839
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
-small fix on where to set clip length
2013-02-11 12:32:20 -05:00
69054806c4
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
2013-02-11 12:24:06 -05:00
e8bde50909
CC-4939: All webstreams in a playlist will have 0 length in Schedule
...
- set cuein and cueout of playlist item if it is a webstream
2013-02-11 11:17:00 -05:00
8124d096d0
Removed log message
2013-02-07 15:56:35 -05:00
c39b99da6c
CC-4839: Nginx doesn't allow liquidsoap to check uploaded file, which blocks uploading any file
...
-fixed
2013-02-07 15:42:06 -05:00
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
ad334d9e74
CC-4926: System-> Preference: Please limit the default fade value less than 60
...
- added a range validator of 0 - 59.9 on default fade
2013-02-06 15:44:52 -05:00
ba4cb16171
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
-typo
2013-02-06 14:35:39 -05:00
55970a4b20
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
2013-02-06 14:32:13 -05:00
8e82db1bc7
CC-4921: Now Playing: Cannot insert items into current playing show
...
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
2013-02-05 17:57:21 -05:00
909f2c95c4
XSS exploit prevention - audio preview
2013-02-05 17:24:39 -05:00
8db71eac52
CC-4914: Update is_scheduled after tracks play out
...
-done
2013-02-05 16:52:25 -05:00
50bfcb7eb8
XSS exploit prevention
...
- Calendar -> show content
2013-02-05 15:37:00 -05:00
23c29455d9
Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values
2013-02-05 13:18:25 -05:00
63439c276d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-05 10:56:54 -05:00
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
60d6f5585b
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:27:09 -05:00
e2472f1f5d
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:21:56 -05:00
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -05:00
20a3f674b4
CC-4897: XSS exploit on library page
...
-fixed where this was happening on Calendar - show content
2013-02-04 12:12:57 -05:00
d63865625d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-04 11:06:53 -05:00
1f0b9fa5dc
CC-4897: XSS exploit on library page
2013-02-04 11:06:46 -05:00
93ec4c001b
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
8309593a0f
CC-4904: Library -> Sort by status doesn't work
...
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
384298f680
CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist
2013-02-01 12:06:01 -05:00
d4e89df94e
CC-4895: Remove all json die() statements from code
2013-01-31 14:06:45 -05:00
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00
4f5d7869d8
Removed html from Library/contents-feed and StoredFile model
...
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -05:00
216b580395
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 14:40:47 -05:00
52d96241da
CC-4754: Replay gain modifier
...
-fix regression
2013-01-30 14:40:29 -05:00
cc5acf3c9e
improved logging for boolean vars
2013-01-30 14:34:06 -05:00
595429e6e5
CC-4897: XSS exploit on library page
...
-fixed
2013-01-30 11:51:27 -05:00
Naomi
denise
Martin Konecny
drigato