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

1694 Commits

Author SHA1 Message Date
Martin Konecny 0e82083ba1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:55:53 -04:00
Rudi Grinberg 1a29499bb8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 15:48:09 -04:00
James 54b6b12ec0 CC-4094: Dashboard -> Source Info panel: DJ assigned to current show can turn off the Master Resouce but cannot disconnect it. 
- fixed
 2012-09-17 15:41:27 -04:00
Rudi Grinberg 4f576afc00 cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script. 2012-09-17 15:24:02 -04:00
Martin Konecny 54bb414500 CC-4318: Widgets: Weekly show cannot show the schedule 
-fixed
 2012-09-17 14:56:34 -04:00
denise 1e0595d7ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 14:53:17 -04:00
denise 8801ccecce CC-4459: Now Playing -> Timeline: 'Filter by show' does not work 
-fixed
 2012-09-17 14:52:56 -04:00
Rudi Grinberg ed45011b40 needle <-> haystack 2012-09-17 14:21:13 -04:00
Rudi Grinberg fef949f6ea band aided some bug 2012-09-17 12:50:04 -04:00
Rudi Grinberg 92a5bf51a6 Added warning for uploading unknown file types 2012-09-17 12:45:33 -04:00
Rudi Grinberg 048da282fa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:36:57 -04:00
Rudi Grinberg 2337078dd8 Cleaned up unused variables. Formatted some lines. 2012-09-17 12:35:12 -04:00
Martin Konecny 5bbc815a78 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:32:54 -04:00
Martin Konecny 5d0592c729 CC-4454: Show deleting: if you do 'delete this instance and all following', it doesn't remove entries from cc_schedule table 
-fixed
 2012-09-17 12:32:39 -04:00
Rudi Grinberg b913b067c2 Added setColumnFilter(oTable) 2012-09-17 11:58:08 -04:00
Martin Konecny 7fed5bcd18 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 10:57:19 -04:00
Martin Konecny be80eeb5fd CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine 
-fixed
 2012-09-14 18:20:46 -04:00
Rudi Grinberg 7b1b271a2c Reformatted sql to use heredocs 2012-09-14 17:09:05 -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 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 bf651a96aa cc-4431: Fixed isUserType 2012-09-14 16:47:55 -04:00
Rudi Grinberg 76ba4bb6f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:03:03 -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 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
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 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
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
Rudi Grinberg 8a2703c50d Made method static 2012-09-13 12:33:15 -04:00
Rudi Grinberg 24b3fb7e8a Remvod unused CC_CONFIG, reformatted some code 2012-09-13 10:26:50 -04:00
Rudi Grinberg cc88a9a8e3 Fixed a lot of unused variables 2012-09-12 18:36:27 -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
Rudi Grinberg af8c813f35 Documented unimplemented interface methods 2012-09-12 17:08:51 -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 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 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
Rudi Grinberg a432665146 Changed to heredoc 2012-09-12 15:19:39 -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 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 faa04a2f5c Refactored RecallByX 2012-09-11 18:22:46 -04:00
denise c6ab540120 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:19:12 -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 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 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
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 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
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
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 80bdc95cd5 -redoing a commit undo 2012-09-10 17:24:18 -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 af225418c4 Removed empty constructor. 2012-09-10 16:08:21 -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
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 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
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 45729f16e7 cc-4347: PDOOOOOOOOOOOOOOOO 2012-09-06 14:14:05 -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
denise 6cb8dd35e2 - fixed sql error 2012-09-06 12:23:53 -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
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 b112a0fe2b cc-4347: PDOOOOOOOOOOOOO 2012-09-05 17:59:18 -04:00
Rudi Grinberg 8be51d5bf4 sexified code 2012-09-05 17:52:27 -04:00
Rudi Grinberg aa6e061118 conflicts merged 2012-09-05 17:51:16 -04:00
Rudi Grinberg 0385c008ce cc-4347: PDO00!!! 2012-09-05 17:46:48 -04:00
Martin Konecny 43f5258219 CC-4348: Prepared statements - part 4 
-User.php
 2012-09-05 17:43:45 -04:00
