3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -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
a1f3309cf7
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-09-25 16:41:35 -04:00
99669c78a0
Fixed CC-5045 and Now Playing time remaining style improvements
2013-09-25 16:40:20 -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
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
ee45f10aeb
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:42:35 +02:00
0e20e5b50b
Merge branch '2.4.x' into ryerson-history
2013-09-07 16:51:22 +02:00
0b66f62045
Removed old jquery syntax
2013-09-06 11:08:01 -04:00
614a8174d5
put "no show" at the end of the select by default.
2013-08-31 22:56:22 -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
de225c589f
restricting search properly for select all/none.
2013-08-30 02:31:23 -04:00
ad531f9512
clearing internal selected items array.
2013-08-30 02:24:16 -04:00
846c90bc8f
fixing select all/none button
2013-08-30 02:11:26 -04:00
a4e9cd1add
can research times in show summary now.
2013-08-30 01:51:33 -04:00
8971e6330a
removing animation for smoother effect.
2013-08-30 01:39:51 -04:00
53c326b320
pagination buttons look better if they can fit on the same line.
2013-08-30 01:23:35 -04:00
7b54d3b6ce
fixing colour to go back to default theme
2013-08-30 01:08:49 -04:00
2c88d1e0a0
formating the date start/end of each show in the accordian.
2013-08-30 01:06:59 -04:00
15e27f8166
history records for a show have times validated within show range.
2013-08-30 00:43:43 -04:00
5a8957273f
removing choice for show instance if in shows tab.
2013-08-29 18:52:40 -04:00
d50cdd16c2
starting association of a show instance.
2013-08-29 17:40:08 -04:00
91d4d1224e
redoing accordian properly.
2013-08-29 15:52:24 -04:00
ec31fd50c9
deleteing items from the show table.
2013-08-29 15:34:34 -04:00
5780eb5bbe
show tables filtering by instance id.
2013-08-29 15:17:24 -04:00
803409f151
creating a show table beginning
2013-08-29 11:01:03 -04:00
a4c97479b6
using an accordian to display per show logs.
2013-08-28 23:30:15 -04:00
429cdeeffb
filtering by a host's show so they can edit their own playout history.
2013-08-28 19:37:46 -04:00
653a6384b9
creating a separate controller for playouthistory templates.
2013-08-28 18:25:46 -04:00
5fbc3867f8
removing default button after pressing.
2013-08-28 15:57:29 -04:00
e6b09308a5
IM-932 : File Metadata Distinction/Template Design
2013-08-28 15:40:10 -04:00
3769f5e5db
IM-933 : datepicker switch/design
2013-08-28 14:54:44 -04:00
05054fa823
IM-931 : Icon Overlap
2013-08-28 14:48:35 -04:00
f08a732c11
reinitialize form after error check.
2013-08-28 13:42:33 -04:00
dbe160c5d9
beginning of displaying form errors, need to keep working on this.
2013-08-23 15:52:49 -04:00
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
b2828d466d
need delegation with delayed initialization.
2013-08-23 13:38:20 -04:00
f1b1352077
matching selected row colours to the library table.
2013-08-23 13:31:37 -04:00
59ba938334
implementing select all/none etc
2013-08-23 13:18:17 -04:00
63ce35b38d
initializing only when viewed. fixes flash buttons, saves load time.
2013-08-23 12:28:37 -04:00
dd0115f573
proper showTimeFirst file
2013-08-23 11:53:31 -04:00
5ec8665aec
adding datetimepicker with showTimeFirst option
2013-08-23 11:48:26 -04:00
fb37f371e2
changing enddate at all times now, problem with setting time otherwise.
2013-08-22 22:21:08 -04:00
3e8f49c00d
only automatically set the end date if it is blank.
2013-08-22 21:46:17 -04:00
af822bb5b9
showing time first for endtime box.
2013-08-22 21:39:46 -04:00
48e6ddbb04
set the end time to be the starttime on change.
2013-08-22 20:48:00 -04:00
01370c2124
reverting back to the bootstrap datetime picker since it's nicer to use.
2013-08-22 20:23:17 -04:00
ec7f4fa1ef
default display length is 25.
2013-08-22 15:45:09 -04:00
8ed3e23195
output columns are only the sortable columns (everything except checkbox pretty much)
...
pdf output is default landscape now.
2013-08-22 15:19:38 -04:00
f7531d5da2
remove sizing of history content div in JS. CSS to fix width and containing box problems.
2013-08-22 14:50:58 -04:00
5c0ba2e79b
clearing custom Label name after adding
2013-08-22 14:23:07 -04:00
fa6de28bcf
not allowing double file metadata to be added to avoid query problems.
2013-08-22 14:15:40 -04:00
17abb4ad9a
need a better random field name generator to avoid problems
2013-08-21 21:44:52 -04:00
007a7ee7ef
casting non mandatory types from "", to avoid database query problems.
2013-08-20 17:23:15 -04:00
2e572c652c
creating a random string for field names to work for all languages.
2013-08-20 15:31:13 -04:00
6d5febe4f7
getting rid of characters from a field name that may cause problems.
2013-08-20 15:18:05 -04:00
10ef55b083
context menu just in the client now. works for both tables.
2013-08-20 14:58:22 -04:00
3ea2b920a6
crlf
2013-08-19 23:20:26 -04:00
09693ef174
changing to context menu single edit/delete.
2013-08-19 23:19:13 -04:00
9b45b9dc72
converting to a jquery UI based datepicker.
2013-08-16 15:12:00 -04:00
673c422015
replacing booleans in table with checkbox + column title
2013-08-14 16:38:59 -04:00
fdf18ec3ce
upgrading table tools to version 2.1.5
2013-08-12 18:18:33 -04:00
d83c004fb9
subclassing the template types, files summary table is now fully configurable form wise.
2013-08-12 15:06:26 -04:00
5676decd2d
Using local copy of jquery UI 1.8.24
2013-08-09 17:11:34 -04:00
d201efbe49
crlf
2013-08-09 15:52:50 -04:00
333ee7453e
downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x
2013-08-09 15:52:22 -04:00
5bdc1a1e4b
Update jplayer to 2.4.0
2013-08-09 13:04:33 -04:00
27b079ace9
adding a label to the form fields (Datatables column headers)
2013-08-07 17:55:18 -04:00
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
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
a5a99da21e
Editing templates, strictly typing metadata for datatables (for unions)
2013-08-01 16:36:18 -04:00
7ca28fe81d
history item datatable is set up with configurable columns now.
...
should add a field when configuring template field for "display name"
2013-07-31 17:38:48 -04:00
7ca3048f36
can add a new list item using the template.
...
set a default item template
working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
8eecbb18c0
propel rename done for template fields, template name input.
2013-07-29 17:21:46 -04:00
16581088d9
working on configuring an item template UI.
...
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
c0206ff8f4
CRLF
2013-07-29 08:59:04 -04:00
7183396da5
needed to update jquery, fullcalendar needed updating for the new JS.
...
working on configuring a template.
2013-07-29 08:57:31 -04:00
46ecdf393d
dynamic form rendering for template
...
bootstrap datetime widget.
jquery update is needed, testing with hosted jquery first.
2013-07-26 17:33:17 -04:00
c7b5592fa9
starting to populate with the template.
2013-07-26 11:36:58 -04:00
ecb2f81211
creating an new row for edit/delete links in the datatable
...
working on creating/editing records.
2013-07-23 18:01:43 -04:00
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -04:00
f76bb5209e
CC-5222: Calendar: Ends time of show is missed in Weekly view
2013-07-19 12:46:04 -04:00
29c8570ade
editing in progress
2013-07-18 01:31:20 -04:00
c744d88f23
IM-784 : Create Editing Abilities For History
2013-07-08 18:00:02 -04:00
3f9e756912
CC-5245: It's able to edit contents for current ON AIR linked show
2013-06-20 12:56:05 -04:00
3391aa90c5
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-10 15:57:21 -04:00
93192853d5
CC-5221
...
Don't refresh Calendar after closing add/remove popup
2013-06-10 15:57:08 -04:00
deecc9db7b
CC-5220
...
Cancelled show still appears on Dashboard
2013-06-10 15:55:57 -04:00
fe0b0b9a65
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-10 15:54:32 -04:00
ee1cf64515
CC-4504 : Double scrollbars in Library view
2013-06-10 15:52:46 -04:00
01f835c4c4
CC-4504 : Double scrollbars in Library view
2013-06-10 15:50:33 -04:00
af595e0c8a
CC-5217
...
Calendar: "NaN..." appears at date field sometimes
fixed
2013-06-10 14:52:43 -04:00
b18495a79e
CC-5210: "Linked" Icon is missing after adding contents into linked show
...
-fixed
2013-06-07 15:15:52 -04:00
311e0c103d
small fix
2013-06-07 14:44:21 -04:00
8bc93fcba7
CC-5218: Provide show id and linked flag to calendar events
...
Prefixed attribute names with "data"
2013-06-07 14:36:52 -04:00
ede618b3ad
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-07 13:58:00 -04:00
ee41e13fe1
CC-5218: Provide show id and linked flag to calendar events
2013-06-07 13:57:48 -04:00
ade1890acd
CC-5210:
...
"Linked" Icon is missing after adding contents into linked show
-fixed
2013-06-07 13:52:13 -04:00
86f3985c03
CC-5206:
...
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page
fixed
2013-06-04 14:52:26 -04:00
afda0c140b
CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set.
2013-05-30 15:50:35 -04:00
527b1eaf1d
CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist
2013-05-30 15:05:57 -04:00
6520211b4d
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 16:19:30 -04:00
9545d8aacb
Removed dropping and recreating cc_schedule table index before inserting into this table.
...
We thought it would be a significant performance booster but it isn't
2013-05-28 16:19:17 -04:00
c5550d31fd
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 14:28:28 -04:00
4d1a15b7ca
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 14:27:59 -04:00
8f418fb34c
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 14:18:38 -04:00
950cc6d6b7
CC-5177: Create "?" icon beside linked show check box
2013-05-28 14:18:26 -04:00
51573d36c9
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 13:30:47 -04:00
96eefee407
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-28 13:12:15 -04:00
5a2b9796ec
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-28 13:11:47 -04:00
951eeb0bbe
CC-5178:
...
Dashboard: Error happens after creating a show
-fixed
2013-05-28 11:07:45 -04:00
408ecc530d
CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time
2013-05-27 14:37:16 -04:00
4c791e573b
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 11:57:00 -04:00
9ce3b0c043
small modifications to make the waveform enabled in firefox 21 (playout does not work though)
2013-05-27 11:55:57 -04:00
69f6295553
CC-5108 : Waveform Editor UI
...
error check for if both tracks cannot be decoded.
2013-05-24 11:27:56 -04:00
f5e03db9fe
CC-5108 : Waveform Editor UI
...
making sure the correct li is activated when a track has a decoding error.
2013-05-24 11:23:08 -04:00
46cc2d00b8
Removed CRLF
2013-05-24 10:30:37 -04:00
0e9c9e3946
Updating de_DE datatables and plupload language files. Thanks to Silvio Mende
2013-05-24 10:29:07 -04:00
75e6f21ce0
CC-5108 : Waveform Editor UI
...
putting on the timescale for time reference.
fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
c57de650e8
CC-5172 : errors from setting cues in waveform editor not handled properly
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
8e990e2bf9
CC-5170:
...
Sometimes the dashboard does not show the current playing file
-fixed
2013-05-22 16:03:24 -04:00
7ec664823d
Fixes whitespace to the left of 'Open Media Builder' button (CC-5166)
2013-05-22 10:23:42 +01:00
717cda984a
Fixed 'steam' typo in stream settings tooltip
2013-05-22 10:21:27 +01:00
3ad7c868e2
Merge branch 'SAAS-317-datatables-reorder' into 2.4.x
2013-05-21 17:44:25 -04:00
b720086a4b
SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library
...
missing single quote problem, updating column visible plugin.
2013-05-21 17:40:52 -04:00
fb605ccb71
Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page
2013-05-21 09:30:35 -04:00
0f1a94532e
CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action
...
Fixed. Also had to prepare the warning message for localization.
2013-05-17 14:47:34 -04:00
01d16348db
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-17 13:20:40 -04:00
ae41a4f9ff
more persistent links (won't be invalid if title changes)
2013-05-17 13:20:28 -04:00
5bf91d513d
CC-5127: Library -> Scheduled and Playlist columns needs better icon
...
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
3010d014b4
Hungarian translation
2013-05-16 12:47:40 -04:00
ca6442f7f0
ensure we are parsing in base 10
2013-05-15 17:18:52 -04:00
05dc0b7dbc
added comments, remove deprecated code, better var names...
2013-05-15 16:44:36 -04:00
018c88d12a
CC-5063:
...
"Nothing Scheduled" appears between 2 scheduled tracks
-fixed
2013-05-15 16:43:58 -04:00
10154ae724
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-15 15:39:07 -04:00
b0cdc606f8
CC-5096 : Add "i" (info) icon to stream output type
2013-05-15 15:38:46 -04:00
b2c8cb0f9d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 19:18:51 -04:00
bb36556bb9
IM-629
...
-filter by using instance id instead of show id
Conflicts:
airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
393c8abb95
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 18:14:51 -04:00
denise
Albert Santoni
Daniel James
Naomi Aro
cliff.wang
drigato
Martin Konecny