Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,572 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

11572 Commits

Author SHA1 Message Date
Naomi 35df0c1511 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-11 15:13:23 -04:00
Naomi 7f5e2bdefa CC-5404 : colorpickers littering DOM 2013-10-11 15:12:58 -04:00
denise 9fa2f010b4 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-11 13:22:12 -04:00
denise 4abdbfae1f CC-5401: Stream settings -> Can't save show source info 
Typo in sprintf formatting
 2013-10-11 13:22:02 -04:00
Naomi 22d5df866c CC-5404 : colorpickers littering DOM 2013-10-11 13:13:30 -04:00
Naomi 5defb12430 CC-5398 : "Add Show" does not update calender "orange" progress bar immediately showing content is added until refresh page or different view. 2013-10-11 11:53:53 -04:00
Naomi 4c331aa955 CRLF 2013-10-11 11:08:49 -04:00
Naomi 2e1cd8c41d Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-11 11:08:18 -04:00
Naomi 61bab553ff CC-5396 : Playout History: Restart airtime-liquidsoap will cause redundant items in history log 2013-10-11 11:07:59 -04:00
Albert Santoni 7266bfa2ba CC-5395: Saucy: Liquidsoap related packages are missing during installation 2013-10-10 18:08:11 -04:00
Naomi 916d85ca57 CRLF 2013-10-10 17:41:05 -04:00
Naomi 66a82bb39c Merge branch 'calendar-resize-problem' into 2.5.x 2013-10-10 17:39:42 -04:00
Naomi 2ef95db747 CC-5371 : Fail to extend/shrink show by drag 
window rezie event was triggered when resizing the show, caused problem.
Using the windowResize callback provided by fullcalendar now.
 2013-10-10 17:38:49 -04:00
cliff.wang 0309e96933 Update Chinese translation 2013-10-10 16:58:00 -04:00
Naomi 0c4dcda508 CC-5394 : File Summary Fix 
need to check if length is set.
 2013-10-10 16:01:53 -04:00
Naomi 17fd06090f Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-10 12:23:58 -04:00
Naomi 8825151aa4 CC-5387 : Copy cc_webstream_metadata to playout_history for 2.5 upgrade 
making sure fields fit in the table
 2013-10-10 12:23:36 -04:00
denise 9cbdb1494f Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-10 12:11:42 -04:00
denise c85833239c CC-5379: adding a file after a gap in now playing - starts too early 
Fixed the start time in cc_schedule
Track still starts playing later than cue in (CC-5019)
 2013-10-10 12:11:23 -04:00
Naomi 26d191ca79 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-10 12:07:22 -04:00
Naomi d856113386 CC-5387 : Copy cc_webstream_metadata to playout_history for 2.5 upgrade 
don't want to copy over useless webstream entries, those are taken from cc_webstream_metadata
 2013-10-10 12:07:03 -04:00
denise 533fbeb5f6 CC-5385: Shows with negative duration time are created with inverted time 2013-10-10 11:16:39 -04:00
Naomi 6c8d12bcb1 Merge branch 'webstream-data-update' into 2.5.x 2013-10-10 11:04:13 -04:00
Naomi c6b061d46a CC-5387 : Copy cc_webstream_metadata to playout_history for 2.5 upgrade 
removing temp view, function.
adding showname info as well.
 2013-10-10 10:52:18 -04:00
Naomi 68caf957ea CC-5387 : Copy cc_webstream_metadata to playout_history for 2.5 upgrade 2013-10-09 18:24:54 -04:00
denise 3261bd6307 Small formatting change 2013-10-09 17:38:06 -04:00
denise 05e4195165 CC-5390: Cannot drag & drop record show that has a rebroadcast 
Was using wrong method to query for the rebroadcast show's
original recorded show
 2013-10-09 17:24:16 -04:00
denise 4daa34d14b CC-5364: Problem with drag & drop recording show on calendar 2013-10-09 17:11:39 -04:00
denise aadbf0b200 CC-5384: Drag & drop show sets wrong time 
Start time was getting stored in UTC in cc_show_days when it
should be stored in the show's local timezone
 2013-10-09 16:55:56 -04:00
denise 256ec9292d CC-5388: Calendar won't load 2013-10-09 16:20:43 -04:00
denise b923a45ac6 Addming minified FullCalendar-1.5.4 2013-10-09 15:45:42 -04:00
denise 807833e3f3 CC-5361: Create show from repeating instance could have wrong time 2013-10-08 17:38:03 -04:00
denise 0f2848be22 Delete old full calendar files not in use 
Update fullcalendar from 1.5.3 to 1.5.4
Apply custom timezone changes to fullcalendar 1.5.4
 2013-10-08 17:09:19 -04:00
Albert Santoni 8642b1e411 changelog updates 2013-10-08 14:24:56 -04:00
denise 2165000f82 Update airtime version in po files 2013-10-08 12:06:50 -04:00
denise 1b3adcd375 i18n - Update mo files 2013-10-08 11:56:25 -04:00
denise 38634810a3 Update .po files 2013-10-08 11:48:24 -04:00
denise 9be2ec2e99 Fixed small typo 2013-10-08 11:24:42 -04:00
denise 56db6e9386 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-08 11:19:05 -04:00
denise c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime 
Conflicts:
	airtime_mvc/application/services/ShowService.php
 2013-10-08 11:16:25 -04:00
denise d248f0ca14 Merge branch '2.5.x' 2013-10-08 11:13:39 -04:00
denise 11e4f5a124 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-10-08 11:13:15 -04:00
Daniel James 3fdadf5b66 SAAS-351 Only hide day checkboxes when show repeat type is 2 or 3 2013-10-08 15:55:49 +01:00
denise 7c2e92f6e5 CC-5293: Calendar page cannot be loaded sometimes 2013-10-07 17:16:52 -04:00
denise 5463888947 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-07 16:59:10 -04:00
denise ff28daf28e CC-5378: Subseconds are gone from cc_schedule calulations 
Formatting error
 2013-10-07 16:58:57 -04:00
Albert Santoni 7ee797cc47 Merge branch '2.5.x-pypo-timeout-improvements1' into 2.5.x 2013-10-07 16:10:17 -04:00
denise 8a25d9cd2e CC-5376: Sometimes schedule times don't get updated 2013-10-07 15:53:33 -04:00
Albert Santoni f34a6d201a Double the pypo->liquidsoap timeout on second attempt if first attempt failed 2013-10-07 15:39:14 -04:00
Albert Santoni 02101db088 Raise timeout for pypo->liquidsoap communication to improve reliability under load 2013-10-07 15:37:34 -04:00