Rudi Grinberg 8f33523095 cc-4347: PDO 2012-09-05 17:35:08 -04:00
Rudi Grinberg 0838e31094 cc-4347: PDO 2012-09-05 16:57:01 -04:00
denise 91c74d8995 -fixed syntax error 2012-09-05 16:21:59 -04:00
denise 87e58282de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 16:14:23 -04:00
denise 8ec9ccedf3 CC-4358: Calendar: Show Content: Undefined Index 
-fixed
 2012-09-05 16:07:40 -04:00
Martin Konecny bc5cc9ff48 remove cartesian cross-product on some SQL queries 2012-09-05 16:06:10 -04:00
Martin Konecny 27bd22f10c CC-4348: Prepared statements - part 4 
-Syntax error
 2012-09-05 16:02:23 -04:00
Martin Konecny 87ef317b6f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 15:16:34 -04:00
Martin Konecny f036c84a64 CC-4348: Prepared statements - part 4 
-StreamSetting.php
 2012-09-05 15:15:56 -04:00
denise cf0fc13c81 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 14:50:34 -04:00
denise 7543a33aa1 CC-4345: Prepared statements - part 1 
-fixed for Datatables.php
 2012-09-05 14:50:26 -04:00
Rudi Grinberg ab6ae1ce8e cc-4336: Fixed the issue. But this whole chunk of code could probably be removed. 2012-09-05 14:33:49 -04:00
Rudi Grinberg 1590bf4fa0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 10:17:04 -04:00
Martin Konecny e636d371b0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 17:22:32 -04:00
Martin Konecny ac547342f1 Logging typo 2012-09-04 17:22:21 -04:00
Martin Konecny 982dd1e2a7 CC-4348: Prepared statements - part 4 
-StoredFile.php
 2012-09-04 17:21:59 -04:00
denise 63bd2f6381 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 16:59:40 -04:00
denise 5bb1f4720e CC-4345: Prepared statements - part 1 
-Block.php done
 2012-09-04 16:59:33 -04:00
Rudi Grinberg cae2245936 MM2: Cleaned up pure.py a little 2012-09-04 16:52:22 -04:00
Martin Konecny 4b09d5eff2 CC-4199: Webstream: Please show warning when the URL is too long 
-upped max webstream length to 512
-show warning if > 512 characters
 2012-09-04 16:18:18 -04:00
Martin Konecny f698b70341 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 16:00:26 -04:00
Martin Konecny 9701614087 CC-4342: Enabling hardware audio output kills all stream output 
-fixed
 2012-09-04 16:00:12 -04:00
Rudi Grinberg 4f4b08c0af major sexification 2012-09-04 15:38:48 -04:00
Rudi Grinberg f660e1da9f removed useless code 2012-09-04 15:31:09 -04:00
Rudi Grinberg 1d758db42b Sexified some code. PDO'd the shit out of some sql query. 2012-09-04 15:26:12 -04:00
Rudi Grinberg 398215f1d0 Corrected documentation for method. 2012-09-04 15:25:18 -04:00
Rudi Grinberg 8c02b3ec8a removed redundancy 2012-09-04 15:14:56 -04:00
Rudi Grinberg fa5939a72f Added todo to later clean code. 2012-09-04 15:14:26 -04:00
Rudi Grinberg 867fa559a0 Sexified code 2012-09-04 15:10:04 -04:00
Rudi Grinberg c974d3df0c fixored 2012-09-04 15:08:51 -04:00
Rudi Grinberg 0819419b3b fixed typo 2012-09-04 15:03:49 -04:00
Rudi Grinberg 1fcd20fea3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 14:55:28 -04:00
Rudi Grinberg 89dcc18724 general cleanups 2012-09-04 14:55:23 -04:00
Martin Konecny 18dd0f232a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 14:54:44 -04:00
Martin Konecny 0bdfe3986c CC-4348: Prepared statements - part 4 
-fixed some incorrect usage of PDO.
 2012-09-04 14:54:34 -04:00
