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
Daniel James
bd36b13d23
Updated French localization for 2.5.0, thanks Albert!
2013-10-10 14:30:01 +01:00
Daniel James
f58dafbc1d
Updated US English localization
2013-10-10 11:28:17 +01:00
Daniel James
3ada8a2075
Updated README file, fixed broken web link to manual
2013-10-10 10:49:18 +01:00
Daniel James
81fe322c91
Updated British localization
2013-10-10 10:47:01 +01:00
Daniel James
febadd08b9
Updated comment to explain newer repeat types
2013-10-10 10:43:45 +01:00
Daniel James
036df34f06
These files should not be chmod executable
2013-10-10 10:37:42 +01: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
denise
55254e88a5
UI text improvements for setting the station/user timezones
...
Added info icon in the add-show form for timezone setting
2013-10-07 14:49:52 -04:00
denise
ac8f1d73f3
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-07 14:16:36 -04:00
denise
ff46883c1b
CC-5360: Updating a Show over a timezone change period has problems
...
Need to apply the old timezone to show start time when attempting to
fetch current instance
2013-10-07 14:16:20 -04:00
cliff.wang
5c74cabddb
cc-5372: Update CREDITS
2013-10-04 18:40:27 -04:00
Albert Santoni
477ff248f6
Some more stuff for CC-5356 / Ubuntu Saucy installation
2013-10-04 14:57:25 -04:00
Albert Santoni
a03fe959b6
CC-5356: Disable default site correctly in Ubuntu Saucy
2013-10-04 14:29:17 -04:00
Albert Santoni
855f642936
CC-5346: Install php5-json on Saucy
2013-10-04 14:26:16 -04:00
Albert Santoni
7cca01ab08
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-04 14:15:32 -04:00
Albert Santoni
7b1cd5c908
CC-5354: Remove PHP short open tags for better compatibility
2013-10-04 14:15:23 -04:00
Naomi
548d3eef0e
Merge branch 'all-record-icons' into 2.5.x
2013-10-04 11:06:46 -04:00
Naomi
4ca2554999
CC-5362 : In Calendar Week/Day view crappy JS for now playing show makes everything a record show
...
fc-show-instance is now a class since agenda day/week are prerendered, thought only 1 was rendered at a time.
better handling of adding the now playing icon.
2013-10-04 11:05:35 -04:00
denise
60b4eb5c8a
Removed unnecessary formating when comparing DateTime objects
2013-10-04 09:49:23 -04:00
drigato
37a0c271f6
CC-5359: Update show fails sometimes with overlapping check
...
Some DateTime objects were not getting created in correct timezone
Used format() to get the day of week value instead of getTimestamp()
getTimestamp() sometimes returns the wrong value
2013-10-03 18:02:15 -04:00
