3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -04:00
1fa13eed13
CRLF
2013-09-30 13:59:08 -04:00
0dd5458269
Merge branch '2.5.x' into CC-5293-calendar-pref
2013-09-30 13:57:23 -04:00
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
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
28a032388b
Start of bugfixing for SAAS-349.
...
* Also identity verification for erry on Freenode.
2013-09-26 15:18:41 -04:00
52b7dbb226
Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x
2013-09-26 08:36:11 -04:00
a8a02704f3
Merge branch '2.5.x' into cc-5232-show-timezone
2013-09-25 17:24:44 -04:00
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
a1f3309cf7
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-25 16:41:35 -04:00
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
99669c78a0
Fixed CC-5045 and Now Playing time remaining style improvements
2013-09-25 16:40:20 -04:00
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
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
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
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
8ddb2974f1
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
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
8dc100126a
Alert icon for missing file in Now Playing should be orange, to match Media Builder
2013-09-25 17:36:50 +01:00
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
24861545ce
crlf fix
2013-09-24 12:24:13 +02:00
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
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
59f6578e2e
CC-5334 : Localize Ryerson History Feature
...
adding string "New log sheet template"
2013-09-24 09:58:53 +02:00
53341d40f7
CC-5334 : Localize Ryerson History Feature
2013-09-24 09:56:04 +02:00
86c570744a
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-23 17:58:58 +02:00
68f715587c
Update Chinese translation
...
Update Chinese translation after CC-5334
2013-09-23 11:58:40 -04:00
577bbf14b6
Remove swear words from source code
2013-09-23 16:16:51 +01:00
9de8b6634c
CC-5334 : Localize Ryerson History Feature
...
crlf
2013-09-23 14:58:56 +02:00
9ec6156c92
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:57:44 +02:00
ee45f10aeb
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:42:35 +02:00
ae1c41e4ce
CC-5333 : Rebroadcast Shows are not created
2013-09-23 12:20:10 +02:00
4c6d96e062
CC-5333 : Rebroadcast Shows are not created
2013-09-20 16:35:46 +02:00
0e20e5b50b
Merge branch '2.4.x' into ryerson-history
2013-09-07 16:51:22 +02:00
0d089b787d
Merge branch '2.4.x' into ryerson-history
2013-09-07 16:41:57 +02:00
0b66f62045
Removed old jquery syntax
2013-09-06 11:08:01 -04:00
5a85fce89d
CC-5321 : Changing Timezone after Creating shows creates Problems
2013-09-06 12:35:31 +02:00
0734a4a98c
CC-5320 : UTC not included in Timezone List
2013-09-05 11:54:25 +02:00
4a4ef2767e
CC-5318 : Playout History: The last song of the show will display wrong end time.
2013-09-01 17:59:47 -04:00
619dbf7bbf
format/json to prevent zend errors.
2013-09-01 13:38:18 -04:00
9c0bee3877
adding show instance to the create form if it's already set.
2013-08-31 23:34:37 -04:00
614a8174d5
put "no show" at the end of the select by default.
2013-08-31 22:56:22 -04:00
075342c637
don't delete a history item if a show instance is removed from the database.
2013-08-30 16:43:05 -04:00
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -04:00
d790dc63c2
taking the modified calendar from 2.4.1
2013-08-30 16:03:17 -04:00
98412e59ff
underscore templates updated
2013-08-30 15:25:57 -04:00
8c66c5bb18
default no show option
2013-08-30 15:06:59 -04:00
0c379ef840
a working show instance select.
2013-08-30 15:03:43 -04:00
ab8cf60fe3
refreshing view on navigation.
2013-08-30 02:39:14 -04:00
denise
Naomi
Albert Santoni
Daniel James
cliff.wang