Rudi Grinberg ed7d233ca2 Changed execute( array(...) ) to multiple bindParam calls. 2012-09-04 14:45:16 -04:00
Rudi Grinberg c840de0a71 Fix to the fix 2012-09-04 14:05:26 -04:00
Rudi Grinberg 330828fbdd Refactored sql substition into pdo 2012-09-04 13:52:33 -04:00
Rudi Grinberg 27ea00f5d4 Refactored sql substition into pdo 2012-09-04 13:50:13 -04:00
Martin Konecny a731fc147b CC-4348: Prepared statements - part 4 
-fixed Show.php
 2012-09-04 13:34:05 -04:00
denise 0755933ccd CC-4279: Library: Searching by criteria "Uploaded from" does not work 
-fixed
 2012-09-04 10:03:24 -04:00
Rudi Grinberg 3eac8c8531 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 13:34:39 -04:00
Rudi Grinberg d7aad93e4f cc-4288. Added owner to query. 2012-08-31 13:34:21 -04:00
Rudi Grinberg 2e8ed352b8 cc-4288:Sexification of =>. 2012-08-31 13:33:55 -04:00
Martin Konecny 0ceb0167fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 12:18:48 -04:00
Martin Konecny c043053407 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out 
-fixed
 2012-08-31 12:18:37 -04:00
Martin Konecny 79b6d13c16 CC-4321: NowPlaying: Cancelling Webstream has no effect and results in OnAir being grayed out 
-set DbEnds to 1 second in the past when cancelling stream
 2012-08-30 17:53:28 -04:00
Rudi Grinberg 417997e617 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 15:23:24 -04:00
Rudi Grinberg a11ec08154 cc-4304: Implemented default behaviour to cascade delete all the files 2012-08-30 15:23:12 -04:00
Martin Konecny 1884bebf15 CC-4281: Webstream: Nothing appears in the timeline if dr... 
-fixed
 2012-08-30 14:36:23 -04:00
Martin Konecny 89d8ac701b CC-3301: Add ability to switch stereo/mono stream in stream settings 
-refactor code and use Propel
 2012-08-29 17:51:47 -04:00
Martin Konecny 7f8b5ab92e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 17:40:07 -04:00
Martin Konecny 859445c766 CC-3301: Add ability to switch stereo/mono stream in stream settings 
-fixed
 2012-08-29 17:39:24 -04:00
denise 6067cc221f CC-4279: Library: Searching by criteria "Uploaded from" does not work 
-fixed
 2012-08-29 17:37:02 -04:00
Martin Konecny 8b5f94fa9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 11:05:14 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4 
-models dir
 2012-08-29 10:58:03 -04:00
denise f188cfbba2 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication 
-small fix
 2012-08-29 10:56:47 -04:00
denise 3d20ded170 CC-4307: Add "Never show again" to the pop-up registration prompt 
-done
 2012-08-28 17:30:34 -04:00
Rudi Grinberg c67ad44699 Merge branch 'cc-4274' into devel 2012-08-28 17:25:11 -04:00
Rudi Grinberg 6487072a4e cc-4274: added stub 2012-08-28 17:24:55 -04:00
Martin Konecny 481616a0d6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 17:22:57 -04:00
Martin Konecny a0ad9a91ea CC-1665: Scheduled stream rebroadcasting and recording 
-Better error logging
-convert minutes > 59 into hours
 2012-08-28 17:22:48 -04:00
Martin Konecny b7107fb948 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed uninitialized variable
 2012-08-28 17:03:20 -04:00
