Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,026 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1955 Commits

Author SHA1 Message Date
Martin Konecny 4ed7c4ccd3 fix errors reported by Facebook's scheck 2013-05-28 17:30:48 -04:00
denise 6520211b4d Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 16:19:30 -04:00
denise 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
Naomi Aro 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
denise 85ee8aa0b2 Fixed bug where schedule start times were not getting calculated properly 2013-05-28 11:25:37 -04:00
Naomi bf6437cf09 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 17:02:46 -04:00
Naomi 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
Martin Konecny 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
denise 1c452988cf Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 15:35:06 -04:00
denise 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
Naomi 5ba72d00bc CC-5109 : Fix race-condition when updating cc_pref table 2013-05-27 15:33:53 -04:00
Martin Konecny 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
denise 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
Martin Konecny f23fc472ef Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-24 17:01:15 -04:00
Martin Konecny 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
Naomi 06fbbe89f2 CLRF fix. 2013-05-23 18:34:35 -04:00
Naomi 6110d47941 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-23 18:33:53 -04:00
Naomi 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
denise 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
Naomi 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
Naomi 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
denise 0107f36206 Changed propel to prepared statements 2013-05-23 12:49:15 -04:00
denise 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
Naomi d82725cb54 CLRF fix 2013-05-22 15:35:59 -04:00
Naomi 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
denise 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
denise 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
Martin Konecny 5080807a21 IM-629 
-fix minor SQL syntax error
 2013-05-14 19:18:41 -04:00
Martin Konecny 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
Naomi 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
denise c173744929 CC-5090: Unscheduled tracks are still marked at Scheduled in linked show 2013-05-14 10:58:06 -04:00
Naomi 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
Naomi bd2462170b CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-13 11:42:11 -04:00
denise 6b560eede1 Deleted unused functions in Show.php 2013-05-13 09:55:17 -04:00
Naomi 82945038d5 CRLF fix 2013-05-10 17:44:50 -04:00
Naomi da46757e28 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 17:36:18 -04:00
Naomi b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
Martin Konecny 6e0a3ffc60 CC-5102: 
Cross Fading: No cross fading effect

-fixed start/end calculations
 2013-05-10 15:24:43 -04:00
Martin Konecny 0c4691f3ea Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 13:20:07 -04:00
Martin Konecny 2250d89cbd CC-5013: 
Re-Added watched folder wont update

-fixed
 2013-05-10 13:19:56 -04:00
Martin Konecny c36333ae07 code cleanup 
-user proper method for checking null
-reduce line length to 80 chars
 2013-05-10 12:37:25 -04:00
Naomi 987537fbdc CC-5121 :fix some SQL statements not being escaped/prepared 2013-05-10 12:35:08 -04:00
Naomi 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
Naomi 5666b688a0 CC-5112 : Listen Status: Please clean obsoleted mount point from status report page 
CRLF
 2013-05-10 12:03:33 -04:00
