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

3063 Commits

Author SHA1 Message Date
Rudi Grinberg 67483f8bb2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 17:01:45 -04:00
Rudi Grinberg 81dadb7f85 Removed annoying logging 2012-09-14 17:01:35 -04:00
Martin Konecny 4ea3d86121 remove unnecessary logging 2012-09-14 16:58:42 -04:00
Martin Konecny 39903be69a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:51:48 -04:00
Martin Konecny c84a608747 CC-4438: Station Time is always UTC time no matter what the time zone setting is 
-fixed
 2012-09-14 16:51:39 -04:00
Martin Konecny 3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -04:00
Rudi Grinberg ec3e0a9b9f Added todo 2012-09-14 16:50:28 -04:00
Rudi Grinberg 29909f0bd9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:49:37 -04:00
Rudi Grinberg bf651a96aa cc-4431: Fixed isUserType 2012-09-14 16:47:55 -04:00
denise ee98c8fba5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:38:33 -04:00
denise 8ffaaaef25 -skip playable test if item is a smart block 2012-09-14 16:38:26 -04:00
Rudi Grinberg ba08355c38 quick fix 2012-09-14 16:16:52 -04:00
Rudi Grinberg 76ba4bb6f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:03:03 -04:00
denise 4201176b3a -small UI change 2012-09-14 15:59:34 -04:00
denise da107f5120 -small UI fix 2012-09-14 15:55:55 -04:00
denise 0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
Rudi Grinberg 05916a4d26 Code cleanup 2012-09-14 15:13:08 -04:00
Martin Konecny 198d15adc8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:53:32 -04:00
Martin Konecny 78460703a2 CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-done
 2012-09-14 14:53:25 -04:00
Rudi Grinberg 79ce7b572c cc-4202: Fixed 2012-09-14 14:51:50 -04:00
Martin Konecny 6e239d08e9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:43:15 -04:00
Martin Konecny 239a228175 CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-small fix
 2012-09-14 14:36:31 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-initial commit
 2012-09-14 12:09:40 -04:00
denise c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
denise f581b0536e -fixed formatting 2012-09-14 11:18:13 -04:00
denise bb38512bae -fixed formatting 2012-09-14 10:52:50 -04:00
denise 97a0a82dc3 -renamed AIRTIME_DEV_README to AIRTIME_DEV_README_COLUMN_FILTER 
-added new diff file for dataTables.ColVis.js
 2012-09-13 17:19:08 -04:00
denise c35c76351b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:11:10 -04:00
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
James d93fcec490 CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled 
- fixed
 2012-09-13 17:09:10 -04:00
James 43503475fd CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria 
- CRLF fix
 2012-09-13 17:07:47 -04:00
James d2f0b10552 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:05:56 -04:00
James 0b917f385e CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria 
- fixed
 2012-09-13 17:05:40 -04:00
Martin Konecny d534f22ce4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 16:11:15 -04:00
Martin Konecny 505b53fa16 cc-1665: fix broken checkin for webstream 2012-09-13 16:11:06 -04:00
Martin Konecny da72c00f28 CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible 
-fixed
 2012-09-13 16:10:17 -04:00
Rudi Grinberg 11ef613d1c comment formatting 2012-09-13 15:16:46 -04:00
Rudi Grinberg e31d570a1c Sql formatting 2012-09-13 15:13:37 -04:00
Rudi Grinberg f754d78687 Formatted comments and = 2012-09-13 15:12:54 -04:00
Rudi Grinberg 410a3406af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 15:05:48 -04:00
Martin Konecny 14db5053b1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:56:10 -04:00
Martin Konecny 203378e60a More exception handling 2012-09-13 14:56:03 -04:00
Martin Konecny b04afaec2c CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-detect flash fallback
 2012-09-13 14:55:17 -04:00
Rudi Grinberg 8d08aa888b cc-4421: Added special handling for files that mutagen returns None for. 2012-09-13 14:54:52 -04:00
James b2d61f2402 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:22:27 -04:00
James 2293fcda01 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
- fixed
 2012-09-13 14:22:13 -04:00
Rudi Grinberg 4137602116 Cleaned up API controller 2012-09-13 14:21:15 -04:00
Rudi Grinberg e984faf394 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:33:30 -04:00
Rudi Grinberg 8a2703c50d Made method static 2012-09-13 12:33:15 -04:00
Martin Konecny 4fd9993108 CC-1710FLAC, BWF, AAC support 
-Enable browser preview for new filetypes
 2012-09-13 12:30:26 -04:00
Martin Konecny fad6635a1a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:28:30 -04:00
Martin Konecny 09d587e262 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-better file type detection
 2012-09-13 12:28:10 -04:00