Rudi Grinberg 5b5ac3e38f cc-4274: Added scaffolding to implement this feature. 2012-08-28 16:23:16 -04:00
Rudi Grinberg 05908d121f cc-4274: Fixed bad table name. 2012-08-28 16:23:16 -04:00
Rudi Grinberg 33bb4e600c cc-4274: implemented james' hack to fix this issue. 2012-08-28 16:23:16 -04:00
denise 7ee68c55e0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 16:17:46 -04:00
denise 9d90e8c531 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication 
-done
 2012-08-28 16:17:37 -04:00
Martin Konecny 8cf048d459 CC-1665: Scheduled stream rebroadcasting and recording 
-parse m3u playlists to get actual stream
 2012-08-28 13:14:13 -04:00
Martin Konecny 219fba9bee Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 12:30:45 -04:00
Martin Konecny fc67d7f08d CC-1665: Scheduled stream rebroadcasting and recording 
-allow user more flexibility for entering length interval (require hours OR minutes)
 2012-08-28 12:30:33 -04:00
denise f84f611ab2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-28 11:22:49 -04:00
denise 98ab38ff54 CC-4295: Smart Block: Please deal with the float value when criteria likes 'length is' 
-fixed
 2012-08-28 11:22:41 -04:00
Rudi Grinberg 7f66bdbb66 cc-4301: Fixed bug where owner_id would be null whenever show is recorded. 2012-08-27 17:58:09 -04:00
Rudi Grinberg c28025ecfb hotfix for bad class name 2012-08-27 16:49:45 -04:00
Rudi Grinberg 8d7f3817ec cc-3936: Fixed bug where setDbColMetadata to use airtime metadata key names. 2012-08-27 15:11:28 -04:00
Rudi Grinberg 7aba1dcebd Added warning method. Changed some code to use it. 2012-08-27 14:51:35 -04:00
Rudi Grinberg 1a13731216 Merge branch 'cc-3936-3' into devel 2012-08-27 14:46:31 -04:00
Rudi Grinberg cab7a6c930 cc-3936: added comment documenting metadata translation 2012-08-27 14:07:05 -04:00
Rudi Grinberg dea764b8fd cc-3936: added warning for metadata attributes that are not defined in constants.php 2012-08-27 14:03:22 -04:00
denise 0edfb10f19 Smart Blocks: extra criteria field was undefined sometimes 2012-08-27 12:43:46 -04:00
denise b92ff1de89 CC-4290: Playlists -> Dynamic Smart Block-> "in the range" criteria seems to be not working 
-fixed
 2012-08-27 12:04:04 -04:00
Rudi Grinberg 687a6d3c5a cc-3936: removed intrusive logging 2012-08-27 11:49:36 -04:00
Rudi Grinberg fcc853b732 cc-3936: Renamed metadata key for owner id. 2012-08-27 11:06:06 -04:00
Martin Konecny 3fb0fbd73f CC-4291: Adding webstreams: Need ability to parse webstreams from .m3u and .xspf urls 
-fixed
 2012-08-24 19:25:19 -04:00
James bc660c4cdf -removing type column from cc_playlist 2012-08-24 17:12:52 -04:00
James 4406d26c95 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 17:10:50 -04:00
James 2ca4a369b2 CC-4264: Smart Block: Fail to generate block with some unavailable files 
- fixed
 2012-08-24 17:02:37 -04:00
denise 5443c1931a CC-4081: Calendar -> Can create overlapping show by dragging a show in "day" view 
-fixed
 2012-08-24 15:27:04 -04:00
denise 54db68bb26 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-24 12:40:39 -04:00
denise dc8e3da6db CC-4283: Password Reset: Please let user input username they want to reset 
-done
 2012-08-24 12:40:30 -04:00
