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

2944 Commits

Author SHA1 Message Date
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
James 67b295a553 CC-4367: Media Library -> Search: Please enable searching Bit Rate by Kbps 
- done
 2012-09-10 15:37:22 -04:00
Rudi Grinberg 97317c0195 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 15:35:46 -04:00
Martin Konecny e85ea5c683 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 15:35:42 -04:00
Martin Konecny 3107286799 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 2012-09-10 15:35:32 -04:00
Rudi Grinberg 0c1c4aa27d Put sql in heredoc for better readability 2012-09-10 15:35:30 -04:00
Rudi Grinberg 9d825a55b3 Crap comment removed 2012-09-10 15:32:31 -04:00
Rudi Grinberg 2e0b29b14e Removed unused code 2012-09-10 15:31:56 -04:00
Rudi Grinberg 987b65af28 cc-4347: Extra pdo work 2012-09-10 14:53:26 -04:00
James 0ab08af48f CC-4380: Show ReplayGain value in the Library page 
- done
 2012-09-10 14:37:38 -04:00
denise 60cf74a602 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 14:16:52 -04:00
denise 957e644829 -fixed javascript error in datatables.js 2012-09-10 14:16:36 -04:00
Rudi Grinberg b085f9ef67 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 14:15:07 -04:00
Rudi Grinberg e85a83d045 Fixed pdo 2012-09-10 14:14:44 -04:00
James 4d3c624607 CC-4380: Show ReplayGain value in the Library page 
- temp commit
 2012-09-10 12:35:32 -04:00
Martin Konecny e5de4f560d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-10 12:18:41 -04:00
Martin Konecny ac8610ca06 CC-4385: Problem with mono streams for stream rebroadcasting 
-fixed
 2012-09-10 12:18:19 -04:00
Rudi Grinberg 567a8a2635 cc-4347: Fixed typo 2012-09-10 12:04:33 -04:00
Rudi Grinberg 8340db3ce9 Added error handing todo 2012-09-10 11:53:22 -04:00
Rudi Grinberg a0b3742758 cc-4347: resizeShow pdo'd 2012-09-10 11:49:56 -04:00
Rudi Grinberg 3df4c8d65a cc-4347: deleteRebroadcasts and GetEndTimeOfNextShowWithLiveDJ pdo'd 2012-09-10 11:39:22 -04:00
Rudi Grinberg e2c2f67fbb cc-4347: GetShowInstanceCount() pdo'd 2012-09-10 11:29:28 -04:00
Rudi Grinberg 375e89169e Removed code duplication 2012-09-10 11:27:39 -04:00
Rudi Grinberg 53de942c2b cc-4347: GetNextShowInstance PDO'd. 2012-09-10 11:25:44 -04:00
Rudi Grinberg de86b904a5 Fixed extra cast. 2012-09-10 11:25:21 -04:00
Rudi Grinberg 8c3be7393a cc-4347: GetCurrentShowInstance got PDO nuked. 2012-09-10 11:17:45 -04:00
Rudi Grinberg 57aae73074 cc-4347: PDO'd: GetLastShowInstance 2012-09-10 11:06:34 -04:00
Rudi Grinberg 737c3fcbae Todo for consistency. 2012-09-10 11:06:11 -04:00
Rudi Grinberg a3d4b8c722 Todo for consistency. 2012-09-10 11:05:30 -04:00
Rudi Grinberg 35c8b50d96 cc-4347: PDO'd Show create 2012-09-07 18:23:55 -04:00
Rudi Grinberg a479a11c8f Removed crazy handling of flac. 2012-09-07 18:23:14 -04:00
Rudi Grinberg 78b0dcedfc Added smartPrepareAndExecute. Warning: Test before using 2012-09-07 17:58:16 -04:00
Martin Konecny 33035a4212 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-07 17:38:35 -04:00
Martin Konecny d20c450226 CC-4370: Transitioning between two webstreams a hiccup in the stream is audible 
-some major refactoring before fixing this problem
 2012-09-07 17:38:24 -04:00
