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
|
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
|
bc355fe7a7
|
- webstream controller wasn't assigning webstream object properly
|
2012-09-11 15:10:30 -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
|
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 |
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 |
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
|
d8b0de4ffa
|
CC-4387: NULL is set to default Station Name
-fixed
|
2012-09-10 17:17:52 -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 |