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
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
a18fc87d97
CC-5065 : Playlist length is not built on actual cue in/out value
2013-05-08 14:19:22 -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
9f6a1033ea
CC-5109: Fix race-condition when updating cc_pref table
2013-05-07 16:21:34 -04:00
ad82b4ff98
throw exception if we get unexpected numbers of results in cc_pref
2013-05-07 15:36:21 -04:00
92f6ec029f
CC-5079: Timeline -> Moving items in linked shows doesn't work
2013-05-07 14:49:24 -04:00
75e4e0c9b6
CC-2301 : only showing waveform buttons if the browser supports the audio api.
2013-05-03 14:42:42 -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
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
2a1ac0ddb9
CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps.
2013-04-30 16:27:31 -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
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
a5264aac1e
CC-4961: Show linking
2013-04-26 16:10:01 -04:00
52655ab375
CC-4961: Show linking
2013-04-26 13:43:30 -04:00
0f1383d541
CC-4961: Show linking
2013-04-25 09:00:37 -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
8f6b583fcb
CC-5061:
...
Use propel transactions for StoredFile class
2013-04-19 20:40:31 -04:00
fd78ad29bf
cleanup of function names
2013-04-19 20:24:05 -04:00
f39f9329cc
CC-4992:
...
Decouple pypo from Airtime install
-first commit
2013-04-19 20:10:51 -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
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
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
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
418bf0b5ff
Created calendar service and moved the context menu creation there
2013-03-26 16:03:53 -04:00
ef8f87df5d
Show linking
2013-03-25 16:28:53 -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
896e03d76b
CC-4961: Show linking
...
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
f9f4e4f1fb
CC-4961: Show linking
...
Made some progress on show editing
2013-03-12 18:01:12 -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
8415dfdf6f
Add comments
2013-03-08 12:18:24 -05:00
af622eb4b8
CC-4961: Show linking
...
Refactored some more show instance creation functions
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
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -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
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
d1301ff676
CC-4954: Please make Library page remember the status per user
...
-done
2013-02-19 10:58:48 -05:00
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -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
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
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
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
8db71eac52
CC-4914: Update is_scheduled after tracks play out
...
-done
2013-02-05 16:52:25 -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
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
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
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
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
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
2ef8604c31
remove unnecessary code
2013-01-25 16:23:12 -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
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
1e336fa2d7
CC-4875: use a reference when iterating over show events
2013-01-24 12:00:31 -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
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
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
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
57629b4eac
Changed path to locale directory from absolute to relative
2013-01-17 14:31:40 -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
f7e8fd33fd
CC-4848: Streaming server passwords should be hidden with dots, once entered
...
-fixed
2013-01-16 14:36:56 -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
bb2f9316af
CC-4841: Silan script
...
- temp commit
2013-01-15 11:16:50 -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
fae3f3a03f
CC-2184: Hardcoded CSS path should be relative path instead
...
-Make '/' the default root
2013-01-14 16:00:38 -05:00
dcf3526000
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-10 18:09:00 -05:00
55fa8b8dc1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-10 14:52:45 -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
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
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -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
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
f308305df8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 18:18:59 -05:00
a65e72941f
CC-4805: Localization -> Changing default language changes datatables and add media language setting
...
-fixed
2013-01-07 18:18:40 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
51425d451f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-07 13:49:09 -05:00
ecbff94f11
CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist
...
- fixed
2013-01-07 13:48:51 -05:00
82da4dcfe8
CC-4599: Calendar: Add an icon to indicate show is not fully booked
...
-done but a new icon is needed
2013-01-07 12:41:28 -05:00
771b9b9412
Fixed whitespace in Preferences page between 'Timezone' and colon
2013-01-07 11:41:29 +00:00
63c847080f
CC-4732: Ask for admin username + password in Stream Settings page
...
- CRLF
2013-01-03 18:02:19 -05:00
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
e2c87ed8b6
CC-4781: Store localization settings on a per-user basis
...
-done
2013-01-03 16:19:02 -05:00
a1837366be
Merge branch 'cc-3018-silence-detection' into devel
2013-01-03 14:08:21 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
d6eb043899
CC-4765: Webstream of AAC type can't be previewed
...
-fixed
2013-01-02 16:09:32 -05:00
dcdbc3160d
CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly
...
- fixed
2013-01-02 11:41:33 -05:00
0596d1c391
Merge branch 'cc-4759-add-aac-stream-in-support' into devel
...
Conflicts:
python_apps/media-monitor2/media/monitor/pure.py
2012-12-27 17:29:25 -05:00
ee8dde07c8
add support for AAC input streams
2012-12-27 17:18:47 -05:00
c0665e4748
CC-4754: Replay gain modifier
...
- Initial commit
2012-12-27 00:36:11 -05:00
127d0187b7
CC-4706: Calendar -> Context menu -> Show content does not work
...
-fixed
2012-12-03 11:45:06 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
2f0c6b702a
CC-1960: Internationalize Airtime / Support translations
...
- created locale table
- create locale model
- set default locale in pref table
2012-11-29 18:21:03 -05:00
542434d9f0
CC-1960: Internationalize Airtime / Support translations
...
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
2012-11-28 16:16:39 -05:00
9acfb6c181
CC-1960: Internationalize Airtime / Support translations
...
- overwrote default zend form error messages
2012-11-27 17:11:29 -05:00
42d535a922
CC-1960: Internationalize Airtime / Support translations
...
-unlocalized some strings
2012-11-27 12:33:43 -05:00
3b124e6f5d
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-saving block length was including files that do not exist
2012-11-26 15:05:27 -05:00
b677130a3f
CC-1960Internationalize Airtime / Support translations
...
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
2012-11-23 16:39:41 -05:00
5ba964c783
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-23 14:03:51 -05:00
75adf9b6a1
CC-4701: same webstream played twice in a row does not work.
...
-fixed
2012-11-23 14:03:31 -05:00
dd0e71efcc
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
2012-11-22 17:32:24 -05:00
87d0383533
CC-4703: Now Playing duration column ignores any cue point set
...
- fixed
2012-11-22 14:37:57 -05:00
8483439551
CC-4709:
...
Exception happens when DJ try to click a Webstream not belongs to himself
- fixed
2012-11-22 10:29:40 -05:00
c0e49b69e2
Merge branch 'devel' into cc-1960-internationalize-airtime
2012-11-21 17:17:53 -05:00
2172ee82d3
Merge branch '2.2.x' into devel
2012-11-21 17:17:32 -05:00
2a4e4c6405
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 14:17:46 -05:00
25ddd083bc
CC-1960: Internationalize Airtime / Support translations
...
-added language option in preferences
2012-11-21 12:44:50 -05:00
10b6dd202e
Merge branch 'devel' into cc-1960-internationalize-airtime
...
Conflicts:
airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
2012-11-21 11:44:40 -05:00
f88a7bdb31
Merge branch '2.2.x' into devel
2012-11-21 10:54:17 -05:00
48253b8d14
CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
...
-fixed
2012-11-21 10:19:21 -05:00
8d9fa1976e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-20 16:39:04 -05:00
3c1f80de68
CC-4658: Smart Block: Unable to drag songs into block directly
...
- fixed
2012-11-20 16:38:43 -05:00
fe44d23b74
CC-4715: Better management of tracks that are shorter than they claim to be.
2012-11-20 16:31:27 -05:00
3a682aeada
cc-4585: fixed + added logging
2012-11-20 15:25:41 -05:00
7124cbe04d
fixed bug where hidden files would be shown in library
2012-11-20 15:18:41 -05:00
20855c73b5
refactoring + fix typo
2012-11-20 15:10:38 -05:00
a76b9b305f
CC-1960: Internationalize Airtime / Support translations
...
-added gettext wrapper to all strings in models
2012-11-20 11:33:37 -05:00
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
9c612d17a3
CC-4694: Apache/Zend error only specific to some users
2012-11-19 18:41:31 -05:00
7efa7169ca
CC-4700: Return mime type of streams instead of null
...
-fixed
2012-11-15 16:41:46 -05:00
2b2a1db055
CC-2401: Shuffle option in playlists
...
- done
2012-11-13 17:32:10 -05:00
6145f9bcad
Merge branch '2.2.x' into devel
2012-11-08 17:28:23 -05:00
33b2520c14
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-08 17:27:28 -05:00
628e6bed37
CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
...
- fixed
2012-11-08 17:26:55 -05:00
7300b608cf
Merge branch 'cc-4661-listener-statistics' into devel
...
Conflicts:
python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
9112a8d0b1
CC-4661: Listener Statistics
...
- enhancement on flot
- data point reduction
2012-11-07 16:26:31 -05:00
ccd6447696
- install failed due to wrong metadata key
...
- wrong controller action called
2012-11-07 12:05:20 -05:00
b817684972
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
504d9968f1
CC-4639:
...
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit
- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
2012-11-06 16:32:00 -05:00
a99191f4bd
CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
...
-fixed
2012-11-06 11:14:40 -05:00
8e69e50eea
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
...
Conflicts:
airtime_mvc/application/models/ListenerStat.php
2012-11-06 11:06:58 -05:00
6ef646124e
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-fixed
2012-11-06 10:58:25 -05:00
2e79e8421c
CC-4661: Listener Statistics
...
- better legend for multiple series of data
- consistant number of ticks on x-axis
2012-11-06 10:54:52 -05:00
4218a7f30d
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:48:56 -05:00
080c3ec944
CC-4661: Listener Statistics
...
-factor out mountname into it's own table
2012-11-05 15:38:35 -05:00
90a93e9a6c
CC-4664: Playlist/Block preview: Tracks deleted from library still get played
...
-fixed
2012-11-05 13:58:11 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
bd3cf543bf
made param useless in listAllFiles since its now safe to pass all files to MM
2012-11-05 11:11:05 -05:00
1c628bd831
renamed displayable to visible
2012-11-05 10:57:18 -05:00
acf954f637
changed hidden check to displayable check
2012-11-05 10:55:54 -05:00
6e89fdab30
changed file existence checks to displayable
2012-11-05 10:14:49 -05:00
b6341e44b3
removed pointless code duplication
2012-11-05 10:12:03 -05:00
34248921fc
refactored code to use displayable
2012-11-05 10:09:34 -05:00
aa9a6691f2
added a single test for checking if a file should be shown or not
2012-11-05 10:08:29 -05:00
311c88a8a2
added check for hidden in buildEntry
2012-11-05 09:54:00 -05:00
a62e64969d
Removed commented method
2012-11-05 09:49:49 -05:00
00a4e45491
added check for hidden in buildEntry
2012-11-05 09:47:16 -05:00
800f8b9ded
added criteria to remmove hidden files in blocks
2012-11-05 09:40:58 -05:00
4522fa94b2
added clause to exclude hidden files from getShowListContent
2012-11-05 09:30:21 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
7e03333496
changed deletion by the user to be setting the file to be hidden instead
2012-11-03 01:33:13 -04:00
9c4f2e3298
refactored addWatchedDir to use early return style
2012-11-03 01:16:57 -04:00
5d3aa68c72
written method to unhide all files in a music dir
2012-11-03 01:09:36 -04:00
a93b588a09
Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics
2012-11-02 18:25:23 -04:00
74fe958cad
CC-4661: Listener Statistics
...
- changes for different mount names
2012-11-02 18:25:08 -04:00
34d0ee5954
CC-4661: Listener Statistics
...
-add mount point names
2012-11-02 18:04:32 -04:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
106b18bf30
CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library
...
-fixed
2012-11-02 17:49:32 -04:00
8b70136dd6
CC-4661: Listener Statistics
...
- db change commit
2012-11-02 17:44:06 -04:00
7f27e5ff3f
- ListenerStat Model
2012-11-02 16:28:13 -04:00
5cb83909d8
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-02 16:00:09 -04:00
796274e4ef
CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
...
-fixed
2012-11-02 15:51:36 -04:00
aec11feba5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-02 14:59:02 -04:00
ba1f6ed054
CC-4374: Nowplayling page: Cannot remove tracks from recording show
...
-fixed by disallowing dragging into recording shows
2012-11-02 13:24:47 -04:00
135aadf16b
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
3478797744
cc-4661: new database tables for listener stats
2012-11-02 11:32:02 -04:00
feb6c9d6f5
CC-4636: Exception happens when trying to remove user that have created some smart block
...
- doing delete cascade on cc_block on deleting users
2012-11-01 17:45:28 -04:00
575400b4c2
CC-4623: Library: Preview button for Flac does not work
...
- fixed
2012-11-01 16:44:37 -04:00
270eb97128
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585
2012-11-01 15:14:53 -04:00
5b14c4fe88
CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
...
-fixed
2012-10-31 17:19:27 -04:00
2507e0f8a4
CC-4655: DJ's can delete files that they do not own
...
-fixed
2012-10-31 16:51:29 -04:00
4cca80fe44
Added schema changes
2012-10-31 16:23:12 -04:00
fc613aa597
CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
...
-fixed
2012-10-31 16:01:17 -04:00
cc40dfdf4e
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-added comment
2012-10-31 14:16:16 -04:00
71be2b2bd1
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-31 12:36:56 -04:00
fd0e1c3c95
CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
...
-fixed
2012-10-31 12:36:45 -04:00
2e4d5ec142
CC-4539: Advanced search: Sample rate searched on Hz, but search results
...
shown in kHz
- fixed
2012-10-31 12:32:40 -04:00
9293a26738
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
...
tracks meet the time limit
- code optimazation
2012-10-31 12:05:17 -04:00
1899d588ee
- CRLF fix
2012-10-30 18:03:03 -04:00
cbee9422ec
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:58:16 -04:00
9d495ebc03
CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
...
- done
2012-10-30 17:57:58 -04:00
9b77007e03
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-10-30 17:19:51 -04:00
8c90c1a12f
CC-4645: Add support for x-scpls playlist types
...
-fixed
2012-10-30 17:19:40 -04:00
5061dfa05d
CC-4647: apache error log entries
...
- fixed
2012-10-30 12:36:50 -04:00
denise
Martin Konecny
Naomi
drigato
James
james
Daniel James
martin
Martin Konecny
Rudi Grinberg