Rudi Grinberg bc078b790d Merge branch 'cc-3936-2' into devel 2012-08-24 12:39:05 -04:00
Rudi Grinberg 7284770226 cc-3936: Changed setting of owner when modifying/inserting metadata. 2012-08-24 12:38:33 -04:00
Rudi Grinberg 5841cb7066 cc-3936: 
Made it so that identifer file is written before the file itself so that media monitor always
has the identifier file before the song itself.
 2012-08-24 12:37:16 -04:00
Rudi Grinberg e53c20bbcd cc-3936: added method to make it easier to get users of a certain type. 2012-08-24 12:36:20 -04:00
denise 82f2b2e7c3 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-24 11:12:31 -04:00
Rudi Grinberg 4efdf71aea cc-3936: Made phpName of foreign key conform to Fk prefix convention. 2012-08-24 11:10:05 -04:00
Rudi Grinberg 857be6b702 cc-3936: Removed manual path concatenation. Fixed setting owner of file. 2012-08-24 11:09:38 -04:00
denise 1f7a6fdc63 CC-4262: Smart Block: Characters do not get escaped properly 
-fixed
 2012-08-24 10:29:28 -04:00
Rudi Grinberg 19a5a8f992 cc-3936: fixed wrong argument order bug. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 4ad983f63c cc-3936: applied schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg c83fad2546 cc-3936: added owner to every file insert 2012-08-24 10:20:59 -04:00
Rudi Grinberg b0a61fc291 cc-3936: Added setting default owner_id for inserted files. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 43ca0d21e6 cc-3936: removed unnecessary object creation 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcc9c58577 cc-3936: Sexified equal signs. 2012-08-24 10:20:59 -04:00
Rudi Grinberg 50de229258 cc-3936: 
Refactored getUsers not to take multiple types of arguments.
 2012-08-24 10:20:59 -04:00
Rudi Grinberg 996dcfd35f cc-3936: Ran propgen to generate schema changes 2012-08-24 10:20:59 -04:00
Rudi Grinberg dcfa865f7d cc-3936: 
Ran propel-gen to commit schema changes.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg f940c20701 cc-3936: 
Added success logging when identifier file has been written.
 2012-08-24 10:20:58 -04:00
Rudi Grinberg 23e3f6137d cc-3936: 
Sexified code. Added section for user handling.
 2012-08-24 10:20:58 -04:00
Martin Konecny 9893282e43 CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL 
-add enablePropelLogging and disablePropelLogging functions
 2012-08-23 22:27:24 -04:00
Martin Konecny 7cbe037c7e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 21:58:39 -04:00
Martin Konecny d06fda0329 fix indentation 2012-08-23 21:43:55 -04:00
denise 0a851f3c96 CC-4263: Calendar: Can create one show contains another show (overlapping) 
-fixed
 2012-08-23 17:41:05 -04:00
denise 2f9ea4dc0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-23 11:53:56 -04:00
denise bf69f23343 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed 
-fixed
 2012-08-23 11:53:44 -04:00
James c2d475e6d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
 2012-08-23 10:43:28 -04:00
James de0aeee594 CC-4254: Library: advanced search on library 
- initial commit
 2012-08-23 10:41:40 -04:00
denise e987f7a0aa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:29:53 -04:00
denise f47e32d9de CC-4266: Smart Block: Bit rate with 'is in the range' modifier -> 2nd range value doesn't get multiplied by 1000 
-fixed
 2012-08-22 16:29:17 -04:00
Rudi Grinberg a3b6d0259c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:14 -04:00
Rudi Grinberg e7689e5355 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:09:03 -04:00
Martin Konecny b506c37341 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:08:58 -04:00
Rudi Grinberg d1e7341046 cc-3936: Refactored php code to upload files 2012-08-22 16:08:46 -04:00
denise 6fec9b0301 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 16:02:02 -04:00
denise 7e50a11195 CC-4225: Smart playlists: Sample and bit rate ranges should include entered values 
-fixed
 2012-08-22 16:01:50 -04:00
Martin Konecny fe1aa7a169 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed syntax error
 2012-08-22 15:56:18 -04:00
