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
5c11f5fc72
Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2013-05-22 18:08:14 -04:00
bb5889e6a5
CC-5172 : errors from setting cues in waveform editor not handled properly
2013-05-22 17:52:02 -04:00
0bfcd32554
CC-5172 : errors from setting cues in waveform editor not handled properly
2013-05-22 17:50:34 -04:00
254d3b8950
Merge branch '2.4.x' into 2.4.x-saas
2013-05-22 16:09:02 -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
3b9b23a7dd
Merge branch '2.3.x-saas' into 2.4.x-saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/models/Schedule.php
python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -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
92d0a6178e
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:34:04 -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
a061464ffb
Merge branch '2.3.x' into 2.3.x-saas
2013-04-04 15:14:04 -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
eb3fda8423
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 17:12:14 -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
863c2c11cc
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 16:34:28 -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
01cca88c58
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 15:02:43 -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
43ffa2aece
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -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
1c80701488
Merge branch '2.3.x' into 2.3.x-saas
2013-03-05 16:21:47 -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
3f7ccf6967
fix missing closing parentheses
2013-03-04 11:41:42 -05:00
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05: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
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -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
8bdf3508b0
CC-4951: Add cue in and cue out to library filter columns
...
Done
2013-02-19 13:38:35 -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
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
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
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
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
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
ad334d9e74
CC-4926: System-> Preference: Please limit the default fade value less than 60
...
- added a range validator of 0 - 59.9 on default fade
2013-02-06 15:44:52 -05:00
ba4cb16171
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
-typo
2013-02-06 14:35:39 -05:00
55970a4b20
CC-4925: Changing User permissions to a higher level ends up with show editing problems
...
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
2013-02-06 14:32:13 -05:00
8e82db1bc7
CC-4921: Now Playing: Cannot insert items into current playing show
...
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
2013-02-05 17:57:21 -05:00
909f2c95c4
XSS exploit prevention - audio preview
2013-02-05 17:24:39 -05:00
8db71eac52
CC-4914: Update is_scheduled after tracks play out
...
-done
2013-02-05 16:52:25 -05:00
50bfcb7eb8
XSS exploit prevention
...
- Calendar -> show content
2013-02-05 15:37:00 -05:00
23c29455d9
Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values
2013-02-05 13:18:25 -05:00
63439c276d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-05 10:56:54 -05:00
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
103ad6fe6d
CC-4909: php warning
...
-fixed
2013-02-04 16:32:03 -05:00
60d6f5585b
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:27:09 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
e2472f1f5d
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:21:56 -05:00
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -05:00
20a3f674b4
CC-4897: XSS exploit on library page
...
-fixed where this was happening on Calendar - show content
2013-02-04 12:12:57 -05:00
d63865625d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-04 11:06:53 -05:00
1f0b9fa5dc
CC-4897: XSS exploit on library page
2013-02-04 11:06:46 -05:00
93ec4c001b
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
8309593a0f
CC-4904: Library -> Sort by status doesn't work
...
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
384298f680
CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist
2013-02-01 12:06:01 -05:00
d4e89df94e
CC-4895: Remove all json die() statements from code
2013-01-31 14:06:45 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00
4f5d7869d8
Removed html from Library/contents-feed and StoredFile model
...
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -05:00
216b580395
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 14:40:47 -05:00
52d96241da
CC-4754: Replay gain modifier
...
-fix regression
2013-01-30 14:40:29 -05:00
cc5acf3c9e
improved logging for boolean vars
2013-01-30 14:34:06 -05:00
595429e6e5
CC-4897: XSS exploit on library page
...
-fixed
2013-01-30 11:51:27 -05:00
043fbd1dfb
CC-4886: Warn if track is part of a playlist when deleting from library.
...
-done
2013-01-30 10:55:24 -05:00
694c54f272
Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel
2013-01-30 10:35:29 -05:00
d4742577c9
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 10:20:27 -05:00
c45440482a
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 08:57:59 -05:00
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
5f3f2cd97c
CC-4881: Cue in time can be greater than Cue out time in some situations
...
-fixed
2013-01-28 16:46:11 -05:00
f1215c10fd
CC-4882: Scheduled item does not take into account cue_out - cue_in time
...
-fixed
2013-01-28 14:21:11 -05:00
d47469be25
read num bytes used from file instead of calculating manually
2013-01-25 16:36:57 -05:00
2ef8604c31
remove unnecessary code
2013-01-25 16:23:12 -05:00
c6493f9d74
remove unecessary saas code
2013-01-25 16:22:08 -05:00
22aafda2a8
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 14:17:23 -05:00
d0a4141ae4
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-25 12:44:37 -05:00
a6f4805e1a
CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on...
...
-fixed
2013-01-25 12:44:20 -05:00
20d8bf3bc7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:33:50 -05:00
a16e8d05aa
-don't push new schedule until end of request
2013-01-25 12:33:27 -05:00
9d6f2ebdf4
remove unecessary code
2013-01-25 12:32:37 -05:00
5b04b2d82a
Merge branch '2.3.x-saas' of dev.sourcefabric.org:airtime into 2.3.x-saas
2013-01-25 12:12:35 -05:00
7c327e4c75
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:12:21 -05:00
0cf8526f87
CC-4878"Send support feedback" button at initial login tries to load " http://showbuilder " and was missing the local host IP.
...
-fixed
2013-01-25 11:51:56 -05:00
7bea2df8bd
Live chat was in audio preview and listen popup windows
2013-01-25 11:38:15 -05:00
1873022a13
CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
...
-fixed
2013-01-25 11:21:34 -05:00
6f5ffdc1e7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-24 17:49:08 -05:00
c3f2bf57de
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-further optimization by looking at the preferred time scale
2013-01-24 14:02:50 -05:00
2f3a30b580
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
2013-01-24 12:52:24 -05:00
ef806b8357
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-24 12:14:12 -05:00
091f5ff49f
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
f4f6f9043a
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-24 12:00:47 -05:00
1e336fa2d7
CC-4875: use a reference when iterating over show events
2013-01-24 12:00:31 -05:00
548b73db42
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-remove an unnecessary roundtrip to server
2013-01-23 18:31:45 -05:00
78f617cacb
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
- put makeFullCalendarEvent inline with loop
- removed unnecessary epoch time conversion
2013-01-23 17:33:34 -05:00
adaab6ba96
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
-added a 5 second grace period for checking if shows are partially filled
2013-01-23 16:31:20 -05:00
9714b44d7f
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
2013-01-23 16:27:26 -05:00
9fd3b43bb2
CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
...
Made improvement by accessing db just once to determine if each show instance is full or not
2013-01-23 16:12:16 -05:00
77b0c21192
Small refactor
2013-01-22 10:39:20 -05:00
ac6c279bef
Removed extra '/' is audio preview url
2013-01-21 20:20:29 -05:00
c0ca6b381f
merge conflict cleanup
2013-01-18 17:48:13 -05:00
909e290bd3
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-01-18 17:38:48 -05:00
dfa392d914
CC-4868: Replay gain modifier is not setting the correct value
...
- fixed
2013-01-18 17:29:38 -05:00
b9c7ea1184
CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist
...
-fixed
2013-01-18 17:22:54 -05:00
210336d20a
Merge branch 'devel' into 2.3.x-saas
2013-01-18 17:14:11 -05:00
e0efaea0c9
CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory
...
-fixed
2013-01-18 17:10:52 -05:00
280c4a81ad
CC-4859: I18N: "AND" and "OR" for Smartblock's criteria need to be translated.
...
-fixed
2013-01-18 17:04:39 -05:00
c1941fea2b
Merge branch 'devel' into 2.3.x-saas
2013-01-18 14:45:55 -05:00
ad0879996d
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-use existing function to convert seconds to time format
2013-01-18 14:35:17 -05:00
22ecc3f1fc
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-fixed
2013-01-18 14:28:45 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
ed7b22118c
Merge branch 'silan-script' into devel
2013-01-18 11:54:10 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
e2b83a0c8c
CC-4857: Playlist length will increase every time I duplicate it.
...
- fixed
2013-01-17 22:20:28 -05:00
4a7b345649
fix exception on support settings page
2013-01-17 17:35:16 -05:00
94a87a0b2e
Smart block tooltip content breaks when language setting is not english
2013-01-17 16:19:35 -05:00
6acc5696f9
Save button on edit user settings was not translating
2013-01-17 14:34:18 -05:00
57629b4eac
Changed path to locale directory from absolute to relative
2013-01-17 14:31:40 -05:00
796099b413
CC-4860: Library -> Context Menu -> Can't download files
...
-fixed
2013-01-17 13:37:32 -05:00
784cb390d3
Merge branch 'devel' into 2.3.x-saas
2013-01-17 10:56:18 -05:00
e4c2f43d9e
CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect.
...
-fixed
2013-01-16 15:40:50 -05:00
6640c1ea4b
CC-4856: 2.3.x-saas: Overwriting metadata doesn't take effect
...
-fixed
2013-01-16 14:45:14 -05:00
f7e8fd33fd
CC-4848: Streaming server passwords should be hidden with dots, once entered
...
-fixed
2013-01-16 14:36:56 -05:00
8b12f692cd
CC-4854: Remove SaaS checking from codebase
...
-fixed
2013-01-16 14:31:43 -05:00
9d8c9149fd
remove code that will never be executed on SaaS branch
2013-01-16 14:06:04 -05:00
dbaf7d9b4b
Merge branch 'devel' into 2.3.x-saas
2013-01-16 13:41:27 -05:00
ab83029b2f
CC-4852: 2.3.x-saas: Exception happens when updating System -> Preferences
...
-fixed
2013-01-16 12:44:26 -05:00
9cb4633823
CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref
...
-fallback to default settings if user setting is not set
2013-01-16 12:42:58 -05:00
bd3d12bd26
CC-4849: 2.3.x-saas: Empty page for Support feedback
...
-fixed
2013-01-16 12:34:20 -05:00
712df8b12d
Removed extra style element
2013-01-16 11:10:23 -05:00
5f12bc713d
Bumped copyright date to 2013
2013-01-16 12:24:45 +00:00
e98d6e92bb
Merge branch 'devel' into 2.3.x-saas
2013-01-15 15:38:27 -05:00
973a415164
-fix installation error
2013-01-15 15:37:26 -05:00
c57e19983c
-fix merge mistakes from devel
2013-01-15 14:06:02 -05:00
8cd6bd9aa4
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
bb2f9316af
CC-4841: Silan script
...
- temp commit
2013-01-15 11:16:50 -05:00
175dbcbabc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 17:09:03 -05:00
ea70357920
- remove logging
2013-01-14 17:08:47 -05:00
a85b394d63
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 17:02:05 -05:00
692c1a1c9e
CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated
...
-fixed
2013-01-14 17:01:50 -05:00
8c19384d32
- CRLF fix
2013-01-14 16:21:02 -05:00
9ae3559305
Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2013-01-14 16:19:51 -05:00
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00
0dfd8acf7a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 16:00:46 -05:00
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
a55bc9973c
- temp commit
2013-01-14 14:43:02 -05:00
9603e7c2fd
CC-4830: I18N: System -> Streams: "dB" for Replay Gain Modifier is not translated
...
-fixed
2013-01-14 14:30:59 -05:00
7b4693e5f9
CC-4831: I18N: Error message of background settings when creating a show is not translated
...
-fixed
2013-01-14 14:13:32 -05:00
8ea3aca3a0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 14:07:55 -05:00
cf09175ff1
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI.
...
- done
2013-01-14 13:57:32 -05:00
891e993cd1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-14 13:56:24 -05:00
d4124f916d
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI.
...
- done
2013-01-14 13:56:00 -05:00
2c3e79e842
CC-4832: I18N: Tool tip for show is partially filled in Calendar page is not translated
...
-fixed
2013-01-14 13:53:27 -05:00
1e6b0fe6ae
CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated
...
-fixed
2013-01-14 13:47:41 -05:00
83be01d0d0
CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated
...
-fixed
2013-01-14 13:42:17 -05:00
f067b952db
CC-4829: Password Verify does not work on Lucid
...
-code cleanup
2013-01-14 12:17:33 -05:00
83a450565e
CC-4829: Password Verify does not work on Lucid
...
-fixed
2013-01-14 12:07:17 -05:00
1666a04451
CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings
...
- done
2013-01-14 11:28:48 -05:00
8362860904
Block expansion ajax url was missing baseUrl
2013-01-11 14:11:01 -05:00
89274e43b3
fix spelling mistake
2013-01-11 13:17:08 -05:00
dcf3526000
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-10 18:09:00 -05:00
a129b0b081
CC-4472: User password verify or clear text display.
...
-done with password verify
2013-01-10 17:51:25 -05:00
55fa8b8dc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 14:52:45 -05:00
9f857433fa
CC-4817: I18N: "Playlist Shuffled" is not listed for translation
...
-fixed
2013-01-10 14:22:25 -05:00
a0be1c647e
CC-4786: Refresh page when language setting changes
...
-configure localization and reinitiliaze edit user form after the user locale is set
2013-01-10 14:01:03 -05:00
dffe932223
Added missing base directory to urls
2013-01-10 13:58:11 -05:00
2797809c74
CC-4786: Refresh page when language setting changes
...
-done
2013-01-10 13:55:52 -05:00
048ee05030
CC-4821: Add option to disable ReplayGain
...
- done
2013-01-10 13:49:41 -05:00
c20ed7ebad
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 12:04:44 -05:00
690a6d2654
Removed user id from cc_pref keystr value
2013-01-10 12:04:27 -05:00
4bf9ab60d9
CC-4819: Tracks length in Scheduler is 0.0 all the time
...
- fixed in better way
2013-01-10 11:49:02 -05:00
0aeea61006
CC-4822: Cannot preview playlist
...
-fixed
2013-01-10 10:52:39 -05:00
594a38da16
CC-4770: Playlist's length doesn't counts Webstream and Smartblock in
...
- the bug was introduced by CC-4668
- fixed
2013-01-09 22:53:29 -05:00
3a72302a3c
CC-4819: Tracks length in Scheduler is 0.0 all the time
...
- fixed
2013-01-09 22:19:39 -05:00
1572955d07
CC-4810: Add language setting to login page
...
-done
2013-01-09 18:03:23 -05:00
db62b538dd
CC-4816: Timezones should be a user preference
...
-done
2013-01-09 13:38:38 -05:00
f887ca3d8d
CC-4813: Users -> Do not save username on User Management page
...
-fixed
2013-01-09 13:25:18 -05:00
03da2aee80
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:51:58 -05:00
3b2b275c30
CC-4809: Listen popup UI breaks with localization
...
-fixed
2013-01-08 17:51:42 -05:00
6e7f45e615
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:32:39 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
22e4811b22
Add gettext wrapper function to string missing it
2013-01-08 16:51:11 -05:00
9755ea6a20
CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file
...
-fixed
2013-01-08 16:47:00 -05:00
87bfc81ca0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:53:33 -05:00
6097196dd7
CC-4813: Users -> Do not save username on User Management page
...
-fixed
2013-01-08 15:52:56 -05:00
6d48e1faf0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:52:33 -05:00
adda497bbb
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 15:52:11 -05:00
1ee90ed9b9
CC-4790: Media Monitor: Re-added files won't show up in Library
...
-fixed
2013-01-08 15:42:35 -05:00
0612a595c9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:14:42 -05:00
178abcfada
CC-4785: Zend errors on page not found
...
-partially fixed
2013-01-08 15:14:33 -05:00
a7992c291e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 15:09:55 -05:00
3de33bc3e3
CC-4811: Move the edit user form to its own page
...
-done
2013-01-08 15:09:35 -05:00
45e3fccae2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 12:31:22 -05:00
b580a7be73
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 12:31:14 -05:00
denise
Martin Konecny
Naomi Aro
drigato
Daniel James
James
james