6a468ff549
Fix a rendering problem if a zero length show happens
2013-12-13 18:27:14 -05:00
346036a9ca
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
...
Conflicts:
airtime_mvc/application/models/Show.php
2013-12-13 16:12:26 -05:00
fa0a190277
Prevent division by zero if show lengths end up being zero
2013-12-13 16:10:36 -05:00
99902bc10c
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-13 15:16:51 -05:00
445f1ebe4f
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
...
removing old crappy method.
2013-12-13 15:14:38 -05:00
7a51b8d2ad
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-13 15:06:52 -05:00
a45235d39b
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone
2013-12-13 15:03:02 -05:00
27f0fa27e9
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 13:32:25 -05:00
a96c2551ef
CC-5627 : Check all Application_Common_DateHelper calculations that use
...
timezone.
* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
the station timezone. This fixes negative remaining time that could
occur in the embeddable JS Airtime widgets if you were logged in to
Airtime while you viewed your website. (The widgets display in
the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
consistently in the user timezone now.
2013-12-12 13:28:51 -05:00
974be86691
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 11:48:11 -05:00
9bbc3cf713
CC-5633: Can schedule overlapping shows
...
The overlapping show check was returning false too early
2013-12-12 11:48:00 -05:00
f2fe04ba1d
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 11:33:28 -05:00
8986f1bc4f
CC-5627 : Check all Application_Common_DateHelper calculations that use
...
timezone.
* Changed getRangeStartAndEnd() to use UTC explictly
2013-12-12 11:32:40 -05:00
37ea29380b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 18:56:29 -05:00
67031a75fe
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 18:56:19 -05:00
abf3a50694
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 18:22:08 -05:00
a9bd34fbcb
CC-5627: Check all Application_Common_DateHelper calculations that use
...
timezone.
* Eliminate more strtotime usage, could fix on air light weirdness in
some circumstances.
2013-12-11 18:20:40 -05:00
e6c971387b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 17:35:47 -05:00
e6d28b250e
CC-5629 : Smart Block timestamps aren't saved in UTC time
2013-12-11 17:35:31 -05:00
3a50f7a6dc
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-11 16:55:47 -05:00
cfb6195523
CC-5632: System preferences don't get saved
2013-12-11 16:55:35 -05:00
b13d12eaac
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 15:20:19 -05:00
3a2f9a24b5
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
...
working on getting widgets to work properly returning station local time.
2013-12-10 16:45:05 -05:00
0f28e0f1aa
Merge branch '2.5.x' into cc-5594-date_default
2013-12-06 18:18:17 -05:00
2c7db0e83c
CC-5555: Fix user preferences logic in preferences cache
...
* Fixes stream settings not dislaying
2013-12-06 17:11:07 -05:00
061897a58b
CC-5594 : Remove all date_default_timezone_get()
...
never rely on this method.
2013-12-05 16:00:52 -05:00
ec6a991090
CC-5594 : Remove all date_default_timezone_get()
...
missed a place to set show timezone,
setting UTC timezone in CcSchedule, very important!!
2013-12-05 15:57:00 -05:00
ed74470803
CC-5594 : Remove all date_default_timezone_get()
...
updating dashbaord information for timezone.
2013-12-04 17:54:28 -05:00
e508d141ed
CC-5594 : Remove all date_default_timezone_get()
...
resizing must calculate from displayed calendar settings.
2013-12-04 15:48:32 -05:00
e71f306c7d
CC-5594 : Remove all date_default_timezone_get()
...
setting display time using user timezone.
last played was never converted properly for display previously.
2013-12-04 15:24:27 -05:00
10d8351f93
CC-5594 : Remove all date_default_timezone_get()
...
setting display timezone to be user's timezone for library utime and mtime.
2013-12-04 15:16:07 -05:00
aafeeb6aed
CC-5594 : Remove all date_default_timezone_get()
...
replacing timezone with the user timezone pref.
2013-12-04 15:11:40 -05:00
c8cfdadb90
CC-5594 : Remove all date_default_timezone_get()
...
removing unused old methods, changing listener stats to use the user timezone for display.
2013-12-04 15:06:07 -05:00
82b40f52e7
Merge branch '2.5.x' into cc-5594-date_default
2013-12-04 14:42:30 -05:00
447ad4e3c6
CC-5594 : Remove all date_default_timezone_get()
...
correcting show contents timezone.
2013-12-04 14:39:56 -05:00
e6808b0c12
CC-5594 : Remove all date_default_timezone_get()
...
removing now unused old methods
2013-12-04 14:31:23 -05:00
7f8f084c98
CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
...
Refactored cc_show_day->getLocalEndDateAndTime() function
2013-12-04 14:17:19 -05:00
c9773d2a0e
CC-5594 : Remove all date_default_timezone_get()
2013-12-04 14:13:19 -05:00
463d286ac5
CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
...
Refactored cc_show->isRepeating() function
2013-12-04 14:00:31 -05:00
b78fa994f7
CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
...
Removed redundant timestamp var
Removed redundant DateTime object creation
2013-12-04 12:20:16 -05:00
ef8af1b724
CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
...
- Fixed resizing repeating shows to not include edited instances
- Fixed context menu on repeating shows with edited instances
- Fixed populated the show form when editing a single instance
2013-12-04 09:00:43 -05:00
a465b5a770
CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
...
Create a new cc_show_day rule instead of a new cc_show
2013-12-04 09:00:43 -05:00
4253608948
Small fix to overlapping show check
2013-12-03 15:14:53 -05:00
c18d53f403
CC-5593: Overlapping Show Bug
...
Get instance depending on whether instance id is provided or not
2013-12-03 15:07:40 -05:00
d49131db48
CC-5593: Overlapping Show Bug
...
Need to check if the show instance has been deleted
2013-12-03 14:39:53 -05:00
eae93008b4
CC-5589: SQL error when adding/moving a scheduled item
...
Error was occuring when a moved item didn't exist in a linked show instance
Error was also occuring when trying to insert item into a schedule localtion
that does not exist in a linked instance.
Fixed by skipping the move action if the file does not exist in a linked instance,
cleaning up the position numbers after deleting schedule items, and by
setting the insert time to the show start time in a linked instance is empty
2013-12-02 16:40:15 -05:00
89feb3d0fb
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-11-22 09:39:37 -05:00
52f0d5a13b
CC-5570: Tracks get scheduled ahead of their show start time
2013-11-22 09:39:19 -05:00
757e35aaf9
CC-5555 : Implement simple caching for preferences
...
comment out logging to not flood logs.
2013-11-11 17:22:55 -05:00
b8a084998e
CC-5555 : Implement simple caching for preferences
...
cache key creation change.
2013-11-11 17:08:15 -05:00
Albert Santoni
Naomi
drigato