Commit Graph

4564 Commits

Author SHA1 Message Date
Naomi c765438b95 CRLF 2013-10-11 15:13:49 -04:00
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 61bab553ff CC-5396 : Playout History: Restart airtime-liquidsoap will cause redundant items in history log 2013-10-11 11:07:59 -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
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
denise 533fbeb5f6 CC-5385: Shows with negative duration time are created with inverted time 2013-10-10 11:16:39 -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
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 ff28daf28e CC-5378: Subseconds are gone from cc_schedule calulations
Formatting error
2013-10-07 16:58:57 -04:00
denise 8a25d9cd2e CC-5376: Sometimes schedule times don't get updated 2013-10-07 15:53:33 -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
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
Naomi c707967567 CRLF 2013-10-02 11:25:40 -04:00
Naomi faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi 4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -04:00
denise 632b11c0ab CC-5331: Now Playing keeps refreshing sometimes
- typo in GET request parameters causing overriding of data
2013-10-01 16:49:08 -04:00
denise 1e59ab836d CC-5277: Selecting weekly repeat without selecting days fails silently
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
2013-10-01 14:19:02 -04:00