Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,880 Commits 18 Branches 27 Tags 434 MiB
Commit Graph

10880 Commits

Author SHA1 Message Date
Naomi 3e320f1e2e Merge branch 'master' into CC-2301 2013-05-02 16:15:58 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Martin Konecny f2564cf732 temporarily disable opus + aac until liquidsoap binaries are ready 2013-05-02 16:09:04 -04:00
denise 0e5ba2f07f CC-5085: Linked show: Changing a regular show to linked show and updating the weekday, all the contents will lost 2013-05-02 15:36:14 -04:00
denise ea73d98c49 CC-5075: Future bi-weekly linked shows don't get filled with content sometimes 2013-05-02 11:40:56 -04:00
denise 09754b20cc CC-5082: Repeating shows "disappear" when switching calendar to next month 
This was caused by the calendar trying to re-create single instance shows.
We needed to exclude non-repeating shows when populating the calendar with repeat events
 2013-05-01 15:20:55 -04:00
denise 3d61a18261 CC-5082: Repeating shows "disappear" when switching calendar to next month 
Small fix. Was treating object as an array
 2013-05-01 14:42:53 -04:00
denise ded8ceb86b CC-5082: Repeating shows "disappear" when switching calendar to next month 
We were trying to call a function on an object that was not set
 2013-05-01 14:40:33 -04:00
Naomi 2b5a8b0d4b CC-2301 : fixing changed function name after merging with master. 2013-05-01 11:41:07 -04:00
denise 5ba5864d8c CC-5078: Wrong start time if dragging dynamic smart block into a show 2013-05-01 11:29:32 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
denise 0362f24a4e CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances 2013-05-01 10:30:51 -04:00
Naomi f82659d582 CC-2301 : stopping playlist editor to make sure audio isn't stuck playing in the background. 2013-04-30 17:03:40 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
denise ff2fde0173 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:54:20 -04:00
denise ec2f36efa8 CC-5077: Calendar -> Context menu -> Show Content -> shows incorrect time filled on edited repeat instances 
- We weren't updating the time_filled column in cc_show_instances when creating the new show
 2013-04-30 15:54:04 -04:00
Naomi 2462e4f144 CC-2301 : CRLF fix. 2013-04-30 15:34:20 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Martin Konecny decb12f6b8 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:00:45 -04:00
Martin Konecny de4934a317 ensure that uploaded file is UTF-8 encoded 2013-04-30 15:00:31 -04:00
denise 4ca60ca676 CC-5074: Editing a linked instance sets incorrect schedule start times 2013-04-30 13:58:03 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
Naomi 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -04:00
Naomi 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
denise 1384c5d39d Function call was missing an argument 2013-04-29 15:57:59 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -04:00
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
cliff.wang 2552a52248 Scripts: to compile liquidsoap with chroot env. 2013-04-29 11:46:38 -04:00
Martin Konecny 623a67d6aa CC-5072: 
Ensure all api requests are returning valid JSON

-fixed
 2013-04-26 18:27:40 -04:00
Martin Konecny acfc72f422 use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00
Martin Konecny 21b84c153a better logging for return values 2013-04-26 17:54:52 -04:00
Naomi ef100f89f1 CC-2301 : not drawing fades of length zero. 2013-04-26 17:54:37 -04:00
Martin Konecny 3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
Naomi 0169c01724 CC-2301 : updating waveform code for states 2013-04-26 16:23:46 -04:00
denise a5264aac1e CC-4961: Show linking 2013-04-26 16:10:01 -04:00
Naomi 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
Martin Konecny 21bed91678 add brackets to force operator precedence 2013-04-26 15:56:48 -04:00
Martin Konecny 49d1755b52 fix incorrect merge 2013-04-26 13:58:44 -04:00
Martin Konecny 705329ee5d cleanup of unecessary code 
-we shouldn't be loading config file multiple times.
 2013-04-26 13:48:15 -04:00
Martin Konecny 6cc366b100 CC-5069: 
Airtime 2.4 upgrade scripts

-initial commit
 2013-04-26 13:43:40 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
Naomi 628af95325 CC-2301 : needed to adjust cueout if length information is inaccurate. 2013-04-26 12:38:13 -04:00
Martin Konecny 91e15ea092 CC-4417: Opus codec support 2013-04-26 12:26:13 -04:00
Martin Konecny 09fec4b42b CC-4417: Opus codec support 2013-04-26 12:26:01 -04:00
Martin Konecny c99207b47e CC-4417: Opus codec support 2013-04-26 12:22:18 -04:00
Martin Konecny 655c1eb5a9 CC-5043: 
Invalid literal for float error from mutagen
 2013-04-26 11:37:46 -04:00
Martin Konecny 628e075828 pypo syntax error 2013-04-26 11:35:52 -04:00
Martin Konecny ca86d6b68b fix potential out-of-bounds string index error 2013-04-25 22:36:21 -04:00
Martin Konecny 7bf6f3669b more stringent verification of equivalence between tracks 2013-04-25 22:33:03 -04:00