Martin Konecny 8573dcb870 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-22 15:35:09 -04:00
denise 0071caf94d CC-4080: Calendar -> Cannot create show because there was a repeating show at same time before 
-fixed
 2012-08-22 15:22:01 -04:00
Martin Konecny c8c257a330 CC-1665: Scheduled stream rebroadcasting and recording 
-change behaviour so that the webstream is not saved as soon as it it created.
 2012-08-22 14:04:01 -04:00
Martin Konecny ea4567f373 Make user functions work more consistently 
isHost didn't work similar to isPM or isAdmin
 2012-08-22 13:59:37 -04:00
Martin Konecny 9885374d34 CC-1665: Scheduled stream rebroadcasting and recording 
-more work to make webstreams behave like playlist creator
 2012-08-21 18:55:38 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Martin Konecny 9b7413dafa CC-1665: Scheduled stream rebroadcasting and recording 
-use sessions to determine currently open object in Library
-forgot to check in these files
 2012-08-21 16:55:10 -04:00
Martin Konecny a1b91aebbd CC-1665: Scheduled stream rebroadcasting and recording 
-use sessions to determine currently open object in Library
 2012-08-21 16:54:14 -04:00
denise 316afaf2a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:37:41 -04:00
denise ffbdba6f6b CC-4260: Add-user: Undefined index: ftype 
-fixed
 2012-08-21 16:37:33 -04:00
Rudi Grinberg 64a36ea21a cc-4240: fixed 2012-08-21 16:33:37 -04:00
denise 2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block 
-fixed
 2012-08-21 15:42:44 -04:00
denise d06f02f1f5 CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value 
-fixed
 2012-08-21 14:08:30 -04:00
denise 167881c903 CC-4253: Smart Playlist: Please support filter tracks by date 
-code refactor
 2012-08-21 12:01:48 -04:00
denise d23bd2d85b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 11:58:46 -04:00
denise 0c381d4692 CC-4253: Smart Playlist: Please support filter tracks by date 
-fixed
 2012-08-21 11:58:39 -04:00
Martin Konecny 51ebae3de9 Make sure we are using the Library controller for the Library page 2012-08-21 11:12:33 -04:00
James a24da9e324 CC-4256: Smart Playlist: change name to smart block and etc 
- done
 2012-08-20 17:17:48 -04:00
Martin Konecny 69f150ac7f more detailed error message 2012-08-20 14:41:43 -04:00
Martin Konecny 2a1ea33362 CC-1665: Scheduled stream rebroadcasting and recording 
-store Liquidsoap metadata in cc_schedule instead of cc_webstream
 2012-08-17 15:07:58 -04:00
denise 1e1398739f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-16 18:17:54 -04:00
denise e57885c934 CC-4191: Password Reset: Reset link should be updated after default port is changed 
-done
 2012-08-16 18:17:43 -04:00
Martin Konecny e511f7cd37 CC-1665: Scheduled stream rebroadcasting and recording 
-fixed clicking save multiple times creates multiple smart playlists
 2012-08-16 17:49:07 -04:00
denise 0d21d9a9af Smart Playlists: code cleanup 2012-08-16 15:40:36 -04:00
denise ae0d5d8598 CC-4238: Playlists: Fade in/out is in wrong format 
-added comment
 2012-08-16 14:45:51 -04:00
denise 5e6a94edb9 CC-4238: Playlists: Fade in/out is in wrong format 
-fixed
 2012-08-16 14:37:10 -04:00
denise 6b54440b7e CC-4238: Playlists: Fade in/out is in wrong format 
-fixed
 2012-08-16 14:35:24 -04:00
denise 1b7d174509 CC-4233: Smart Playlist: Cannot save the change of Fade in/out 
-fixed
 2012-08-16 12:33:25 -04:00
Martin Konecny 45a4c8d896 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-15 18:31:07 -04:00