Rudi Grinberg 9dfb762bbe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:27:17 -04:00
Rudi Grinberg 2b9e6081a4 Added log for exception 2012-09-13 12:27:04 -04:00
Martin Konecny e95933525b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:25:03 -04:00
Martin Konecny 983bbc5fc5 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-better file type detection
 2012-09-13 12:24:53 -04:00
Rudi Grinberg e043816bf4 Removed superfluous logging 2012-09-13 12:23:48 -04:00
Rudi Grinberg 3fb7526fbb Shortened logging 2012-09-13 12:15:51 -04:00
Rudi Grinberg b28116f622 removed empty space 2012-09-13 11:34:00 -04:00
Rudi Grinberg d564b85e7c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:32 -04:00
denise 771ca5e0b3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:51 -04:00
denise a779142a08 -fix commenting error 2012-09-13 11:12:39 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
Rudi Grinberg d409af2876 shortened logging 2012-09-13 11:07:29 -04:00
Rudi Grinberg dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
James 5067a304d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:49:33 -04:00
James b6b93618e6 CC-4353: Numeric search fields in Library would benefit from format labels 
- bug fix
 2012-09-13 10:49:24 -04:00
Martin Konecny 4fc278a55a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:42:59 -04:00
Martin Konecny a396136600 bootstrap.css file 2012-09-13 10:42:53 -04:00
Rudi Grinberg 55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
Rudi Grinberg 52882ef938 Added mp4 removed aac. 2012-09-13 10:35:13 -04:00
Rudi Grinberg 8eda4a7035 Subtle bug fixed in smartPrepareAndExecute. 2012-09-13 10:34:15 -04:00
denise e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed. 
-done
 2012-09-13 10:32:33 -04:00
Rudi Grinberg 24b3fb7e8a Remvod unused CC_CONFIG, reformatted some code 2012-09-13 10:26:50 -04:00
Martin Konecny 1f3bab2458 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 23:06:19 -04:00
Martin Konecny 54d7f496d9 add bootstrap.js to bootstrap.php 2012-09-12 23:06:05 -04:00
Rudi Grinberg cc88a9a8e3 Fixed a lot of unused variables 2012-09-12 18:36:27 -04:00
Martin Konecny 4998a63a6a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:34:32 -04:00
Martin Konecny 1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-disable preview icon
 2012-09-12 17:32:19 -04:00
Rudi Grinberg 536fdabb77 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:27:08 -04:00
denise 3b43efefe0 CC-4413: Unused local variables in models. 
-done
 2012-09-12 17:26:41 -04:00
Rudi Grinberg 8e91c515f0 cc-4397: Fixed handling for bad metadata. 2012-09-12 17:26:37 -04:00
Vladimir 8938eaa637 Added missind Bootstrap CSS (bootstrap_custom.css) 2012-09-12 23:18:37 +02:00
Rudi Grinberg e708f60f68 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:08:58 -04:00
denise 9c8f4fe404 CC-4414: Unused local variables in forms 
-done
 2012-09-12 17:09:00 -04:00
Rudi Grinberg af8c813f35 Documented unimplemented interface methods 2012-09-12 17:08:51 -04:00
denise 32b1ee95b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 16:29:35 -04:00
denise 5ac6877e60 CC-4362: Smart Block: error for multiple criteria 
-fixed
 2012-09-12 16:29:26 -04:00
Rudi Grinberg 88604eabcc Removed unused variable 2012-09-12 16:24:49 -04:00
Rudi Grinberg 15355f9e30 Formatted comment 2012-09-12 16:12:00 -04:00
Rudi Grinberg 6e8313a395 Fixed typo in SQL missing , 2012-09-12 16:10:56 -04:00
Rudi Grinberg db5dbab086 Removed unused local variables 2012-09-12 16:09:53 -04:00
Rudi Grinberg 414d1fa511 PDO'd UpdateBroadcastedStatus 2012-09-12 16:09:28 -04:00
Rudi Grinberg 643c00418a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:59:53 -04:00
Rudi Grinberg 64a1dade9b Massive formatting of SQL 2012-09-12 15:59:46 -04:00
Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
 2012-09-12 15:55:43 -04:00
Martin Konecny 87fb9998dd increase mem warning limit to 30MB 2012-09-12 15:44:26 -04:00
Martin Konecny a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-initial commit
 2012-09-12 15:43:50 -04:00
Rudi Grinberg 9e7e9639ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:42:09 -04:00
Rudi Grinberg 2c1acf8b17 Removed reference to CC_CONFIG 2012-09-12 15:42:00 -04:00