Commit graph

1058 commits

Author SHA1 Message Date
Rudi Grinberg
3fb7526fbb Shortened logging 2012-09-13 12:15:51 -04:00
Rudi Grinberg
b28116f622 removed empty space 2012-09-13 11:34:00 -04:00
Rudi Grinberg
d564b85e7c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:32 -04:00
denise
a779142a08 -fix commenting error 2012-09-13 11:12:39 -04:00
Rudi Grinberg
e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
Rudi Grinberg
d409af2876 shortened logging 2012-09-13 11:07:29 -04:00
Rudi Grinberg
dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
Rudi Grinberg
55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
denise
e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed.
-done
2012-09-13 10:32:33 -04:00
Martin Konecny
1f3bab2458 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 23:06:19 -04:00
Rudi Grinberg
cc88a9a8e3 Fixed a lot of unused variables 2012-09-12 18:36:27 -04:00
Martin Konecny
1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-disable preview icon
2012-09-12 17:32:19 -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
87fb9998dd increase mem warning limit to 30MB 2012-09-12 15:44:26 -04:00
Rudi Grinberg
975830ff90 Removed wrong comments 2012-09-11 18:22:24 -04:00
Rudi Grinberg
e2d69df4a6 Removed unused code 2012-09-11 17:51:39 -04:00
Rudi Grinberg
dc91db1f46 formatting 2012-09-11 17:48:08 -04:00
Rudi Grinberg
bc5718ec09 logging removed 2012-09-11 17:39:28 -04:00
Rudi Grinberg
cc3ba90ec3 added debugging 2012-09-11 17:32:26 -04:00
Rudi Grinberg
b8db419717 All hands for America. Added robust debugging 2012-09-11 17:23:07 -04:00
Rudi Grinberg
fc8b2096af Added debugging for Clifford 2012-09-11 17:21:20 -04:00
Rudi Grinberg
728a0dd736 Added todo documenting slight inefficiency 2012-09-11 16:24:59 -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
8af91f3901 -webstream controller wasn't setting webstream object properly 2012-09-11 15:02:12 -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
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
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
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
a8e7cb392a Sexification 2 2012-09-07 16:59:35 -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
Martin Konecny
089e896552 fix camelCase of function 2012-09-07 14:34:58 -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
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
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
Rudi Grinberg
bed360cd3e Formatting 2012-09-06 11:15:01 -04:00