Commit Graph

4698 Commits

Author SHA1 Message Date
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
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
Daniel James 678282ef90 Updated Hungarian translation for 2.5.0, thanks Zsolt! 2013-10-11 15:35:03 +01:00
Daniel James 1203c9924e Updated Austrian localization, thanks Erich! 2013-10-11 10:36:45 +01: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
Daniel James 9808a21c25 Updated Czech localization header 2013-10-10 17:19:49 +01: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
Daniel James 6db5535631 Updated Czech localization, thanks to Pavla Holcova! 2013-10-10 17:10:24 +01:00
denise 533fbeb5f6 CC-5385: Shows with negative duration time are created with inverted time 2013-10-10 11:16:39 -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 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
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
denise 3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi 1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi 0dd5458269 Merge branch '2.5.x' into CC-5293-calendar-pref 2013-09-30 13:57:23 -04:00
Naomi 7d739a0f66 CC-5316 : Playout History: Doesn't support webstream
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
Albert Santoni 11ae76beb8 Fix SAAS-349 by preventing password changes in demo mode.
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
2013-09-26 16:23:22 -04:00
Albert Santoni 28a032388b Start of bugfixing for SAAS-349.
* Also identity verification for erry on Freenode.
2013-09-26 15:18:41 -04:00
Albert Santoni 52b7dbb226 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-09-26 08:36:11 -04:00
denise a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -04:00
denise 34e2344100 CC-5323: User's Timezone Can Improperly Edit Show
Sometimes show form would populate the start/end time with wrong timezone
2013-09-25 17:18:23 -04:00
Albert Santoni a1f3309cf7 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-09-25 16:41:35 -04:00
denise 3e5a6b2a3d CC-5323: User's Timezone Can Improperly Edit Show
Edit show from was displaying rebroadcast dates in user's timezone
instead of in the show's timezone
2013-09-25 16:40:55 -04:00
Albert Santoni 99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -04:00
denise e8dc1c5729 CC-5323: User's Timezone Can Improperly Edit Show
- fixed to use show's timezone instead of user's timezone when updating a show's
  start and end time after a show has been edited
2013-09-25 16:22:30 -04:00
denise 2114383519 CC-5323: User's Timezone Can Improperly Edit Show
-overlapping show check was using the user's local timezone to compare new
 shows instead of the show's timezone