Naomi 263b89295f Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-10 11:59:49 -04:00
Naomi 115af29f2e Merge branch 'CC-5112-status-page' 2013-05-10 11:59:37 -04:00
Naomi 8f31dd3069 CC-5112 : Listen Status: Please clean obsoleted mount point from status report page 2013-05-10 11:56:20 -04:00
Martin Konecny 3948964e8d remove useless log 2013-05-09 16:58:50 -04:00
denise afb24c37ab CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 16:07:34 -04:00
denise 8cd8d0922f CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 16:05:04 -04:00
denise b7337d0df3 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-09 15:53:24 -04:00
denise 40eb51b892 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:53:12 -04:00
Martin Konecny 9c05511613 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:08:47 -04:00
Naomi 540e817101 fixing sql to be prepared statements. 2013-05-09 13:28:22 -04:00
denise fedf564090 CC-5081: Calendar -> Add a linked show icon 2013-05-09 12:14:49 -04:00
denise 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
Naomi a18fc87d97 CC-5065 : Playlist length is not built on actual cue in/out value 2013-05-08 14:19:22 -04:00
Naomi 299dfdc18a Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-08 11:44:50 -04:00
Naomi fe916ec043 CC-2301 : adding in crossfade durations to smart blocks. 2013-05-08 11:43:53 -04:00
Martin Konecny 9f6a1033ea CC-5109: Fix race-condition when updating cc_pref table 2013-05-07 16:21:34 -04:00
Martin Konecny ad82b4ff98 throw exception if we get unexpected numbers of results in cc_pref 2013-05-07 15:36:21 -04:00
denise 92f6ec029f CC-5079: Timeline -> Moving items in linked shows doesn't work 2013-05-07 14:49:24 -04:00
Naomi 75e4e0c9b6 CC-2301 : only showing waveform buttons if the browser supports the audio api. 2013-05-03 14:42:42 -04:00
Naomi 435bb83588 CC-2301 : dos2unix being run 2013-05-02 16:52:30 -04:00
Naomi 3e320f1e2e Merge branch 'master' into CC-2301 2013-05-02 16:15:58 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
denise 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
denise 5ba5864d8c CC-5078: Wrong start time if dragging dynamic smart block into a show 2013-05-01 11:29:32 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
Naomi 2462e4f144 CC-2301 : CRLF fix. 2013-04-30 15:34:20 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Martin Konecny decb12f6b8 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:00:45 -04:00
Martin Konecny de4934a317 ensure that uploaded file is UTF-8 encoded 2013-04-30 15:00:31 -04:00
denise 4ca60ca676 CC-5074: Editing a linked instance sets incorrect schedule start times 2013-04-30 13:58:03 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
Naomi 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -04:00
Naomi 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
denise 71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -04:00
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
denise a5264aac1e CC-4961: Show linking 2013-04-26 16:10:01 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Naomi 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
Martin Konecny 8f6b583fcb CC-5061: 
Use propel transactions for StoredFile class
 2013-04-19 20:40:31 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny f39f9329cc CC-4992: 
Decouple pypo from Airtime install

-first commit
 2013-04-19 20:10:51 -04:00
denise a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -04:00
Martin Konecny 479e69de12 CC-5009: 
Use Silan to silently update track length in the background

-done
 2013-04-18 15:40:33 -04:00
denise 1a2a05c3cf CC-4961: Show linking 2013-04-12 16:34:36 -04:00
denise 9b4a0ba9c1 CC-4961: Show linking 
Removed stamp tables
 2013-04-12 10:52:13 -04:00
denise 9b2fb3bece CC-4961: Show linking 2013-04-09 15:55:18 -04:00
denise e64f6fb3fd CC-4961: Show linking 
-modified db
 2013-04-08 14:43:27 -04:00
denise 76bfce21b1 CC-4961: Show linking 
-modified db
 2013-04-08 14:42:37 -04:00
denise 62d1b22fcc CC-4961: Show linking 
created new cc_show_stamp table
 2013-04-05 12:27:54 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
Martin Konecny 5ac51e289d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-04-01 19:15:02 -04:00
Martin Konecny 6ae8da98e4 removing logging 2013-04-01 19:14:55 -04:00
denise ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise 418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00
denise ef8f87df5d Show linking 2013-03-25 16:28:53 -04:00
denise 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
denise 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
denise 896e03d76b CC-4961: Show linking 
Refactoring all services thus far
 2013-03-15 16:56:22 -04:00
denise f9f4e4f1fb CC-4961: Show linking 
Made some progress on show editing
 2013-03-12 18:01:12 -04:00
denise c721b81a13 CC-4961: Show linking 
Refactoring
 2013-03-12 10:30:31 -04:00
denise 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
denise 8415dfdf6f Add comments 2013-03-08 12:18:24 -05:00
denise af622eb4b8 CC-4961: Show linking 
Refactored some more show instance creation functions
 2013-03-06 09:58:35 -05:00
