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
320cecd339
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-04 14:36:30 -05:00
79af606418
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-12-04 14:33:53 -05:00
e6808b0c12
CC-5594 : Remove all date_default_timezone_get()
...
removing now unused old methods
2013-12-04 14:31:23 -05:00
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
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
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
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
02453c52ee
Copy/paste error
...
Was setting cc_show_days twice
2013-12-04 09:00:43 -05:00
a164416c84
Fixed minor bugs
2013-12-04 09:00:43 -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
f571000657
Fixed updating single show instance problem where it wasn't fetching
...
the current instance
2013-11-26 12:32:05 -05:00
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
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
e9362e6429
Corrections to Hungarian localization
2013-11-20 10:55:34 +00:00
d30ee4ecc5
Refined Hungarian translation, thanks Zsolt!
2013-11-12 15:06:26 +00: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
0bae60138f
CC-5555 : Implement simple caching for preferences
...
forgot to get rid of user id here.
2013-11-11 16:50:35 -05:00
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
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
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
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
050d984882
CC-5487 : Calendar won't load under certain situation with linked shows
2013-10-30 18:09:57 -04:00
c9549c6a1d
Delete unused code
2013-10-28 10:34:18 -04:00
0392ce1971
Update Czech translation binary
2013-10-24 11:01:29 +01:00
4cc3b1cbfc
Update airtime.po
2013-10-17 12:18:21 +02:00
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
24663d9851
Merge branch '24hourfileimport' into 2.5.x
2013-10-16 17:29:22 -04:00
02dbde82ec
CC-5429 : importing file > 24 hours doesn't work
2013-10-16 17:27:40 -04:00
0d74d744da
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-10-16 16:49:15 -04:00
fa5c1018bf
CRLF
2013-10-16 16:01:30 -04:00
60cbd15381
CC-5428 : Ordering by length not working
2013-10-16 15:56:32 -04:00
109b313d37
CC-5424 : Same webstream playing will switch off ON AIR light
2013-10-16 12:26:39 -04:00
cbd2d72d60
Improved Austrian localization, thanks Erich!
2013-10-16 15:39:09 +01:00
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
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
bc30e13b44
Changed calendar js to only start fetching events after all files have been loaded
2013-10-15 12:53:43 -04:00
9ee29d77f5
Updated German localization, thanks again to Erich!
2013-10-14 12:28:06 +01:00
49d2d8f0ef
Updated Greek localization, thanks Kat!
2013-10-14 12:16:59 +01:00
73e5fa8a90
CC-5410 : Now playing icon should not lag to show up on calendar
2013-10-11 18:15:12 -04:00
f2a794168d
CRLF
2013-10-11 16:31:34 -04:00
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
c765438b95
CRLF
2013-10-11 15:13:49 -04:00
35df0c1511
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-11 15:13:23 -04:00
7f5e2bdefa
CC-5404 : colorpickers littering DOM
2013-10-11 15:12:58 -04:00
9fa2f010b4
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-11 13:22:12 -04:00
4abdbfae1f
CC-5401: Stream settings -> Can't save show source info
...
Typo in sprintf formatting
2013-10-11 13:22:02 -04:00
22d5df866c
CC-5404 : colorpickers littering DOM
2013-10-11 13:13:30 -04:00
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
4c331aa955
CRLF
2013-10-11 11:08:49 -04:00
61bab553ff
CC-5396 : Playout History: Restart airtime-liquidsoap will cause redundant items in history log
2013-10-11 11:07:59 -04:00
678282ef90
Updated Hungarian translation for 2.5.0, thanks Zsolt!
2013-10-11 15:35:03 +01:00
1203c9924e
Updated Austrian localization, thanks Erich!
2013-10-11 10:36:45 +01:00
916d85ca57
CRLF
2013-10-10 17:41:05 -04:00
66a82bb39c
Merge branch 'calendar-resize-problem' into 2.5.x
2013-10-10 17:39:42 -04:00
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
0309e96933
Update Chinese translation
2013-10-10 16:58:00 -04:00
0c4dcda508
CC-5394 : File Summary Fix
...
need to check if length is set.
2013-10-10 16:01:53 -04:00
9808a21c25
Updated Czech localization header
2013-10-10 17:19:49 +01:00
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
6db5535631
Updated Czech localization, thanks to Pavla Holcova!
2013-10-10 17:10:24 +01:00
533fbeb5f6
CC-5385: Shows with negative duration time are created with inverted time
2013-10-10 11:16:39 -04:00
bd36b13d23
Updated French localization for 2.5.0, thanks Albert!
2013-10-10 14:30:01 +01:00
f58dafbc1d
Updated US English localization
2013-10-10 11:28:17 +01:00
81fe322c91
Updated British localization
2013-10-10 10:47:01 +01:00
febadd08b9
Updated comment to explain newer repeat types
2013-10-10 10:43:45 +01:00
036df34f06
These files should not be chmod executable
2013-10-10 10:37:42 +01:00
3261bd6307
Small formatting change
2013-10-09 17:38:06 -04:00
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
4daa34d14b
CC-5364: Problem with drag & drop recording show on calendar
2013-10-09 17:11:39 -04:00
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
256ec9292d
CC-5388: Calendar won't load
2013-10-09 16:20:43 -04:00
b923a45ac6
Addming minified FullCalendar-1.5.4
2013-10-09 15:45:42 -04:00
807833e3f3
CC-5361: Create show from repeating instance could have wrong time
2013-10-08 17:38:03 -04:00
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
2165000f82
Update airtime version in po files
2013-10-08 12:06:50 -04:00
1b3adcd375
i18n - Update mo files
2013-10-08 11:56:25 -04:00
38634810a3
Update .po files
2013-10-08 11:48:24 -04:00
9be2ec2e99
Fixed small typo
2013-10-08 11:24:42 -04:00
56db6e9386
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-10-08 11:19:05 -04:00
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
d248f0ca14
Merge branch '2.5.x'
2013-10-08 11:13:39 -04:00
11e4f5a124
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-10-08 11:13:15 -04:00
3fdadf5b66
SAAS-351 Only hide day checkboxes when show repeat type is 2 or 3
2013-10-08 15:55:49 +01:00
7c2e92f6e5
CC-5293: Calendar page cannot be loaded sometimes
2013-10-07 17:16:52 -04:00
ff28daf28e
CC-5378: Subseconds are gone from cc_schedule calulations
...
Formatting error
2013-10-07 16:58:57 -04:00
8a25d9cd2e
CC-5376: Sometimes schedule times don't get updated
2013-10-07 15:53:33 -04:00
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
ac8f1d73f3
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-07 14:16:36 -04:00
Naomi
drigato
Albert Santoni
Daniel James
xheii01
denise
cliff.wang