Rudi Grinberg
|
fc8b2096af
|
Added debugging for Clifford
|
2012-09-11 17:21:20 -04:00 |
|
Rudi Grinberg
|
03d3dc8312
|
Added good debugging for removed_watch_directory
|
2012-09-11 17:03:49 -04:00 |
|
Rudi Grinberg
|
b0a7f60b10
|
Fixed typo
|
2012-09-11 16:29:45 -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
|
5a90521107
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 13:57:02 -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 |
|
denise
|
88fe6d1939
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 12:39:35 -04:00 |
|
denise
|
8866a673d3
|
CC-4375: DB Upgrade Error, from 2.0.3 to 2.2
-fixed
|
2012-09-11 12:39:24 -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 |
|
Rudi Grinberg
|
458089a773
|
cc-4359: Fixed without breaking anything else. Reverted bootrsrapping to default operation except for media monitor restart which uses a
special bootstrap that respects file_exists settings.
|
2012-09-11 11:19:44 -04:00 |
|
Martin Konecny
|
41d9b2490a
|
-fix silly mistake after refactoring
|
2012-09-11 11:14:47 -04:00 |
|
Martin Konecny
|
6c54605327
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 11:13:06 -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 |
|
denise
|
923343dbba
|
index.php fix
|
2012-09-11 10:23:50 -04:00 |
|
Rudi Grinberg
|
ae6d80fc2a
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 10:13:17 -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 |
|
Rudi Grinberg
|
7cba85ea05
|
cc-4359: Fixed without breaking other problems.
|
2012-09-10 18:27:52 -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 |
|