Naomi
8a354a8c45
CC-5316 : Playout History: Doesn't support webstream
2013-09-30 14:25:51 -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
174915005f
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-30 13:36:14 -04:00
Naomi
9f38e5a9c6
CC-5342 : Pypo: Webstream disconnection happens when any changes on Now playing page
2013-09-26 17:03:18 -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
c8bb12ca45
Freenode identity verification for #airtime
2013-09-26 15:23:02 -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
e57b6e3e3d
Merge branch 'cc-5232-show-timezone' of dev.sourcefabric.org:airtime into cc-5232-show-timezone
2013-09-25 16:41:26 -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
denise
7fa3fe9a49
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 14:44:08 -04:00
denise
3439611ef3
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 14:40:09 -04:00
denise
2666e97b7e
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 14:33:43 -04:00
denise
002a80ee6c
CC-5323: User's Timezone Can Improperly Edit Show
...
-made localizeDate a static function in ShowFormService
2013-09-25 14:32:16 -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
Daniel James
58ad52f93f
CC-5328 Fix virtualenv version check for newer distros
2013-09-25 13:03:35 +01:00
denise
ad778ec971
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-24 16:23:45 -04:00
denise
9e8fdb50ca
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-24 15:04:25 -04: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
69eb6ba060
Merge branch 'CC-5333-rebroadcast-not-created' into 2.5.x
...
Conflicts:
airtime_mvc/application/services/ShowService.php
2013-09-23 13:41:22 +02:00
Naomi Aro
ae1c41e4ce
CC-5333 : Rebroadcast Shows are not created
2013-09-23 12:20:10 +02:00
Naomi Aro
d13d0fbad0
CC-5333 : Rebroadcast Shows are not created
...
redefining isRecorded and isRebroadcast, these methods should not rely on already created show instances.
2013-09-23 12:17:16 +02:00
Naomi Aro
bbbf0b2c1d
Merge branch 'master' into 2.5.x
2013-09-23 11:35:38 +02:00
Naomi Aro
0b3c519979
trying to fix master..
2013-09-23 11:32:48 +02:00
Naomi Aro
c8b73850b9
Revert "Merge branch 'ryerson-history'"
...
This reverts commit a554c6f72c
, reversing
changes made to 2a0c9769aa
.
2013-09-23 11:00:43 +02:00
Naomi Aro
a554c6f72c
Merge branch 'ryerson-history'
2013-09-23 09:35:33 +02:00