Rudi Grinberg f1487ba69d cc-4347: Fixed missing AND clause 2012-09-07 17:23:32 -04:00
Rudi Grinberg b4748a3b1f cc-4347: Fixed typo 2012-09-07 17:15:49 -04:00
Rudi Grinberg a8e7cb392a Sexification 2 2012-09-07 16:59:35 -04:00
Rudi Grinberg 7fa17a644e Sexification 2012-09-07 16:58:49 -04:00
Rudi Grinberg 79513356fb cc-4347: PDO'd getShows 2012-09-07 16:53:16 -04:00
Martin Konecny 101c28f9c3 remove unused variable (PHP 5.4 warning) 2012-09-07 16:50:52 -04:00
Martin Konecny 3c0541f138 fix function camelcase 2012-09-07 16:50:33 -04:00
Rudi Grinberg 87787081ce Removed unused optional argument. 2012-09-07 16:26:05 -04:00
Rudi Grinberg 8f3c7e8eba cc-4347: PDO'd getInstanceOnDate() 2012-09-07 15:29:30 -04:00
Rudi Grinberg 26a3e35de0 Refactored getMaxLengths() 2012-09-07 15:14:33 -04:00
Rudi Grinberg 27c1361fbb Small refactoring to use getter instead of accessing private variable. 2012-09-07 15:12:46 -04:00
Martin Konecny 089e896552 fix camelCase of function 2012-09-07 14:34:58 -04:00
Rudi Grinberg 49a85afc06 Refactor 2012-09-07 14:33:08 -04:00
Rudi Grinberg 5ee24ceb23 cc-4347: PDO. getAllFutureInstanceIds() 2012-09-07 14:30:59 -04:00
Rudi Grinberg 82f267310e cc-4347: Undid refactoring 2012-09-07 14:18:40 -04:00
Rudi Grinberg efb35dd9d6 cc-4347: PDO'd deleteAllRebroadcasts() 2012-09-07 12:29:42 -04:00
Rudi Grinberg ad776ff8f3 cc-4347: PDO deleteAllInstances() 2012-09-07 12:22:49 -04:00
Rudi Grinberg 727769b376 cc-4347: PDO getRepeatingDate() 2012-09-07 12:18:13 -04:00
Rudi Grinberg 23ccd75290 cc-4347: PDO getRbroadcastsRelative() 2012-09-07 12:10:07 -04:00
Rudi Grinberg cfe0d7aa0c Unrelated refactorings of Show.php. Added TODO for more later work. 2012-09-07 12:07:29 -04:00
Rudi Grinberg 2a00e58610 cc-4347: PDO like a boss. 2012-09-07 11:58:57 -04:00
Rudi Grinberg 22a250b5d2 cc-4347: PDOOO 2012-09-07 11:54:32 -04:00
Rudi Grinberg 92682b9f89 Added TODO about unused code 2012-09-07 11:39:58 -04:00
Rudi Grinberg f61463b8ba premature optimization 2012-09-07 11:20:23 -04:00
Rudi Grinberg c28f3af9cf removed unused code. reformatted some comments. 2012-09-07 11:18:10 -04:00
Rudi Grinberg d805995e72 cc-4347: ~~~~PDO~~~~~~ 2012-09-07 11:12:26 -04:00
James 95cd5a7dde Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 17:46:58 -04:00
James 0f1cb61a13 CC-4330: Media Library - > Search: Please change the way to search by owner 
- fixed
 2012-09-06 17:46:45 -04:00
Rudi Grinberg 33326ec052 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 17:23:58 -04:00
Rudi Grinberg 73ba643563 cc-4347: _-=~^PDO^~=-_ 2012-09-06 17:23:39 -04:00
James d9af434138 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 16:46:35 -04:00
James 7d3ac8eb07 CC-4346: Prepared statements - part 2 
- done
 2012-09-06 16:46:22 -04:00
Martin Konecny 83415cf298 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 16:18:37 -04:00
Martin Konecny fba5d56c76 CC-4364: Show - > On Air button is greyed out although you can hear the playout 
-fixed
 2012-09-06 16:18:28 -04:00
Rudi Grinberg f30507fce6 cc-4347: pdo 2012-09-06 16:17:14 -04:00
Rudi Grinberg 2b659f9c91 Sexified. 2012-09-06 16:16:53 -04:00
Rudi Grinberg 1852843f96 cc-4347: ~~~~PDO~~~~~~ 2012-09-06 15:55:29 -04:00
Rudi Grinberg 977c664bfe cc-4347: Fixed table quoting 2012-09-06 15:49:13 -04:00
Rudi Grinberg ad6e601d5e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 15:47:20 -04:00
Rudi Grinberg 0fdf1e5e86 cc-4347: PDO 2012-09-06 15:47:07 -04:00
Martin Konecny 18ec23526f CC-4294: Webstream length should make hours or minutes optional. Also minutes > 59 should be parsed correctly. 
-fixed
 2012-09-06 15:02:26 -04:00
Rudi Grinberg 5c13223315 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:48:55 -04:00
Rudi Grinberg 3f1d979c67 cc-4347: PDO PDO PDO!! 2012-09-06 14:41:40 -04:00
denise 8534cf16d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:30:20 -04:00
denise 8125d6b553 CC-4344: Conductor column not available in library view 
-done
 2012-09-06 14:30:09 -04:00
