denise
|
256ec9292d
|
CC-5388: Calendar won't load
|
2013-10-09 16:20:43 -04:00 |
|
denise
|
38634810a3
|
Update .po files
|
2013-10-08 11:48:24 -04:00 |
|
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
|
7c2e92f6e5
|
CC-5293: Calendar page cannot be loaded sometimes
|
2013-10-07 17:16:52 -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
|
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 |
|
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
|
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 |
|
Jamie Connor
|
1c6d7725ca
|
Modified weekInfo from ApiController to display current week and next, changed widget to display extra days.
|
2013-09-18 17:35:32 +12:00 |
|
Jamie Connor
|
6da9b6bf42
|
Removed repeated code
|
2013-09-07 14:52:45 +12:00 |
|
Naomi Aro
|
682a37894b
|
Merge branch 'ryerson-history' into 2.5.x-saas
Conflicts:
airtime_mvc/application/views/scripts/menu.phtml
|
2013-09-02 15:52:43 -04:00 |
|
Naomi Aro
|
60bf334aeb
|
Merge branch '2.4.x' into 2.4.x-saas
|
2013-09-02 15:46:25 -04:00 |
|
Naomi
|
4fd37a4fa0
|
Merge branch '2.4.x' into ryerson-history
|
2013-08-30 16:07:41 -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
|
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 |
|
Jamie Connor
|
b1e71e5adf
|
added optional parameter number_of_days for getting schedule information
|
2013-08-26 11:26:09 +12:00 |
|
Naomi
|
c2b9bb01ac
|
crlf
|
2013-08-23 15:53:18 -04:00 |
|
Naomi
|
dbe160c5d9
|
beginning of displaying form errors, need to keep working on this.
|
2013-08-23 15:52:49 -04:00 |
|
Naomi Aro
|
af822bb5b9
|
showing time first for endtime box.
|
2013-08-22 21:39:46 -04:00 |
|
Naomi Aro
|
01370c2124
|
reverting back to the bootstrap datetime picker since it's nicer to use.
|
2013-08-22 20:23:17 -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
|
6d5febe4f7
|
getting rid of characters from a field name that may cause problems.
|
2013-08-20 15:18:05 -04:00 |
|
Naomi
|
10ef55b083
|
context menu just in the client now. works for both tables.
|
2013-08-20 14:58:22 -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 Aro
|
9b45b9dc72
|
converting to a jquery UI based datepicker.
|
2013-08-16 15:12:00 -04:00 |
|
Naomi Aro
|
7230b3ef58
|
removing tabletools from schedule page.
|
2013-08-16 12:57:04 -04:00 |
|
denise
|
50d5685199
|
CC-5270: looping on InvalidContentType
|
2013-08-14 17:43:14 -04:00 |
|
denise
|
5f588afdd5
|
CC-5293: Calendar page cannot be loaded sometimes
|
2013-08-14 13:07:06 -04:00 |
|
Naomi
|
fdf18ec3ce
|
upgrading table tools to version 2.1.5
|
2013-08-12 18:18:33 -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
|
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 |
|
Naomi
|
31c604d09c
|
can update an existing history item entry. Form is pre-populated.
|
2013-08-02 18:16:23 -04:00 |
|
Naomi
|
590837a357
|
crlf
|
2013-08-02 16:16:04 -04:00 |
|
Naomi
|
e047c2f71d
|
can configure the file summary template as well now.
|
2013-08-02 16:15:32 -04:00 |
|
Naomi
|
774027c9bd
|
crlf
|
2013-08-02 15:30:35 -04:00 |
|
Naomi
|
c110b4b4df
|
file summary table now starting to work with templates.need to change query around to be configurable still.
|
2013-08-02 15:29:39 -04:00 |
|
Naomi
|
557b3f9c9b
|
CRLF
|
2013-08-01 16:37:10 -04:00 |
|