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
84dfe127b6
Updating de_DE .po file. Thanks to Silvio Mende
2013-05-24 10:27:02 -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
dd28c8ae31
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-22 16:03:35 -04:00
8e990e2bf9
CC-5170:
...
Sometimes the dashboard does not show the current playing file
-fixed
2013-05-22 16:03:24 -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
18a1c7ad98
Localization updates for fixes in CC-5166 and CC-5168
2013-05-22 10:55:14 +01:00
2e970bfc8a
Fixes date format in Smart Block tooltip (CC-5618)
2013-05-22 10:25:43 +01: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
2f6e2e7de6
Merged in new string into updated de_DE .po file
2013-05-17 14:13:01 -04:00
abd3a37970
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
2013-05-17 14:09:32 -04:00
29225a8ea3
Updating de_DE .po file. Thanks Silvio Mende!
2013-05-17 14:09:19 -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
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
dc664ad9ff
CC-5156: Hungarian language is shown in strange font on login page
2013-05-17 11:05:38 -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
f4d313a67c
Hungarian translation locale option
2013-05-16 12:50:12 -04:00
3010d014b4
Hungarian translation
2013-05-16 12:47:40 -04:00
3208ab0fd1
Merge branch 'patch-2' of git://github.com/picizse/Airtime into picizse-patch-2
2013-05-16 12:28:23 -04:00
70b734c940
Update Chinese po file
2013-05-16 11:16:36 -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
148e1b9e46
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-15 15:48:04 -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
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
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
393c8abb95
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 18:14:51 -04:00
7d5177d77d
CC-5096 : Add "i" (info) icon to stream output type
2013-05-14 18:14:38 -04:00
af7b2d5347
IM-629
...
-fix using instance id instead of show id
2013-05-14 17:18:20 -04:00
992e3c37ef
IM-629
...
-add missing POST parameter
2013-05-14 17:18:11 -04:00
22a12dd1a9
IM-629
...
-show only single show at a time
2013-05-14 17:18:03 -04:00
43e825fe49
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 16:57:28 -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
70a8d3d5dd
CC-5146:
...
Output Stream Settings: Please disable options opus and aac when streaming server is SHOUTcast
-fixed
2013-05-14 16:16:58 -04:00
8901d6b4d9
Committing new compiled .po files
2013-05-14 16:14:19 -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
741507fab1
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-13 09:22:50 -04:00
ba82e3b3ae
Added missing localization files for en_GB, and de_AT
2013-05-13 09:22:40 -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
27b79c2e91
CC-5128: Library -> Do not auto sort by scheduled
2013-05-10 16:17:30 -04:00
a9d0b53954
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-10 16:08:07 -04:00
79bc927a30
CC-5130: Calendar -> Linked icon disappears if show is full
2013-05-10 16:07:54 -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
a3eda62bb2
CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only
2013-05-10 15:18:54 -04:00
7b8a37065a
CC-5080: Calendar -> Warn user a show cannot be linked again once it has been unlinked
2013-05-10 14:53:01 -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
d06b2f3f94
CC-5116:
...
Please add opus into the file name filter
-fixed
2013-05-08 17:06:50 -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
ce81691743
CC-2301 : not allowing any sliding with only global crossfade durations.
2013-05-03 15:32:07 -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
f82659d582
CC-2301 : stopping playlist editor to make sure audio isn't stuck playing in the background.
2013-04-30 17:03:40 -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
ef100f89f1
CC-2301 : not drawing fades of length zero.
2013-04-26 17:54:37 -04:00
3a931f27bf
CC-4417: Opus codec support
2013-04-26 17:54:29 -04:00
0169c01724
CC-2301 : updating waveform code for states
2013-04-26 16:23:46 -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
6cc366b100
CC-5069:
...
Airtime 2.4 upgrade scripts
-initial commit
2013-04-26 13:43:40 -04:00
52655ab375
CC-4961: Show linking
2013-04-26 13:43:30 -04:00
628af95325
CC-2301 : needed to adjust cueout if length information is inaccurate.
2013-04-26 12:38:13 -04:00
2b22828e85
CC-2301 : destorying dialogs instead of just closing to free up resources.
2013-04-25 17:48:35 -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
0deaee4d0e
CC-2301 : disallowing movement of first track in fade editor.
2013-04-24 15:32:48 -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
d46fef8eda
SAAS-301: Calendar content indicator did not update automatically after adding content to a show
...
-fixed
2013-04-11 15:11:20 -04:00
3714f83757
Merge branch '2.3.x'
2013-04-11 15:06:21 -04:00
5cd6dd907b
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-04-11 15:04:29 -04:00
3000f543d8
SAAS-301:
...
Calendar content indicator did not update automatically after adding content to a show
-fixed
2013-04-11 15:04:16 -04:00
a7cdaa9629
Updated translation files against current strings
2013-04-11 18:20:25 +01:00
1bb5f171a8
Updated Canadian localization, eh? :-)
2013-04-11 17:05:33 +01:00
de6ccd9c72
Updated US English localization
2013-04-11 17:02:53 +01:00
f1cbca1ed8
Hungarian Translate
...
Hungarian Translate
Translated by Magyar Zsolt
2013-04-11 06:18:23 +03:00
0da0e798c6
make password input width same as text input width. Also make everything a little wider.
2013-04-10 18:19:46 -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
b40306cb1b
Add comment to schema.xml to indicate what the broadcasted column is of cc_schedule
2013-04-03 16:21:30 -04:00
81dbb17922
CC-4961: Show linking
...
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
563f5b64d2
Merge branch '2.3.x' into devel
...
Conflicts:
debian/postinst
2013-04-02 12:31:48 -04:00
860524a873
Added locales for English localizations
2013-04-02 17:19:48 +01:00
ebbb9f1b9c
Added Austrian German localization, thanks Hoerich!
2013-04-02 17:06:16 +01: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
896e03d76b
CC-4961: Show linking
...
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
5735baf237
CC-4961: Show linking
...
Made progress on ShowInstanceService
2013-03-13 11:08:16 -04:00
f9f4e4f1fb
CC-4961: Show linking
...
Made some progress on show editing
2013-03-12 18:01:12 -04:00
438200425a
CC-4961: Show linking
2013-03-12 11:33:32 -04:00
c721b81a13
CC-4961: Show linking
...
Refactoring
2013-03-12 10:30:31 -04:00
7347be35b1
Created a new service for show days
...
Created a new user service
Started refactoring edit show action
2013-03-11 16:18:40 -04:00
1cc823ef0e
Inital edit show reconfiguration changes
2013-03-08 17:10:35 -05:00
116d98a81b
Removed comment
2013-03-08 16:10:07 -05:00
d8ced29dd0
Refactored adding show forms to the view
2013-03-08 16:08:43 -05:00
8415dfdf6f
Add comments
2013-03-08 12:18:24 -05:00
5111f74494
Created function to set the next populate until date for repeating shows
2013-03-08 12:17:55 -05:00
9be6b82d97
Fixed rebroadcast date bug
2013-03-08 12:06:45 -05:00
846e940f82
Merge branch 'cc-4961-show-linking' of dev.sourcefabric.org:airtime into cc-4961-show-linking
...
Conflicts:
airtime_mvc/application/services/ScheduleService.php
airtime_mvc/application/services/ShowInstanceService.php
airtime_mvc/application/services/ShowService.php
2013-03-08 11:24:54 -05:00
4a86da5f87
Created function to create repeating show instances
...
Created function to create rebroadcast show instances
2013-03-08 11:19:03 -05:00
5ceeb88899
Merge branch '2.3.x' into devel
2013-03-06 13:46:01 -05:00
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
af622eb4b8
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-03-06 09:58:35 -05:00
c29e11fa0f
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-03-06 09:58:35 -05:00
d497cfa857
Created show service
2013-03-06 09:58:35 -05:00
99c07272fd
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
bdab294fce
Added comments to Schedule Service
2013-03-06 09:58:35 -05:00
d08f6cf3e1
CC-4961: Show linking
...
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
0ef1a5ffda
CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast
...
-fixed
2013-03-05 18:19:08 -05:00
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
d7d1170ee1
CC-5003:
...
Some tracks are being cut off before fully playout out
-fixed
2013-03-04 18:52:51 -05:00
00d577fd5b
CC-4985: Ensure files deleted via the UI are deleted from stor directory.
...
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
943538ed9d
Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard"
...
This reverts commit baf693d1a9
2013-02-27 14:35:35 -05:00
baf693d1a9
CC-4980: Create graphic with 4 switches for Airtime Dashboard
2013-02-27 17:36:43 +01:00
c7203aa40d
CC-4961: Show linking
...
Refactored some more show instance creation functions
2013-02-26 17:41:35 -05:00
8c8a7d11e1
Created empty showInstance service.
...
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
2013-02-26 13:21:39 -05:00
2717c0845b
Created show service
2013-02-26 10:20:02 -05:00
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
9f0baba4f8
- Moved all form validation to it's own function in schedule service
...
- Moved show creation to it's own function in schedule service
2013-02-25 17:31:43 -05:00
3e49421221
Added comments to Schedule Service
2013-02-25 09:15:03 -05:00
22f52ca195
CC-4961: Show linking
...
-initial schedule service experimentation
2013-02-21 17:57:56 -05:00
176e78632f
Added a comment about referring to the wiki when adding a new datatable column
2013-02-19 16:43:47 -05:00
c8d7d23d62
CC-4963: Add cue in and cue out to smart block criteria list
...
Done
2013-02-19 16:38:58 -05:00
959839e180
Renamed criteriaTypes to libraryColumnTypes for library advanced search
2013-02-19 15:09:24 -05:00
32fc5eb758
CC-4951: Add cue in and cue out to library filter columns
...
Configured advanced search for these columns
2013-02-19 14:44:32 -05:00
8bdf3508b0
CC-4951: Add cue in and cue out to library filter columns
...
Done
2013-02-19 13:38:35 -05:00
49dc3140a8
CC-4962: Library -> Library and playlist editor have different heights sometimes
...
Fixed: needed to set height when we open the playlist editor
2013-02-19 11:59:17 -05:00
9113853e41
Removed logging messages from Library controller, index action
2013-02-19 11:51:26 -05:00
c0c6ac5d75
CC-4954: Please make Library page remember the status per user
...
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
2013-02-19 11:37:22 -05:00
14f1d5572f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-19 10:59:03 -05:00
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -05:00
542553bbc1
Merge branch '2.3.x' into devel
2013-02-15 17:05:36 -05:00
9a2b8af7b1
Revert "CC-4955: Datatables saves its parameters twice on every page load"
...
This reverts commit 39ec07e71c
2013-02-15 16:50:43 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
09baf3a47d
remove unecessary file + better error handling
2013-02-15 14:19:04 -05:00
39ec07e71c
CC-4955: Datatables saves its parameters twice on every page load
...
-fixed
2013-02-15 14:18:32 -05:00
4f3ea3f406
Update ColReorder Datatables plugin
2013-02-14 17:48:32 -05:00
b30f67b24b
CC-4950: builder-feed is called twice on NowPlaying screen load
2013-02-14 15:49:38 -05:00
e2e45b0160
CC-4948: Library -> library loses have its width when window is resized
...
-fixed
2013-02-14 15:34:11 -05:00
1a36953d82
CC-4898: Pressing "Enter" from anywhere on the edit metadata popup should automatically Save and close the popup
...
-fixed
2013-02-14 14:52:48 -05:00
58740d6b41
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-14 13:33:27 -05:00
b3ab84db2e
add minified datatables.js and upgrade from 1.9.1 to 1.9.4
2013-02-14 13:33:18 -05:00
9e0d14a8a7
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-14 13:31:39 -05:00
1b5b7ae1f7
Stopped refetching calendar events when calendar is resized
2013-02-14 13:31:22 -05:00
9086c55281
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-14 12:58:40 -05:00
bb7e56e39e
CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned
...
-fixed
2013-02-14 12:58:31 -05:00
06dbcfbcf8
Shorten Greek translation of 'Scheduled Play' (CC-4947)
2013-02-14 17:18:45 +00:00
cd5f1149af
CC-4924: Calendar: "View Recorded File Metadata" for record show still uses old Metadata Editor
...
-fixed
2013-02-14 11:43:29 -05:00
74291cc248
Merge branch 'cc-3627-close-playlist' into devel
2013-02-13 17:57:41 -05:00
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -05:00
6bbb603bcd
CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality
2013-02-13 16:05:11 -05:00
04ed640756
CC-3885: Deleted open playlist is not closed until a new item is added to it
...
-fixed
2013-02-13 15:44:52 -05:00
76cb04e296
CC-4538: Cannot edit title or change time of repeating show if first instance has ended
...
- fixed by populating the edit show form with the next repeating show that is not in the past
2013-02-13 11:55:27 -05:00
eb38503d6e
CC-4946: Now Playing -> Apache error when empty show starts
...
-we were trying to update the is_scheduled flag on a non-schedule item
2013-02-13 11:51:25 -05:00
4ff1e8e78a
CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
...
-fixed
2013-02-13 11:29:43 -05:00
50613dd9a8
CC-4907: Library -> Adding items to show doesn't add the correct item sometimes
...
-fixed
2013-02-12 17:21:21 -05:00
30c47df93d
Audio preview wasn't working in Firefox when airtime is not in document root
2013-02-11 15:56:21 -05:00
2c1fa283da
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed for playlists that contain dynamic blocks
2013-02-11 14:17:18 -05:00
51ade73e85
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed
2013-02-11 13:45:51 -05:00
3c73535f70
Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents
2013-02-11 12:37:20 -05:00
6071dea839
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
-small fix on where to set clip length
2013-02-11 12:32:20 -05:00
69054806c4
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
2013-02-11 12:24:06 -05:00
e8bde50909
CC-4939: All webstreams in a playlist will have 0 length in Schedule
...
- set cuein and cueout of playlist item if it is a webstream
2013-02-11 11:17:00 -05:00
5f9f342e07
Added strings to Greek localization
2013-02-08 11:14:19 +00:00
192db754ea
Fixed typos in US localization
2013-02-08 11:11:20 +00:00
654cc6233f
Improved British localization
2013-02-08 11:05:48 +00:00
8232244faa
Improved Greek localization with extra strings, thanks Kat!
2013-02-08 10:31:20 +00:00
2c9d208db8
Added bug report address to Greek translation
2013-02-08 10:17:15 +00:00
8bdf50c0e8
Fixed translation of 'Settings'
2013-02-08 10:14:22 +00:00
2315e3473d
CC-4935: Smart Block -> Error when saving sometimes
...
-fixed
2013-02-07 17:33:11 -05:00
9a893aea49
Fixed some typos
2013-02-07 17:13:04 -05:00
93017b8477
Added Greek datatables and plupload language files
...
Added Greek to locale db table
2013-02-07 16:43:24 -05:00
a37e032494
Adding Greek po file
2013-02-07 16:23:20 -05:00
8124d096d0
Removed log message
2013-02-07 15:56:35 -05:00
c39b99da6c
CC-4839: Nginx doesn't allow liquidsoap to check uploaded file, which blocks uploading any file
...
-fixed
2013-02-07 15:42:06 -05:00
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
969e34aba1
CC-4930: Calendar -> Recorded shows have 'show partially filled' icon
...
-fixed
2013-02-07 12:22:32 -05:00
2935670455
Refined Brazilian Portuguese localization, thanks to Luciano De Fazio!
2013-02-07 10:21:45 +00:00
7cf45afd16
Changed 'Polish' to 'Polski'
2013-02-06 17:03:01 -05:00
532ea09eed
Added Polish datatables and plupload translation files
...
Added Polish to upgrade script and default data
2013-02-06 16:46:12 -05:00
d028e00cdb
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-06 16:30:11 -05:00
7bc4151741
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-06 16:29:41 -05:00
3c0d7955b5
Merge branch 'devel' of https://github.com/sematuszewski/Airtime into devel
2013-02-06 16:29:34 -05:00
drigato
Martin Konecny
Naomi
denise
Daniel James
cliff.wang
picizse
Vladimir