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
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
Rudi Grinberg 6fc8df9226 Here doc'd sql 2012-09-12 15:39:02 -04:00
Rudi Grinberg b2737688cc Added space to sql squery 2012-09-12 15:36:37 -04:00
Vladimir 77824afdd3 Added Bootstrap CSS, images and JS for new buttons and dropdown menues 2012-09-12 21:23:25 +02:00
Rudi Grinberg d1b4ce3de6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:19:57 -04:00
Rudi Grinberg a432665146 Changed to heredoc 2012-09-12 15:19:39 -04:00
denise 07ac651f71 - move title and creator to top of library column view 2012-09-12 15:09:07 -04:00
Rudi Grinberg 92532cb708 cc-4394: Added m4a 2012-09-12 14:54:11 -04:00
denise b43a1e3032 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 14:27:29 -04:00
denise 54d18b7bcd CC-4382: Editing the color of a repeating show gives error message 
-fixed
 2012-09-12 14:27:17 -04:00
Rudi Grinberg d62ba61ea6 Formatting schedule.php 2012-09-12 14:19:02 -04:00
Rudi Grinberg 806fd83ccc Reformatted schedule 2012-09-12 14:14:55 -04:00
Rudi Grinberg dd68f6d945 Changed schedule to use james' helper function 2012-09-12 13:44:20 -04:00
Rudi Grinberg 7f9642dcd2 Fixed typo 2012-09-12 12:18:06 -04:00
Rudi Grinberg 195008d1e4 more pdo fix 2012-09-12 12:16:53 -04:00
Rudi Grinberg 845ec23fa3 fixed booboo 2012-09-12 12:15:47 -04:00
Rudi Grinberg ad75849a6f Fixed array_map over query instances 2012-09-12 12:09:38 -04:00
Rudi Grinberg d194ff1809 PDO'd a few things missed before in cancelShow() 2012-09-12 12:05:03 -04:00
Rudi Grinberg 6d32c03351 getHosts() changed sql style 2012-09-12 12:00:53 -04:00
Rudi Grinberg cebfdd6558 Changed sql string to heredoc 2012-09-12 11:59:27 -04:00
Rudi Grinberg 6519512924 fixed array_map over iterable 2012-09-12 11:54:37 -04:00
Rudi Grinberg f47593575c switch defaults for verbose stack trace 2012-09-12 11:51:11 -04:00
Rudi Grinberg 8b433de006 Made verbose trace opt out. 2012-09-12 11:45:08 -04:00
Rudi Grinberg d69391d2dd Formatted Block.php 2012-09-12 11:35:28 -04:00
Rudi Grinberg 7b41d94352 Reforamtted Block.php 2012-09-12 11:31:41 -04:00
Rudi Grinberg e0286b112f cc-4292: Removed unnecessary code related to md5. 2012-09-12 11:10:25 -04:00
Rudi Grinberg 6b8cb52572 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 18:23:01 -04:00
Rudi Grinberg faa04a2f5c Refactored RecallByX 2012-09-11 18:22:46 -04:00
Rudi Grinberg 975830ff90 Removed wrong comments 2012-09-11 18:22:24 -04:00
Rudi Grinberg 77215d175c More verbose exceptions 2012-09-11 18:22:12 -04:00
Rudi Grinberg e2d69df4a6 Removed unused code 2012-09-11 17:51:39 -04:00
Rudi Grinberg dc91db1f46 formatting 2012-09-11 17:48:08 -04:00
denise acaf5f76c2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:40:36 -04:00
denise ceccb547c2 CC-4355: Smart block criteria do not match library columns or metadata editor 
-put library column filter in alphabetical order to match smart block criteria order
 2012-09-11 17:39:47 -04:00
Rudi Grinberg bc5718ec09 logging removed 2012-09-11 17:39:28 -04:00
Rudi Grinberg cc3ba90ec3 added debugging 2012-09-11 17:32:26 -04:00
Rudi Grinberg 32297111f5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:23:19 -04:00
Rudi Grinberg b8db419717 All hands for America. Added robust debugging 2012-09-11 17:23:07 -04:00
Rudi Grinberg fc8b2096af Added debugging for Clifford 2012-09-11 17:21:20 -04:00
denise c6ab540120 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:19:12 -04:00
denise f1b8ada1e6 - removed logging 2012-09-11 17:19:02 -04:00
denise 58d39d74d4 CC-4355: Smart block criteria do not match library columns or metadata editor 
-fixed
 2012-09-11 17:18:17 -04:00
Rudi Grinberg 72a424bb7e Added todo to fix crust 2012-09-11 16:25:45 -04:00
Rudi Grinberg 728a0dd736 Added todo documenting slight inefficiency 2012-09-11 16:24:59 -04:00
Rudi Grinberg 0dd38920a3 Cosmetic changes. 2012-09-11 16:20:59 -04:00
Rudi Grinberg 51d4f35c55 Removed unused global variable 2012-09-11 16:15:15 -04:00
Rudi Grinberg d95731f2f3 Reformatted sql to use heredoc 2012-09-11 16:13:39 -04:00
Rudi Grinberg e664707076 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 16:03:01 -04:00
Rudi Grinberg 355b0ad35d cc-4292: Initial fix of the MD5 issue. Now MD5's are only collected not really used for anything. Moves are handled completely 
through paths.
 2012-09-11 16:02:39 -04:00
denise 131a723ed2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 15:10:53 -04:00
denise bc355fe7a7 - webstream controller wasn't assigning webstream object properly 2012-09-11 15:10:30 -04:00
James b692abb9ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 15:10:17 -04:00
James 1ba24a8d0b CC-4353: Numeric search fields in Library would benefit from format labels 
- done
 2012-09-11 15:09:57 -04:00
