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 |
|
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 |
|
Naomi
|
d50cdd16c2
|
starting association of a show instance.
|
2013-08-29 17:40:08 -04:00 |
|
Naomi
|
f97069bd0b
|
displaying show list in proper time zone.
|
2013-08-29 15:58:24 -04:00 |
|
Naomi
|
91d4d1224e
|
redoing accordian properly.
|
2013-08-29 15:52:24 -04:00 |
|
Naomi
|
8208f8596b
|
ordering by show start time
|
2013-08-29 15:37:33 -04:00 |