Rudi Grinberg 264e909d5a cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:17:24 -04:00
Rudi Grinberg cd9e89560d cc-4347: small correction. 2012-09-06 14:16:10 -04:00
Rudi Grinberg a39116c687 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:14:19 -04:00
Rudi Grinberg 45729f16e7 cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:14:05 -04:00
denise 46d87a2868 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 14:11:08 -04:00
denise 33fe2f3467 CC-4351: Library->Deletion of Smart Block and saving it leads to "Processing" message being displayed for a while 
-fixed
 2012-09-06 14:10:50 -04:00
Martin Konecny acf06e289f Try catching more errors into zendphp.log 2012-09-06 14:01:54 -04:00
Martin Konecny a941743ed7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/User.php
 2012-09-06 12:55:24 -04:00
Martin Konecny eae48cf47d CC-4348: Prepared statements - part 4 
-User.php
 2012-09-06 12:54:44 -04:00
Rudi Grinberg d196666c31 got rid of print statements possible interfering with view 2012-09-06 12:52:11 -04:00
Rudi Grinberg 744577a8b5 Removed bad line break 2012-09-06 12:38:55 -04:00
Rudi Grinberg 3f898bfc3a Fixed wrong function name 2012-09-06 12:33:04 -04:00
denise 7a3c2db2bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 12:24:07 -04:00
denise 6cb8dd35e2 - fixed sql error 2012-09-06 12:23:53 -04:00
Rudi Grinberg f4591f825f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 12:17:39 -04:00
Rudi Grinberg 56527e727c extra debuggin 2012-09-06 12:17:18 -04:00
denise 8d1003bbbe CC-4303: Library Tab grays out after certain scenario with normal playlist 
-fixed
 2012-09-06 11:48:00 -04:00
denise 35a5e38aca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 11:21:47 -04:00
denise 9b29f5e701 CC-4345: Prepared statements - part 1 
-modified Datatables.php to use Application_Common_Database::prepareAndExecute()
 2012-09-06 11:21:36 -04:00
Rudi Grinberg 9079f29584 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 11:15:12 -04:00
Rudi Grinberg bed360cd3e Formatting 2012-09-06 11:15:01 -04:00
denise b25ce921ee Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-06 11:11:15 -04:00
denise f06b3e2c36 CC-4345: Prepared statements - part 1 
-modified Block.php to use Application_Common_Database::prepareAndExecute()
 2012-09-06 11:11:09 -04:00
Rudi Grinberg f3ff9cc461 cc-4360: Fix for this bug. Table name was being quoted needlessly. 2012-09-06 11:03:24 -04:00
Rudi Grinberg 88c5ef484f Formatting 2012-09-06 10:38:14 -04:00
Rudi Grinberg 5481191730 added type hint 2012-09-05 18:01:20 -04:00
Rudi Grinberg b112a0fe2b cc-4347: PDOOOOOOOOOOOOO 2012-09-05 17:59:18 -04:00
denise 78c81aa434 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/common/Database.php
 2012-09-05 17:55:26 -04:00
denise 26c2c2c0d1 CC-4345: Prepared statements - part 1 
-added extra parameter to prepareAndExecute()
 2012-09-05 17:52:53 -04:00
Rudi Grinberg 8be51d5bf4 sexified code 2012-09-05 17:52:27 -04:00
Rudi Grinberg 73e152ebcf added type annotation again 2012-09-05 17:51:50 -04:00
Rudi Grinberg aa6e061118 conflicts merged 2012-09-05 17:51:16 -04:00
Rudi Grinberg d2e883da7a Added type annotation 2012-09-05 17:48:15 -04:00
Rudi Grinberg 0385c008ce cc-4347: PDO00!!! 2012-09-05 17:46:48 -04:00
Martin Konecny 0ae1b9fea6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/common/Database.php
 2012-09-05 17:45:13 -04:00
Martin Konecny 139950fac2 PSR fixes 2012-09-05 17:44:09 -04:00
Martin Konecny 43f5258219 CC-4348: Prepared statements - part 4 
-User.php
 2012-09-05 17:43:45 -04:00
James 3894990975 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 17:41:30 -04:00
Rudi Grinberg 23ee726cfd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 17:41:21 -04:00
James 4af9bfaa9d CC-4346: Prepared statements - part 2 
- fix spelling
 2012-09-05 17:41:18 -04:00
Rudi Grinberg 8f33523095 cc-4347: PDO 2012-09-05 17:35:08 -04:00