denise c56d3e47ef Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 15:02:23 -04:00
denise 8af91f3901 -webstream controller wasn't setting webstream object properly 2012-09-11 15:02:12 -04:00
Rudi Grinberg 6c1d7fedc1 Made Loggging::warn proper. 2012-09-11 14:34:03 -04:00
Rudi Grinberg 57b59a3290 Cleaned up preference.php 2012-09-11 14:33:50 -04:00
Rudi Grinberg 1304111682 Shortened code with if -> ? 2012-09-11 14:10:13 -04:00
Rudi Grinberg 751ed8276d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 14:05:54 -04:00
Rudi Grinberg 1afdcb8c2d Shortened an if statement to p ? x : y 2012-09-11 14:05:40 -04:00
Martin Konecny c61f5d1972 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 14:04:53 -04:00
Martin Konecny 0fec175681 CC-1710: FLAC, BWF, AAC support 
-context menu for mp4's having a problem
 2012-09-11 14:04:45 -04:00
Rudi Grinberg 63b1ead363 Undefined index error fixed by returning a default error if none is set in the database. 2012-09-11 13:56:48 -04:00
Rudi Grinberg e1f4010346 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 12:03:56 -04:00
Martin Konecny bcc095e924 CC-4389: Convert all PHP errors to throw exceptions instead 
-don't throw exception for suppressed errors.
 2012-09-11 12:03:52 -04:00
Rudi Grinberg 1e1b5919a2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 11:57:13 -04:00
Rudi Grinberg 9b0e5a6b2f removing unused file. 2012-09-11 11:53:36 -04:00
denise 45795cfbb6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 11:22:25 -04:00
denise 49f2a31be1 - added advanced search validation for owner and last played time 2012-09-11 11:22:12 -04:00
Martin Konecny a06eeaa76a -fix silly mistake after refactoring 
again
 2012-09-11 11:20:42 -04:00
Martin Konecny 41d9b2490a -fix silly mistake after refactoring 2012-09-11 11:14:47 -04:00
Martin Konecny 245d9a95d0 CC-4389: Convert all PHP errors to throw exceptions instead 
-don't throw exception for suppressed errors.
 2012-09-11 11:12:58 -04:00
Martin Konecny 1635842b81 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 00:51:08 -04:00
Martin Konecny 8db4c94af1 CC-4389: Convert all PHP errors to throw exceptions instead 
-echo to stdout as well
 2012-09-11 00:50:56 -04:00
denise ba89982b17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 18:09:19 -04:00
denise 4239a49d58 - advanced search validation UI cleanup 2012-09-10 18:09:13 -04:00
James 585ee579d6 CC-4005: Tag files with Last Played date and number of times played 
- fixed CRLF
 2012-09-10 18:07:12 -04:00
James 645593f954 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
 2012-09-10 18:04:35 -04:00
James ba37bb4327 CC-4005: Tag files with Last Played date and number of times played 
- done for files and webstreams
 2012-09-10 18:01:36 -04:00
denise c536169fb3 -original dataTables.columnFilter.js 2012-09-10 17:58:31 -04:00
denise fb7de88a30 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:54:45 -04:00
denise 2474d50e9f CC-4379: Playlist Builder: Click Save will cause playlist disappear from right side 
-fixed
 2012-09-10 17:53:55 -04:00
Martin Konecny e275e286cb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:43:40 -04:00
Martin Konecny 8bbc0bff94 CC-4389: Convert all PHP errors to throw exceptions instead 
-echo to stdout as well
 2012-09-10 17:43:29 -04:00
denise bba001c0db -diff between original dataTables.columnFilter.js and our modified version 2012-09-10 17:41:54 -04:00
Martin Konecny 726cadf5ce Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:40:19 -04:00
denise def513d200 -fixed commit problem 2012-09-10 17:38:05 -04:00
Martin Konecny ade4bcf958 CC-4389: Convert all PHP errors to throw exceptions instead 
-fixed
 2012-09-10 17:36:55 -04:00
denise fe0b6cd32b -changed windows line endings to unix 2012-09-10 17:36:51 -04:00
denise 80bdc95cd5 -redoing a commit undo 2012-09-10 17:24:18 -04:00
Martin Konecny d8b0de4ffa CC-4387: NULL is set to default Station Name 
-fixed
 2012-09-10 17:17:52 -04:00
denise bca7fbf50e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 17:17:19 -04:00
denise 8520141240 CC-4282: Library ->"Uploaded From" -> Submitting data in wrong format causes "Processing ..." message pop up for a while 
-implemented advanced search validation
-data only gets sent to server if all fields are valid
 2012-09-10 17:17:09 -04:00
Martin Konecny 87ac1744f7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 16:54:51 -04:00
Martin Konecny 5292137430 -return json as data type for schedule action 2012-09-10 16:54:42 -04:00
Rudi Grinberg 43bef4939e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 16:30:38 -04:00
Rudi Grinberg 4fe8407659 Adde configurable value for list_all_files 2012-09-10 16:29:17 -04:00
Rudi Grinberg af225418c4 Removed empty constructor. 2012-09-10 16:08:21 -04:00
Rudi Grinberg c90ead9ef2 cc-4359: fixed at the cost of other issues that will be fixed later (restarting media monitor). 2012-09-10 16:08:08 -04:00
James dfb1ffed79 CC-4319: Calendar: Remove all contents doesn't work 
- fixed
 2012-09-10 15:42:05 -04:00
James db0a34b35c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 15:37:36 -04:00