Commit Graph

4622 Commits

Author SHA1 Message Date
drigato 320cecd339 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-12-04 14:36:30 -05:00
Albert Santoni 79af606418 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-12-04 14:33:53 -05:00
drigato 49ed0cf0f1 CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
Removed redundant function call to update last_scheduled column on a cc_show_instance
2013-12-04 14:28:16 -05:00
drigato 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
drigato 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
drigato 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
drigato 22595c1098 CC-5596: Can Recreate an Instance in a Location that has been modified
Fixed by updating the modified instance's start/end time and leaving as a placeholder
for future show updates
2013-12-04 11:36:38 -05:00
drigato 6c71b17024 CC-5595: Improper day of week comparison
Need to convert show instance start time to the show's local timezone before getting
the repeat day of week
2013-12-04 10:05:32 -05:00
drigato 02453c52ee Copy/paste error
Was setting cc_show_days twice
2013-12-04 09:00:43 -05:00
drigato a164416c84 Fixed minor bugs 2013-12-04 09:00:43 -05:00
drigato 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
drigato 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
drigato 4253608948 Small fix to overlapping show check 2013-12-03 15:14:53 -05:00
drigato 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
drigato d49131db48 CC-5593: Overlapping Show Bug
Need to check if the show instance has been deleted
2013-12-03 14:39:53 -05:00
drigato 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
drigato f571000657 Fixed updating single show instance problem where it wasn't fetching
the current instance
2013-11-26 12:32:05 -05:00
drigato 6ea0cb5918 CC-5571: Overlapping show check in wrong sometimes
The incorrect number of days we're getting added to create repeat instances
because we were checking the start week day in UTC instead of local time
2013-11-22 10:51:16 -05:00
drigato 89feb3d0fb Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2013-11-22 09:39:37 -05:00
drigato 52f0d5a13b CC-5570: Tracks get scheduled ahead of their show start time 2013-11-22 09:39:19 -05:00
Daniel James e9362e6429 Corrections to Hungarian localization 2013-11-20 10:55:34 +00:00
Daniel James d30ee4ecc5 Refined Hungarian translation, thanks Zsolt! 2013-11-12 15:06:26 +00:00
Naomi 757e35aaf9 CC-5555 : Implement simple caching for preferences
comment out logging to not flood logs.
2013-11-11 17:22:55 -05:00
Naomi b8a084998e CC-5555 : Implement simple caching for preferences
cache key creation change.
2013-11-11 17:08:15 -05:00
Naomi 0bae60138f CC-5555 : Implement simple caching for preferences
forgot to get rid of user id here.
2013-11-11 16:50:35 -05:00
Naomi f615e176e2 CC-5555 : Implement simple caching for preferences
better to include the key in the error message
2013-11-11 16:36:21 -05:00
Naomi f69dd123ca CC-5555 : Implement simple caching for preferences
making sure locale/timezone is returned properly in generic calls.
2013-11-11 16:32:43 -05:00
Naomi 06323a40fd CC-5555 : Implement simple caching for preferences
fixing up code so user id is never passed in manually to a preference getter.
2013-11-11 16:20:51 -05:00
Naomi f45708682f CC-5555 : Implement simple caching for preferences
using apc to save/fetch preferences to/from a cache.
2013-11-11 15:07:13 -05:00
Albert Santoni 050d984882 CC-5487 : Calendar won't load under certain situation with linked shows 2013-10-30 18:09:57 -04:00
drigato c9549c6a1d Delete unused code 2013-10-28 10:34:18 -04:00
Daniel James 0392ce1971 Update Czech translation binary 2013-10-24 11:01:29 +01:00
xheii01 4cc3b1cbfc Update airtime.po 2013-10-17 12:18:21 +02:00
Naomi ecf363ccfe CC-5430 : sorting settings not saved on library datatable
default sorting set in incorrect place, overriding saved settings.
2013-10-16 18:14:07 -04:00
Naomi 24663d9851 Merge branch '24hourfileimport' into 2.5.x 2013-10-16 17:29:22 -04:00
Naomi 02dbde82ec CC-5429 : importing file > 24 hours doesn't work 2013-10-16 17:27:40 -04:00
Albert Santoni 0d74d744da Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-16 16:49:15 -04:00
Naomi fa5c1018bf CRLF 2013-10-16 16:01:30 -04:00
Naomi 60cbd15381 CC-5428 : Ordering by length not working 2013-10-16 15:56:32 -04:00
Naomi 109b313d37 CC-5424 : Same webstream playing will switch off ON AIR light 2013-10-16 12:26:39 -04:00
Daniel James cbd2d72d60 Improved Austrian localization, thanks Erich! 2013-10-16 15:39:09 +01:00
denise 787ecdc3fa CC-5384: Drag & drop show sets wrong time
Was not setting new start time on cc_show_day object
2013-10-15 16:01:42 -04:00
denise b62fde46e7 CC-5407: Scheduling problem with global crossfade
Sometimes we set a flag to not apply the global crossfade value when inserting tracks.
This flag needs to get reset when more than one track is getting inserted or when
inserting an item into a linked show
2013-10-15 15:20:58 -04:00
denise bc30e13b44 Changed calendar js to only start fetching events after all files have been loaded 2013-10-15 12:53:43 -04:00
Daniel James 9ee29d77f5 Updated German localization, thanks again to Erich! 2013-10-14 12:28:06 +01:00
Daniel James 49d2d8f0ef Updated Greek localization, thanks Kat! 2013-10-14 12:16:59 +01:00
Naomi 73e5fa8a90 CC-5410 : Now playing icon should not lag to show up on calendar 2013-10-11 18:15:12 -04:00
Naomi f2a794168d CRLF 2013-10-11 16:31:34 -04:00
Naomi 470f0b2a7f CC-5408 : Can't add content to now playing show on calendar page
can schedule the now playing show from the calendar page.
2013-10-11 16:30:49 -04:00
Naomi c765438b95 CRLF 2013-10-11 15:13:49 -04:00