d50cdd16c2
starting association of a show instance.
2013-08-29 17:40:08 -04:00
f97069bd0b
displaying show list in proper time zone.
2013-08-29 15:58:24 -04:00
8208f8596b
ordering by show start time
2013-08-29 15:37:33 -04:00
5780eb5bbe
show tables filtering by instance id.
2013-08-29 15:17:24 -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
5aa983be36
adding an instance id to the playout history table.
2013-08-28 17:15:36 -04:00
e6b09308a5
IM-932 : File Metadata Distinction/Template Design
2013-08-28 15:40:10 -04:00
969889859b
improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp.
2013-08-28 13:07:55 -04:00
6d5531f341
CC-5310 : Playlist -> Crash happens on draging a song after a webstream into a playlist
2013-08-27 19:30:17 -04:00
b1e71e5adf
added optional parameter number_of_days for getting schedule information
2013-08-26 11:26:09 +12:00
c2b9bb01ac
crlf
2013-08-23 15:53:18 -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
af822bb5b9
showing time first for endtime box.
2013-08-22 21:39:46 -04:00
01370c2124
reverting back to the bootstrap datetime picker since it's nicer to use.
2013-08-22 20:23:17 -04:00
fa6de28bcf
not allowing double file metadata to be added to avoid query problems.
2013-08-22 14:15:40 -04:00
84efdfd64a
crlf
2013-08-20 17:23:48 -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
7230b3ef58
removing tabletools from schedule page.
2013-08-16 12:57:04 -04:00
50d5685199
CC-5270: looping on InvalidContentType
2013-08-14 17:43:14 -04:00
7cf654551d
crlf
2013-08-14 16:39:50 -04:00
673c422015
replacing booleans in table with checkbox + column title
2013-08-14 16:38:59 -04:00
5f588afdd5
CC-5293: Calendar page cannot be loaded sometimes
2013-08-14 13:07:06 -04:00
c48f556b7d
CC-5303: Interface freezes sometimes when using smart blocks
2013-08-13 16:41:32 -04:00
033693721e
CC-5302: Undefined variable in zend log
2013-08-13 16:36:04 -04:00
c3c64e6fb1
crlf
2013-08-12 18:18:58 -04:00
fdf18ec3ce
upgrading table tools to version 2.1.5
2013-08-12 18:18:33 -04:00
b65007868a
crlf fix
2013-08-12 15:08:09 -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
557b7b641c
downgrading UI to a version that still supports our custom CSS (not enough time to upgrade further)
2013-08-09 16:02:07 -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
31c604d09c
can update an existing history item entry. Form is pre-populated.
2013-08-02 18:16:23 -04:00
590837a357
crlf
2013-08-02 16:16:04 -04:00
e047c2f71d
can configure the file summary template as well now.
2013-08-02 16:15:32 -04:00
774027c9bd
crlf
2013-08-02 15:30:35 -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
b480a5ae18
crlf
2013-08-02 11:19:46 -04:00
6e43094d10
pagination working properly (but not with filtering, have removed serach for now anyways.)
2013-08-02 11:18:15 -04:00
8ba95b3587
CC-5262: PHP error happens when creating shows
...
SAAS only because there is no recording show form
2013-08-02 11:03:14 -04:00
35f552361e
more informative names
2013-08-01 17:50:10 -04:00
af38d3cb02
CRLF
2013-08-01 17:10:04 -04:00
2341b7b68c
can order data in the item table
2013-08-01 17:09:42 -04:00
557b3f9c9b
CRLF
2013-08-01 16:37:10 -04:00
a5a99da21e
Editing templates, strictly typing metadata for datatables (for unions)
2013-08-01 16:36:18 -04:00
06f5f2f5a7
CC-5283: Calendar gets messy, possibly after upgrade
2013-08-01 15:38:34 -04:00
b33f33964a
crlf
2013-07-31 17:39:45 -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
0c9c0c16e8
working on sql for custom templates
2013-07-30 20:04:10 -04:00
07819d895d
fix added to avoid a blank row in aggregate view
2013-07-30 19:32:31 -04:00
a170ee7308
crlf
2013-07-30 19:25:06 -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
06e21029d0
saving a template to the DB.
2013-07-29 17:35:07 -04:00
a2d4af5449
CRLF
2013-07-29 17:22:44 -04:00
8eecbb18c0
propel rename done for template fields, template name input.
2013-07-29 17:21:46 -04:00
db4e025c05
CRLF fix
2013-07-29 16:32:05 -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
7d70a5ed28
Deleting show code improvement.
2013-07-29 15:13:47 -04:00
ff557ec75f
CC-5283: Calendar gets messy, possibly after upgrade
2013-07-29 15:10:24 -04:00
1046a0916d
CC-5289: Exception about linked show in zendphp.log
2013-07-29 14:13:56 -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
4cbbd1145b
CC-5285: API Request: Get ON AIR light status
2013-07-24 15:30:49 -04:00
d9859ff006
CC-5285: API Request: Get ON AIR light status
2013-07-24 15:17:10 -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
c2f2a541c7
CC-5285: API Request: Get ON AIR light status
2013-07-23 17:39:38 -04:00
69afc715d1
creating templates for validation.
2013-07-22 18:11:44 -04:00
19ba788bae
CLRF
2013-07-22 10:47:11 -04:00
634eb40a0c
creating an entry.
2013-07-22 10:45:39 -04:00
ec44b81f6a
clrf
2013-07-18 01:37:39 -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
1abbe85d6d
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
dos2unix fix
2013-07-03 16:02:17 -04:00
e63518f2da
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
moving original functionality into the service.
2013-07-03 16:00:48 -04:00
9f7e85b273
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
2013-07-03 15:20:40 -04:00
328c1f3cac
IM-733 Create Development timetable for Airtime Development
...
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
e0d2de642d
CC-5254 : Listener Status for SHOUTcast doesn't work
...
clrf
2013-06-24 17:26:20 -04:00
c5221aae6a
CC-5254 : Listener Status for SHOUTcast doesn't work
2013-06-24 17:24:43 -04:00
3858371b16
CC-5251 : clrf
2013-06-24 11:15:09 -04:00
a680421281
CC-5251 : Playlist length is not shown in Library
2013-06-24 11:09:03 -04:00
bec56e5f4b
CC-5247 : Single file audition pop-up has non-functional forward and reverse buttons
2013-06-24 10:19:10 -04:00
c2e9f90eb9
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-06-20 15:22:00 -04:00
f82cb364c1
CC-5246: Calendar: ON AIR show has an incorrect context menu
2013-06-20 15:21:33 -04:00
6b0ab535e5
CC-5244 : Exception when creating Smartblock
2013-06-20 14:03:13 -04:00
28d73264da
CC-5240: Overnight Linked Shows, newly generated not getting content
2013-06-19 01:17:32 -04:00
b95a0d7c4a
CC-5241: deleting a linked show, show comes back in the schedule
2013-06-18 16:56:16 -04:00
2a0c9769aa
Merge branch '2.4.x'
...
Conflicts:
airtime_mvc/public/js/airtime/showbuilder/builder.js
python_apps/pypo/liquidsoap_scripts/fdkaac.liq
python_apps/pypo/schedule/pypofetch.py
python_apps/pypo/schedule/telnetliquidsoap.py
2013-06-14 16:45:52 -04:00
440163f199
CC-5225 : Library: Fail to open Metadata Editor
2013-06-12 13:05:58 -04:00
3b353b47b1
CC-5216: Library length does not consider cue points
2013-06-07 14:19:46 -04:00
3f1c47b764
CC-5215: Linked shows sometimes lose crossfades
2013-06-07 13:47:12 -04:00
c9b7deba52
CC-5213: Crossfades aren't properly applied in schedule table sometimes
2013-06-07 13:07:08 -04:00
eaf337f317
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:30:24 -04:00
66af5cddd9
Trying things
2013-06-07 11:30:13 -04:00
f4aba1a189
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:29:45 -04:00
02ca82f85e
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:17:35 -04:00
bef2dc190e
Trying things
2013-06-07 11:17:35 -04:00
ccb3da3192
CC-5209: Calendar -> Repeat by 5th day of the week problem
2013-06-07 11:17:35 -04:00
59c68569ab
CC-5208: DJ can try to edit show not assign to him
2013-06-07 11:17:35 -04:00
9f3e1d61d1
Use proper unit conventions for Kilo
2013-06-07 11:17:35 -04:00
eeb73b7206
CC-5199
...
aacencplus encoder is very low quality
2013-06-07 11:17:35 -04:00
99cc75ef51
users can open the current show to schedule and also rebroadcast shows.
2013-06-07 11:17:35 -04:00
6498f43dad
CC-5211:
...
Php Exception: Set large number as year in tracks Metadata
fixed
2013-06-06 17:02:01 -04:00
046039ece1
CC-5207:
...
media-monitor restart will reset the cuein/cueout value
-fixed
2013-06-05 16:14:14 -04:00
bad5b12472
CC-5208: DJ can try to edit show not assign to him
2013-06-05 12:05:41 -04:00
92bb9874a6
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-31 15:59:27 -04:00
905dd08ed5
Use proper unit conventions for Kilo
2013-05-31 15:59:20 -04:00
82a71fdb61
CC-5199
...
aacencplus encoder is very low quality
2013-05-31 15:59:04 -04:00
12302aa1dc
users can open the current show to schedule and also rebroadcast shows.
2013-05-31 11:42:35 -04:00
f28ab12281
Fixed typo.
2013-05-31 09:40:23 -04:00
2c35a0416a
clrf fix
2013-05-30 16:53:03 -04:00
61427647d6
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 16:52:17 -04:00
891cc80069
CC-5190 : Playlist: Copy playlist will lost cue in/out setting
2013-05-30 16:52:03 -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
4728a90ce5
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 15:43:49 -04:00
c1c90a4b9a
Smart block fix
2013-05-30 15:43:31 -04:00
5fbae77c1f
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-30 15:38:34 -04:00
1fa0ee49d6
CC-5190 : Playlist: Copy playlist will lost cue in/out setting
2013-05-30 15:36:55 -04:00
527b1eaf1d
CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist
2013-05-30 15:05:57 -04:00
67e50354e9
CC-5189: Typo: Stream type's tooltip
2013-05-30 11:14:46 -04:00
3f97b071fe
CC-5187: Edit show -> disable linking option if show is currently playing
2013-05-30 11:06:45 -04:00
f9645980a4
Updating .po files with new string added
2013-05-29 15:28:26 -04:00
91ea1f2240
CC-5184: Timeline -> Filter by show option doesn't work
2013-05-29 15:00:35 -04:00
59d1b1e968
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-29 14:24:41 -04:00
e2810606ab
CC-5186: Edit current playing show throws exception sometimes
2013-05-29 14:24:29 -04:00
2a2fd45567
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-29 13:48:01 -04:00
362eba60d5
CC-5181
...
Library -> Edit Metadata:Exception in zendphp.log if trying to set a really large number as track number
-fixed
2013-05-29 13:47:55 -04:00
d3355a527a
Removed commented out code
2013-05-29 13:18:37 -04:00
90e235350f
Small fix
2013-05-29 13:16:14 -04:00
4c2de70256
CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set
2013-05-29 13:14:44 -04:00
4a7a08a119
CC-5185: Liquidsoap: Sometimes the 1st track ends early when crossfading is set
...
Crossfades were not getting applied to the track end time
2013-05-29 12:49:48 -04:00
d00f8392bb
CC-5183: Use of undefined variable
2013-05-29 12:34:00 -04:00
0d436d323c
CC-5179: Now Playing: Schedule will be incorrect after insert action
...
Was not accounting for crossfade value when adjusting schedule times after insert
2013-05-29 11:42:02 -04:00
be59810810
CC-5180: Now Playing: No crossfading effects if inserting tracks one by one
2013-05-29 09:41:06 -04:00
50ece038c2
fix errors reported by Facebook's scheck
...
-controller dir
2013-05-28 17:45:09 -04:00
4ed7c4ccd3
fix errors reported by Facebook's scheck
2013-05-28 17:30:48 -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
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
85ee8aa0b2
Fixed bug where schedule start times were not getting calculated properly
2013-05-28 11:25:37 -04:00
bf6437cf09
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 17:02:46 -04:00
28f957be92
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
2013-05-27 17:02:34 -04:00
84abd78c8f
CC-5109: Fix race-condition when updating cc_pref table
...
-not a race condition..was a logic error.
2013-05-27 15:58:29 -04:00
1c452988cf
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-27 15:35:06 -04:00
90ad62e4f9
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Refactoring schedule inserts
2013-05-27 15:34:54 -04:00
5ba72d00bc
CC-5109 : Fix race-condition when updating cc_pref table
2013-05-27 15:33:53 -04:00
63b0d4194a
CC-5109:
...
Fix race-condition when updating cc_pref table
-not a race condition..was a logic error.
2013-05-27 12:30:58 -04:00
cee74b59f9
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Calculate crossfades during insert instead of after
2013-05-27 10:39:31 -04:00
f23fc472ef
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-24 17:01:15 -04:00
96ac9cb534
CC-5174: Linked Show: Update a regular show to linked show will move the whole scheduled time forward.
2013-05-24 09:43:03 -04:00
daa310ac18
CC-5175:
...
Now Playing: SQL syntax error happens when removing and add contents to current show.
-fixed
2013-05-23 18:37:30 -04:00
06fbbe89f2
CLRF fix.
2013-05-23 18:34:35 -04:00
6110d47941
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-23 18:33:53 -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
e104146b9a
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Removed propel from calculateCrossfades function and used prepared statements instead
2013-05-23 16:10:00 -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
02292569f9
CC-5172 : errors from setting cues in waveform editor not handled properly
...
Conflicts:
airtime_mvc/application/models/Playlist.php
2013-05-23 13:00:37 -04:00
0107f36206
Changed propel to prepared statements
2013-05-23 12:49:15 -04:00
792366e1f5
CC-5100: Now Playing: Editing schedule on-the-fly will cause 2 tracks mixed at the same time.
2013-05-23 11:35:56 -04:00
d82725cb54
CLRF fix
2013-05-22 15:35:59 -04:00
eda21307ff
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-22 15:34:16 -04:00
a569d2f3f5
CC-5163 : Waveform - Hard coded api path will cause fail to open file when airtime is put under subfolder
2013-05-22 15:33:49 -04:00
2e970bfc8a
Fixes date format in Smart Block tooltip (CC-5618)
2013-05-22 10:25:43 +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
d57836c42b
CC-5159: Repeating Shows doesn't populate correct dates sometimes
2013-05-17 13:10:15 -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
9133384789
is_scheduled flag was not getting updated when shows were deleted
2013-05-16 15:03:10 -04:00
3d09747990
CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show
2013-05-16 13:42:06 -04:00
5a86bd9ac4
CC-5149: Linked show: Regular show will be treat as linked show in some case
...
A new form was not getting sent to the user properly after a show creation
2013-05-15 15:47:45 -04:00
491ea6a32c
CC-5138: Linked Show: Time limitation exceeds when adding 24 hours smart block into daily repeating & linked shows
...
Made some small optimizations. Still needs more work.
2013-05-15 15:32:29 -04:00
f3edc2bee6
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
...
Fixed so it doesn't update files that are scheduled in other shows
2013-05-15 12:38:48 -04:00
254ebb709e
CC-5151: Calendar -> Remove all content -> Does not update scheduled flag in library
2013-05-15 11:25:30 -04:00
b2c8cb0f9d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 19:18:51 -04:00
5080807a21
IM-629
...
-fix minor SQL syntax error
2013-05-14 19:18:41 -04:00
b287409bfb
IM-629
...
-not using show_instnace_filter POST param correctly
2013-05-14 19:18:30 -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
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -04:00
78187a72ac
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:52:24 -04:00
74c0e390b6
CC-5147 : check builder feed on now playing page updating when not needed
...
wrong timestamp used when changing to prepared statement.
2013-05-14 16:51:34 -04:00
ec87a8ff88
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:09:22 -04:00
e1d0dc9b95
Updated .po files
2013-05-14 16:08:21 -04:00
809d5a35b9
CC-5108 : Waveform Editor UI
...
changing colour to be less dark. can better see highlights/drawn fades.
2013-05-14 15:49:13 -04:00
0dd8138c2b
CC-5131 : Please give user a message that Browser other than Chrome can't use waveform
2013-05-14 14:15:54 -04:00
2d09ba3a16
CC-4863: I18N:System -> Listener status: string is not translated
2013-05-14 11:50:01 -04:00
4ee7724149
CC-4864: I18N: Password reset page is not translated
2013-05-14 11:32:21 -04:00
c173744929
CC-5090: Unscheduled tracks are still marked at Scheduled in linked show
2013-05-14 10:58:06 -04:00
bfd525395a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 08:59:30 -04:00
9377e21293
Removed unnecessary function call when editing a show
2013-05-14 08:59:21 -04:00
d9b6a15fb6
CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block
2013-05-13 18:21:24 -04:00
872f68505b
CC-5108 Waveform Editor UI
2013-05-13 16:01:06 -04:00
2ba743a436
CC-5132 : Playlist Editor: Add file before Smart Block will cause exception
2013-05-13 12:23:05 -04:00
bd2462170b
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-13 11:42:11 -04:00
6b560eede1
Deleted unused functions in Show.php
2013-05-13 09:55:17 -04:00
82945038d5
CRLF fix
2013-05-10 17:44:50 -04:00
da46757e28
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 17:36:18 -04:00
b0018083c7
CC-5121 : fix some SQL statements not being escaped/prepared
2013-05-10 17:14:10 -04:00
ab13acba84
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 15:24:56 -04:00
6e0a3ffc60
CC-5102:
...
Cross Fading: No cross fading effect
-fixed start/end calculations
2013-05-10 15:24:43 -04:00
414348dd11
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 14:18:03 -04:00
13458ad687
CC-5122: Calendar -> linked show: Change the repeating weekday will lost all the contents
2013-05-10 14:17:54 -04:00
0c4691f3ea
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 13:20:07 -04:00
2250d89cbd
CC-5013:
...
Re-Added watched folder wont update
-fixed
2013-05-10 13:19:56 -04:00
c36333ae07
code cleanup
...
-user proper method for checking null
-reduce line length to 80 chars
2013-05-10 12:37:25 -04:00
987537fbdc
CC-5121 :fix some SQL statements not being escaped/prepared
2013-05-10 12:35:08 -04:00
d5e7185789
Merge branch 'sql-changes'
...
Conflicts:
airtime_mvc/application/models/StreamSetting.php
airtime_mvc/application/models/Subjects.php
2013-05-10 12:23:57 -04:00
5666b688a0
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
...
CRLF
2013-05-10 12:03:33 -04:00
263b89295f
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 11:59:49 -04:00
115af29f2e
Merge branch 'CC-5112-status-page'
2013-05-10 11:59:37 -04:00
8f31dd3069
CC-5112 : Listen Status: Please clean obsoleted mount point from status report page
2013-05-10 11:56:20 -04:00
f5fa033207
better flow in dispatchMetadata function
2013-05-09 17:37:23 -04:00
3948964e8d
remove useless log
2013-05-09 16:58:50 -04:00
afb24c37ab
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:07:34 -04:00
8cd8d0922f
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 16:05:04 -04:00
b7337d0df3
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-09 15:53:24 -04:00
40eb51b892
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:53:12 -04:00
9c05511613
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 15:08:47 -04:00
21df9013ee
CC-5121: fix some SQL statements not being escaped/prepared
2013-05-09 14:43:59 -04:00
3ed106af56
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-09 13:29:00 -04:00
92c7c9c951
should constants instead of literals - only in function for now...
2013-05-09 13:28:26 -04:00
540e817101
fixing sql to be prepared statements.
2013-05-09 13:28:22 -04:00
fedf564090
CC-5081: Calendar -> Add a linked show icon
2013-05-09 12:14:49 -04:00
9c8935af47
CC-5114: Calendar: User from different timezone will see the same start/end time when editing show
2013-05-09 09:35:27 -04:00
2e69b35d75
CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell
2013-05-08 16:28:45 -04:00
8344f3f3d5
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 15:09:10 -04:00
fe88e6249a
CC-5093: Please disable link option for recording show
2013-05-08 15:08:56 -04:00
35c8e80f6b
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 14:21:55 -04:00
a18fc87d97
CC-5065 : Playlist length is not built on actual cue in/out value
2013-05-08 14:19:22 -04:00
9dbec4636a
CC-5106: Calendar: Context menu "Show contents" is missing for past shows
2013-05-08 13:43:27 -04:00
b4dc17f7e8
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 12:06:00 -04:00
d8ba15fac4
CC-5091: Linked Show: Cannot change the start time ahead
2013-05-08 12:05:45 -04:00
299dfdc18a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 11:44:50 -04:00
fe916ec043
CC-2301 : adding in crossfade durations to smart blocks.
2013-05-08 11:43:53 -04:00
62d666ea4d
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 16:21:50 -04:00
9f6a1033ea
CC-5109: Fix race-condition when updating cc_pref table
2013-05-07 16:21:34 -04:00
80cdd3f2e2
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 16:16:45 -04:00
22b74126f9
CC-5087: Repeating show -> Same day by Month: Time slot of repeating instances aren't correct
2013-05-07 16:16:32 -04:00
ad82b4ff98
throw exception if we get unexpected numbers of results in cc_pref
2013-05-07 15:36:21 -04:00
0efe914352
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-07 14:49:38 -04:00
92f6ec029f
CC-5079: Timeline -> Moving items in linked shows doesn't work
2013-05-07 14:49:24 -04:00
f64e99176e
CC-510: Cue Editor: Please enable to preview the current cue in/out settings.
2013-05-07 12:46:44 -04:00
3a74bb7ca5
CC-2301 : removing shift buttons since it's disabled for this release.
2013-05-06 17:47:35 -04:00
6bdc2caaec
Merge branch 'CC-2301'
2013-05-03 16:15:39 -04:00
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -04:00
f3dce46a5a
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-03 11:37:28 -04:00
fac96996e3
CC-5084: Repeating show edited to linked doesn't add content to repeat instances
...
Fixed. If the each repeating instance has different content, we replace it
with the first instance's content
2013-05-03 11:37:11 -04:00
3fc6a0fbae
Merge branch 'master' into CC-2301
2013-05-02 18:02:09 -04:00
d902d38429
revert jsonEncode change not supported by older zend versions
2013-05-02 17:50:36 -04:00
bd1c1fa32f
Merge branch 'master' into CC-2301
2013-05-02 16:59:47 -04:00
ca22a25827
fix silly mistake with echoing json twice
2013-05-02 16:57:07 -04:00
435bb83588
CC-2301 : dos2unix being run
2013-05-02 16:52:30 -04:00
3e320f1e2e
Merge branch 'master' into CC-2301
2013-05-02 16:15:58 -04:00
517bb7557a
CC-2301 : testing default crossfade settings
2013-05-02 16:15:21 -04:00
0e5ba2f07f
CC-5085: Linked show: Changing a regular show to linked show and updating the weekday, all the contents will lost
2013-05-02 15:36:14 -04:00
ea73d98c49
CC-5075: Future bi-weekly linked shows don't get filled with content sometimes
2013-05-02 11:40:56 -04:00
09754b20cc
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
This was caused by the calendar trying to re-create single instance shows.
We needed to exclude non-repeating shows when populating the calendar with repeat events
2013-05-01 15:20:55 -04:00
3d61a18261
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
Small fix. Was treating object as an array
2013-05-01 14:42:53 -04:00
ded8ceb86b
CC-5082: Repeating shows "disappear" when switching calendar to next month
...
We were trying to call a function on an object that was not set
2013-05-01 14:40:33 -04:00
2b5a8b0d4b
CC-2301 : fixing changed function name after merging with master.
2013-05-01 11:41:07 -04:00
5ba5864d8c
CC-5078: Wrong start time if dragging dynamic smart block into a show
2013-05-01 11:29:32 -04:00
92ef0608d6
Merge branch 'master' into CC-2301
2013-05-01 11:04:14 -04:00
0362f24a4e
CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances
2013-05-01 10:30:51 -04:00
2a1ac0ddb9
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
2013-04-30 16:27:31 -04:00
ff2fde0173
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-30 15:54:20 -04:00
ec2f36efa8
CC-5077: Calendar -> Context menu -> Show Content -> shows incorrect time filled on edited repeat instances
...
- We weren't updating the time_filled column in cc_show_instances when creating the new show
2013-04-30 15:54:04 -04:00
2462e4f144
CC-2301 : CRLF fix.
2013-04-30 15:34:20 -04:00
0db557a570
CC-2301 : fades editor saving offset to database for playlists and smart blocks.
2013-04-30 15:32:43 -04:00
decb12f6b8
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-30 15:00:45 -04:00
de4934a317
ensure that uploaded file is UTF-8 encoded
2013-04-30 15:00:31 -04:00
4ca60ca676
CC-5074: Editing a linked instance sets incorrect schedule start times
2013-04-30 13:58:03 -04:00
2e03e1982f
CC-2301 : changing more CRLF files
2013-04-29 18:11:11 -04:00
b2a490ac47
CC-2301 : working on creating a crossfade method for waveforms.
2013-04-29 18:09:12 -04:00
58957cc919
CC-2301 : running dos2unix on 3 files.
2013-04-29 17:01:08 -04:00
410d298272
CC-2301 : creating an offset column to help create crossfades in the playlist.
...
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
1384c5d39d
Function call was missing an argument
2013-04-29 15:57:59 -04:00
71526a94cc
Merge branch 'cc-4961-show-linking'
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
de8f7b0ff7
CC-4961: Show linking
2013-04-29 15:27:14 -04:00
acfc72f422
use sendJson, instead of manually disabling layouts + encoding data
2013-04-26 18:06:07 -04:00
3a931f27bf
CC-4417: Opus codec support
2013-04-26 17:54:29 -04:00
a5264aac1e
CC-4961: Show linking
2013-04-26 16:10:01 -04:00
a4731d4af2
CC-2301 : automatically updating the fadein/fadeout for a track in the fadein/fadeout states.
...
Can enable states on a per track basis.
2013-04-26 15:57:02 -04:00
52655ab375
CC-4961: Show linking
2013-04-26 13:43:30 -04:00
8fea97d580
CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor.
2013-04-25 17:10:37 -04:00
0f1383d541
CC-4961: Show linking
2013-04-25 09:00:37 -04:00
0e3b4da52f
clear unused function
2013-04-24 15:17:06 -04:00
179621d687
CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks.
2013-04-24 14:15:07 -04:00
956bcccd24
CC-2301 : creating different states for the fade editor:
...
cursor, fadein, fadeout.
2013-04-23 16:36:35 -04:00
8f6b583fcb
CC-5061:
...
Use propel transactions for StoredFile class
2013-04-19 20:40:31 -04:00
243dda60f8
remove useless comment
2013-04-19 20:25:26 -04:00
fd78ad29bf
cleanup of function names
2013-04-19 20:24:05 -04:00
923f4ee180
CC-5062:
...
Add "error" logging level
-done
2013-04-19 20:11:33 -04:00
f39f9329cc
CC-4992:
...
Decouple pypo from Airtime install
-first commit
2013-04-19 20:10:51 -04:00
018ec9231e
don't print out anything extra after printing json
2013-04-18 16:20:34 -04:00
a9b5d00d87
CC-4961: Show linking
2013-04-18 16:12:26 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
04a0d9c54e
CC-2301 : waveform editor
...
current cues being set.
2013-04-17 18:00:16 -04:00
0d3c0912ba
CC-2301 : Waveform Editor
...
Cue editor can save values to the playlist.
2013-04-17 17:17:39 -04:00
0385285741
CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor.
2013-04-16 17:24:30 -04:00
13c8e5f146
CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box.
2013-04-16 14:37:08 -04:00
1a2a05c3cf
CC-4961: Show linking
2013-04-12 16:34:36 -04:00
9b4a0ba9c1
CC-4961: Show linking
...
Removed stamp tables
2013-04-12 10:52:13 -04:00
9b2fb3bece
CC-4961: Show linking
2013-04-09 15:55:18 -04:00
e64f6fb3fd
CC-4961: Show linking
...
-modified db
2013-04-08 14:43:27 -04:00
76bfce21b1
CC-4961: Show linking
...
-modified db
2013-04-08 14:42:37 -04:00
cfee74693b
CC-4961: Show linking
...
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
62d1b22fcc
CC-4961: Show linking
...
created new cc_show_stamp table
2013-04-05 12:27:54 -04:00
f9d7167638
CC-4961: Show linking
2013-04-04 16:30:33 -04:00
fcbac2a044
Merge branch '2.3.x' into devel
2013-04-04 15:15:19 -04:00
301115c035
CC-5039: Encoded forward slash causing lots of apache error logs
...
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
d1e72cfeea
Merge branch '2.3.x' into devel
2013-04-03 17:12:28 -04:00
a748b05125
CC-5040:
...
All API actions need to have consistent return value
-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
81dbb17922
CC-4961: Show linking
...
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
5ac51e289d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-04-01 19:15:02 -04:00
6ae8da98e4
removing logging
2013-04-01 19:14:55 -04:00
ab10ae68a2
CC-5036: Add back edit show instance functionality
2013-04-01 14:42:35 -04:00
1eba09fc4c
Show linking
2013-03-28 16:19:05 -04:00
d0691b114c
Show linking
2013-03-28 14:25:40 -04:00
731b86b36c
Added back editing a repeating show instance feature
2013-03-27 16:25:39 -04:00
e259639d1a
Removed scheduleController private variable, currentUser
...
Removed showService private variable, currentUser
2013-03-27 09:02:49 -04:00
ee617c8a70
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/UserController.php
2013-03-26 16:34:11 -04:00
d9646994e9
remove airtime-demo specific code
2013-03-26 16:33:14 -04:00
5dc0a4477b
disable deletion of users
2013-03-26 16:10:42 -04:00
418bf0b5ff
Created calendar service and moved the context menu creation there
2013-03-26 16:03:53 -04:00
894887bd62
Merge branch '2.3.x' into devel
2013-03-26 15:02:17 -04:00
230d1a6aa9
Fixed bug where shows weren't populating when moving forward in the calendar
2013-03-26 10:33:06 -04:00
ef8f87df5d
Show linking
2013-03-25 16:28:53 -04:00
5b69761833
CC-4961: Show linking
...
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
2013-03-25 13:48:11 -04:00
265ac49f2e
remove duplicate cc_config
2013-03-24 23:11:55 -04:00
b1160afeab
cleanup
2013-03-22 18:05:49 -04:00
d12f793578
remove potential password change exploit in airtime-demo
2013-03-22 18:05:34 -04:00
327d0dd6c9
CC-4961: Show linking
...
Add front-end for creating a show with monthly repeats on same day of week
2013-03-22 15:57:15 -04:00
187e49e4b2
CC-4961: Show linking
...
Added back-end functionality for creating monthly repeating shows on
the same day of the week
2013-03-22 14:57:02 -04:00
6766d208aa
CC-4961: Show linking
...
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
a7601d290f
CC-4961: Show linking
...
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
2013-03-21 10:05:11 -04:00
bae9f1202a
CC-4961: Show linking
...
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
2013-03-19 10:09:28 -04:00
4bdd89f747
CC-4961: Show linking
...
Fixed edit show start/end time bug
2013-03-18 12:34:27 -04:00
Naomi
Jamie Connor
cliff.wang
denise
drigato
Martin Konecny
Daniel James