denise d497cfa857 Created show service 2013-03-06 09:58:35 -05:00
denise 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
drigato bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise d08f6cf3e1 CC-4961: Show linking 
-initial schedule service experimentation
 2013-03-06 09:58:35 -05:00
Martin Konecny cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny 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
denise c8d7d23d62 CC-4963: Add cue in and cue out to smart block criteria list 
Done
 2013-02-19 16:38:58 -05:00
denise 8bdf3508b0 CC-4951: Add cue in and cue out to library filter columns 
Done
 2013-02-19 13:38:35 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 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
denise 50613dd9a8 CC-4907: Library -> Adding items to show doesn't add the correct item sometimes 
-fixed
 2013-02-12 17:21:21 -05:00
denise 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
denise 51ade73e85 CC-4941: Dynamic Smart Block ignores the silan check 
-fixed
 2013-02-11 13:45:51 -05:00
denise 3c73535f70 Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents 2013-02-11 12:37:20 -05:00
denise 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
denise 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
denise 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
Martin Konecny 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
denise 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
denise 8db71eac52 CC-4914: Update is_scheduled after tracks play out 
-done
 2013-02-05 16:52:25 -05:00
denise 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
denise 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
denise b45f71e8f9 CC-4897: XSS exploit on library page 2013-02-04 12:44:14 -05:00
denise 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
denise 1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
Martin Konecny 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
denise 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
denise 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
denise 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
denise 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
denise 043fbd1dfb CC-4886: Warn if track is part of a playlist when deleting from library. 
-done
 2013-01-30 10:55:24 -05:00
denise 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
denise d4742577c9 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 10:20:27 -05:00
drigato c45440482a CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 08:57:59 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
denise 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
denise f1215c10fd CC-4882: Scheduled item does not take into account cue_out - cue_in time 
-fixed
 2013-01-28 14:21:11 -05:00
Martin Konecny 2ef8604c31 remove unnecessary code 2013-01-25 16:23:12 -05:00
Martin Konecny 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
Martin Konecny ef806b8357 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:14:12 -05:00
Martin Konecny 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
denise 1e336fa2d7 CC-4875: use a reference when iterating over show events 2013-01-24 12:00:31 -05:00
denise 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
denise 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
denise 9714b44d7f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 2013-01-23 16:27:26 -05:00
denise 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
denise 77b0c21192 Small refactor 2013-01-22 10:39:20 -05:00
denise 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
denise 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
denise 22ecc3f1fc CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-18 14:28:45 -05:00
James ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
james e2b83a0c8c CC-4857: Playlist length will increase every time I duplicate it. 
- fixed
 2013-01-17 22:20:28 -05:00
denise 57629b4eac Changed path to locale directory from absolute to relative 2013-01-17 14:31:40 -05:00
denise e4c2f43d9e CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-16 15:40:50 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
denise 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
James bb2f9316af CC-4841: Silan script 
- temp commit
 2013-01-15 11:16:50 -05:00
James 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
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-10 18:09:00 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise c20ed7ebad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 12:04:44 -05:00
denise 690a6d2654 Removed user id from cc_pref keystr value 2013-01-10 12:04:27 -05:00
James 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
james 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
james 3a72302a3c CC-4819: Tracks length in Scheduler is 0.0 all the time 
- fixed
 2013-01-09 22:19:39 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
James 6d48e1faf0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:52:33 -05:00
James adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 15:52:11 -05:00
Martin Konecny 1ee90ed9b9 CC-4790: Media Monitor: Re-added files won't show up in Library 
-fixed
 2013-01-08 15:42:35 -05:00
James 45e3fccae2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 12:31:22 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 12:31:14 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
James 51425d451f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 13:49:09 -05:00
James ecbff94f11 CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist 
- fixed
 2013-01-07 13:48:51 -05:00
denise 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
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
James 63c847080f CC-4732: Ask for admin username + password in Stream Settings page 
- CRLF
 2013-01-03 18:02:19 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00