Commit Graph

2944 Commits

Author SHA1 Message Date
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
Martin Konecny b6b4e25a37 allow Airtime environment to be accessed from CLI
-fixed
2012-09-05 17:34:12 -04:00
Martin Konecny dad1cf32c9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 17:29:55 -04:00
Martin Konecny 7cbfb5d40d allow Airtime environment to be accessed from CLI 2012-09-05 17:29:34 -04:00
Rudi Grinberg 0838e31094 cc-4347: PDO 2012-09-05 16:57:01 -04:00
Rudi Grinberg c1bc50c1db Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 16:56:14 -04:00
Rudi Grinberg 80fa090f13 Uncommented old line of code perhaps it's useful 2012-09-05 16:39:58 -04:00
denise d9baddeba0 CC-4349: Encoded search in library should be labelled 'Encoded by'
-fixed
2012-09-05 16:38:55 -04:00
denise 91c74d8995 -fixed syntax error 2012-09-05 16:21:59 -04:00
denise 24024a0a60 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 16:15:11 -04:00
James 326ba012c1 CC-4346: Prepared statements - part 2
- CRLF
- adding include in bootstrap
2012-09-05 16:15:02 -04:00
denise 87e58282de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 16:14:23 -04:00
James 15b9d09991 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 16:12:44 -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
James 0a70b7d6f1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 15:59:28 -04:00
James 4ac2d6ac4e CC-4346: Prepared statements - part 2
- adding common function to prepare param to PDO statement and excute.
2012-09-05 15:59:15 -04:00
Rudi Grinberg f86fa8f945 gotten rid of annoying logging 2012-09-05 15:38:43 -04:00
Rudi Grinberg a61d856be9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-05 15:27:36 -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
Rudi Grinberg 579180301a Removed stat caching to make sure is_file is accurate 2012-09-05 15:05:50 -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 122bfc6e97 CC-4070: Built-in help text is wrongly worded about adding files
-fixed
2012-09-04 16:25:05 -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 8e40137b7d CC-4316: Missing image file
-fixed
2012-09-04 11:58:54 -04:00
denise 15f750eca5 CC-4248: Playlist Builder: 'Something went wrong' error message when dragging playlist into playlist
-included webstreams in the allowance type list in the error message
2012-09-04 11:29:23 -04:00
denise 0755933ccd CC-4279: Library: Searching by criteria "Uploaded from" does not work
-fixed
2012-09-04 10:03:24 -04:00
Martin Konecny 886888a958 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-31 17:21:48 -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
Rudi Grinberg 59f527c14c cc-4288: added owner column. 2012-08-31 13:31:14 -04:00
Martin Konecny cad0a8fbd7 CC-1665: Scheduled stream rebroadcasting and recording
-make sure webstream length is properly updated in browser view after editing
2012-08-31 13:01:22 -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 3571e2c691 cc-1710: switched bwf to wav 2012-08-30 16:50:10 -04:00
Rudi Grinberg 3911662cff Remove unused function 2012-08-30 16:30:49 -04:00
Rudi Grinberg a0a4094332 cc-4304: Small refactoring 2012-08-30 16:00:14 -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 010ba63d59 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 14:37:08 -04:00
Martin Konecny 7eefbf3e24 CC-4311: On Air button gets greyed out few seconds after show starts
-additional debug info
2012-08-30 14:36:55 -04:00
Martin Konecny 1884bebf15 CC-4281: Webstream: Nothing appears in the timeline if dr...
-fixed
2012-08-30 14:36:23 -04:00
Rudi Grinberg ea2595d70f Documeneted funny quirk related to creating a password 2012-08-30 12:26:36 -04:00
Rudi Grinberg 6a6f6c2ee7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-30 11:48:02 -04:00
Rudi Grinberg c09ebce1f0 cc-1710: Removed verbosity 2012-08-30 11:43:11 -04:00
Rudi Grinberg bed9989d2a cc-1710: Added more supported extensions to the allowed upload list 2012-08-30 11:40:05 -04:00
Rudi Grinberg 2b8bd2ffe9 cc-1710 removed ^M 2012-08-30 11:37:22 -04:00
Martin Konecny cd49f99f4b CC-3412: Icecast stream name not defined
-ensure upgrade
2012-08-30 11:29: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
denise a7427645d5 CC-4273: Library: Open 'Edit Metadata' page and click 'Cancel' will cause an exception
-fixed
2012-08-29 17:01:55 -04:00
denise 3ff80fae14 CC-4314: Library: Add playlist to playlist shows wrong error message
-fixed
2012-08-29 16:47:20 -04:00
denise b75f2ab9c7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 16:13:30 -04:00
denise 80258f1fb7 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed for dragging tracks into deleted blocks
2012-08-29 16:13:18 -04:00
denise 7c79aad5f4 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-removed unnecessary exception catch
2012-08-29 16:04:40 -04:00
denise fe48780932 CC-4302: Library : Deletion of newly created Smart Block does not prevent you from editing it which leads to small hang up
-fixed
2012-08-29 16:00:58 -04:00
Rudi Grinberg f483e271f6 formatting 2012-08-29 14:50:10 -04:00
Rudi Grinberg af3cea464b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 12:58:06 -04:00
Rudi Grinberg 5e180f0ce2 sexified code 2012-08-29 12:57:56 -04:00
Rudi Grinberg ca66073fb5 did some reformatting. 2012-08-29 12:31:59 -04:00
denise 46a6a5fc30 CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
-added in saving behaviour for regular playlists
2012-08-29 12:05:41 -04:00
Rudi Grinberg e796d4c03d MM2: equal signs sexified 2012-08-29 11:39:42 -04:00
denise 5effb253bf CC-4312: Smart Block: Please don't save the change of title when there is any warning after click 'Save'
-done
2012-08-29 11:38:47 -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