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
|
8a25d9cd2e
|
CC-5376: Sometimes schedule times don't get updated
|
2013-10-07 15:53:33 -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 |
|
denise
|
60b4eb5c8a
|
Removed unnecessary formating when comparing DateTime objects
|
2013-10-04 09:49:23 -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
|
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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
Daniel James
|
577bbf14b6
|
Remove swear words from source code
|
2013-09-23 16:16:51 +01: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 |
|
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 |
|
Naomi Aro
|
5a85fce89d
|
CC-5321 : Changing Timezone after Creating shows creates Problems
|
2013-09-06 12:35:31 +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
|
9c0bee3877
|
adding show instance to the create form if it's already set.
|
2013-08-31 23:34:37 -04:00 |
|
Naomi
|
4fd37a4fa0
|
Merge branch '2.4.x' into ryerson-history
|
2013-08-30 16:07:41 -04:00 |
|
Naomi
|
0c379ef840
|
a working show instance select.
|
2013-08-30 15:03:43 -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
|
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
|
5780eb5bbe
|
show tables filtering by instance id.
|
2013-08-29 15:17:24 -04:00 |
|
Naomi Aro
|
a4c97479b6
|
using an accordian to display per show logs.
|
2013-08-28 23:30:15 -04:00 |
|
Naomi
|
429cdeeffb
|
filtering by a host's show so they can edit their own playout history.
|
2013-08-28 19:37:46 -04:00 |
|
Naomi
|
653a6384b9
|
creating a separate controller for playouthistory templates.
|
2013-08-28 18:25:46 -04:00 |
|
Naomi
|
5aa983be36
|
adding an instance id to the playout history table.
|
2013-08-28 17:15:36 -04:00 |
|
Naomi
|
dbe160c5d9
|
beginning of displaying form errors, need to keep working on this.
|
2013-08-23 15:52:49 -04:00 |
cliff.wang
|
12a62a3827
|
CC-5309:Calendar-> Recording Show: Fail to open context menu
Better error msg, also add more information in show-record.log
|
2013-08-23 14:23:47 -04:00 |
|
Naomi
|
84efdfd64a
|
crlf
|
2013-08-20 17:23:48 -04:00 |
|
Naomi
|
007a7ee7ef
|
casting non mandatory types from "", to avoid database query problems.
|
2013-08-20 17:23:15 -04:00 |
|
Naomi
|
2e572c652c
|
creating a random string for field names to work for all languages.
|
2013-08-20 15:31:13 -04:00 |
|
Naomi Aro
|
3ea2b920a6
|
crlf
|
2013-08-19 23:20:26 -04:00 |
|
Naomi Aro
|
09693ef174
|
changing to context menu single edit/delete.
|
2013-08-19 23:19:13 -04:00 |
|
Naomi
|
7cf654551d
|
crlf
|
2013-08-14 16:39:50 -04:00 |
|
Naomi
|
673c422015
|
replacing booleans in table with checkbox + column title
|
2013-08-14 16:38:59 -04:00 |
|
Naomi
|
c3c64e6fb1
|
crlf
|
2013-08-12 18:18:58 -04:00 |
|
Naomi
|
fdf18ec3ce
|
upgrading table tools to version 2.1.5
|
2013-08-12 18:18:33 -04:00 |
|
Naomi
|
b65007868a
|
crlf fix
|
2013-08-12 15:08:09 -04:00 |
|
Naomi
|
d83c004fb9
|
subclassing the template types, files summary table is now fully configurable form wise.
|
2013-08-12 15:06:26 -04:00 |
|
Naomi
|
27b079ace9
|
adding a label to the form fields (Datatables column headers)
|
2013-08-07 17:55:18 -04:00 |
|
Naomi
|
aaf2e5c2f6
|
better casting on form checkbox, setting populate flag properly based on if id is set (for create/update)
|
2013-08-05 15:05:26 -04:00 |