2013-09-25 16:22:30 -04:00
denise af03502592 CC-5323: User's Timezone Can Improperly Edit Show
-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
2013-09-25 16:22:30 -04:00
denise 6aa6d576cd CC-5323: User's Timezone Can Improperly Edit Show
-made localizeDate a static function in ShowFormService
2013-09-25 16:22:30 -04:00
denise 8ddb2974f1 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
denise 107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
denise 2ab5e6b26a CC-5344: Edit Recorded Show -> Rebroadcasts get deleted
When editing a show the record option was getting posted with a false value
even if the value was true. This was caused because on show-edit action the
record form field is disabled
2013-09-25 16:17:20 -04:00
Daniel James 8dc100126a Alert icon for missing file in Now Playing should be orange, to match Media Builder 2013-09-25 17:36:50 +01:00
Naomi Aro e47b446804 CC-5338 : Uncaught SyntaxError: audio resources unavailable for AudioContext construction
creating a single global audio context to avoid resource problems.
2013-09-24 18:50:41 +02:00
Naomi Aro 24861545ce crlf fix 2013-09-24 12:24:13 +02:00
Naomi Aro 7e96828cdd CC-5317 : Guest user can't see Now playing page
removed the library module completely from page if the user does not have permission to view it.
2013-09-24 12:21:04 +02:00
Naomi Aro 71001480d2 CC-5335 : I18N: Calendar picker strings are not translated.
loading the same strings as the jquery calendar.
2013-09-24 11:47:20 +02:00
Naomi Aro 59f6578e2e CC-5334 : Localize Ryerson History Feature
adding string "New log sheet template"
2013-09-24 09:58:53 +02:00
Naomi Aro 53341d40f7 CC-5334 : Localize Ryerson History Feature 2013-09-24 09:56:04 +02:00
Naomi Aro 86c570744a Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-09-23 17:58:58 +02:00
cliff.wang 68f715587c Update Chinese translation
Update Chinese translation after CC-5334
2013-09-23 11:58:40 -04:00
Daniel James 577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro 9de8b6634c CC-5334 : Localize Ryerson History Feature
crlf
2013-09-23 14:58:56 +02:00
Naomi Aro 9ec6156c92 CC-5334 : Localize Ryerson History Feature 2013-09-23 14:57:44 +02:00
Naomi Aro ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Naomi Aro ae1c41e4ce CC-5333 : Rebroadcast Shows are not created 2013-09-23 12:20:10 +02:00
Naomi Aro 4c6d96e062 CC-5333 : Rebroadcast Shows are not created 2013-09-20 16:35:46 +02:00
Jamie Connor 1c6d7725ca Modified weekInfo from ApiController to display current week and next, changed widget to display extra days. 2013-09-18 17:35:32 +12:00
Naomi Aro 0e20e5b50b Merge branch '2.4.x' into ryerson-history 2013-09-07 16:51:22 +02:00
Naomi Aro 0d089b787d Merge branch '2.4.x' into ryerson-history 2013-09-07 16:41:57 +02:00
Jamie Connor f7f2cdc51c Follow up changes relating to adding in new show repeat options 2013-09-07 14:54:03 +12:00
Jamie Connor 6da9b6bf42 Removed repeated code 2013-09-07 14:52:45 +12:00
denise 0b66f62045 Removed old jquery syntax 2013-09-06 11:08:01 -04:00
Naomi Aro 5a85fce89d CC-5321 : Changing Timezone after Creating shows creates Problems 2013-09-06 12:35:31 +02:00
Naomi Aro 0734a4a98c CC-5320 : UTC not included in Timezone List 2013-09-05 11:54:25 +02:00
Jamie Connor 03f383f764 added more options for show repeats 2013-09-03 12:25:22 +12:00
Naomi Aro 4a4ef2767e CC-5318 : Playout History: The last song of the show will display wrong end time. 2013-09-01 17:59:47 -04:00
Naomi Aro 619dbf7bbf format/json to prevent zend errors. 2013-09-01 13:38:18 -04:00
Naomi Aro 9c0bee3877 adding show instance to the create form if it's already set. 2013-08-31 23:34:37 -04:00
Naomi Aro 614a8174d5 put "no show" at the end of the select by default. 2013-08-31 22:56:22 -04:00
Naomi 075342c637 don't delete a history item if a show instance is removed from the database. 2013-08-30 16:43:05 -04:00
Naomi 4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi d790dc63c2 taking the modified calendar from 2.4.1 2013-08-30 16:03:17 -04:00
Naomi 98412e59ff underscore templates updated 2013-08-30 15:25:57 -04:00
Naomi 8c66c5bb18 default no show option 2013-08-30 15:06:59 -04:00
Naomi 0c379ef840 a working show instance select. 2013-08-30 15:03:43 -04:00
Naomi Aro ab8cf60fe3 refreshing view on navigation. 2013-08-30 02:39:14 -04:00
Naomi Aro de225c589f restricting search properly for select all/none. 2013-08-30 02:31:23 -04:00
Naomi Aro ad531f9512 clearing internal selected items array. 2013-08-30 02:24:16 -04:00
Naomi Aro 846c90bc8f fixing select all/none button 2013-08-30 02:11:26 -04:00
Naomi Aro a4e9cd1add can research times in show summary now. 2013-08-30 01:51:33 -04:00
Naomi Aro 8971e6330a removing animation for smoother effect. 2013-08-30 01:39:51 -04:00
Naomi Aro 0e017374b7 change default text to "No Show" 2013-08-30 01:30:23 -04:00
Naomi Aro 53c326b320 pagination buttons look better if they can fit on the same line. 2013-08-30 01:23:35 -04:00
Naomi Aro 7b54d3b6ce fixing colour to go back to default theme 2013-08-30 01:08:49 -04:00
Naomi Aro 2c88d1e0a0 formating the date start/end of each show in the accordian. 2013-08-30 01:06:59 -04:00
Naomi Aro 15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi Aro 5a8957273f removing choice for show instance if in shows tab. 2013-08-29 18:52:40 -04:00
Naomi Aro 0f0958ee6b changing the query to only filter by instance id not starts/ends if instance id is set. 2013-08-29 18:32:42 -04:00