Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11478 commits 3 branches 0 tags 405 MiB
Commit graph

11478 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Albert Santoni
99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -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
Daniel James
58ad52f93f CC-5328 Fix virtualenv version check for newer distros 2013-09-25 13:03:35 +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
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
Naomi Aro
4c6d96e062 CC-5333 : Rebroadcast Shows are not created 2013-09-20 16:35:46 +02: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
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
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
71ee72015b release version updates and changelog edits. 2013-09-01 00:56:47 -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 Aro
d166f2035b creating an upgrade script for the Ryerson feature. 2013-08-31 16:50:40 -04:00
Naomi
65ecc74f3f schema sql file. upgrade for ryerson. 2013-08-30 17:45:26 -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