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
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
87ac1744f7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-10 16:54:51 -04:00
5292137430
-return json as data type for schedule action
2012-09-10 16:54:42 -04:00
4fe8407659
Adde configurable value for list_all_files
2012-09-10 16:29:17 -04:00
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
33035a4212
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-07 17:38:35 -04:00
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
a8e7cb392a
Sexification 2
2012-09-07 16:59:35 -04:00
87787081ce
Removed unused optional argument.
2012-09-07 16:26:05 -04:00
089e896552
fix camelCase of function
2012-09-07 14:34:58 -04:00
80fa090f13
Uncommented old line of code perhaps it's useful
2012-09-05 16:39:58 -04:00
f86fa8f945
gotten rid of annoying logging
2012-09-05 15:38:43 -04:00
579180301a
Removed stat caching to make sure is_file is accurate
2012-09-05 15:05:50 -04:00
a731fc147b
CC-4348: Prepared statements - part 4
...
-fixed Show.php
2012-09-04 13:34:05 -04:00
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
e796d4c03d
MM2: equal signs sexified
2012-08-29 11:39:42 -04:00
8b5f94fa9f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-29 11:05:14 -04:00
699a49a103
CC-4090: Make code style PSR compliant - part 4
...
-controllers dir
2012-08-29 10:54:36 -04:00
05908d121f
cc-4274: Fixed bad table name.
2012-08-28 16:23:16 -04:00
33bb4e600c
cc-4274: implemented james' hack to fix this issue.
2012-08-28 16:23:16 -04:00
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
583d3837be
cc-3936: formattingk
2012-08-27 17:15:38 -04:00
57020b6e3b
cc-3936: Added warning whenever files that don't exist in db are requested to be deleted.
2012-08-27 16:50:22 -04:00
36b344a910
cc-3936: remove unneeded garbage.
2012-08-24 10:20:59 -04:00
ea58ae9cc8
-remove unecessary logging
2012-08-23 15:03:59 -04:00
e9bc0074c0
cleaned up ApiController.php a little bit.
2012-08-22 14:38:48 -04:00
462542bf68
change Logging::log to Logging::info
2012-08-21 18:41:56 -04:00
a24da9e324
CC-4256: Smart Playlist: change name to smart block and etc
...
- done
2012-08-20 17:17:48 -04:00
99437147dc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-17 15:08:10 -04:00
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
5b134d0055
cc-4228: fixed this ticket by stomping out bugs in eventcontractor and tweaking ApiController
2012-08-17 12:37:58 -04:00
d773dcd112
CC-1665: Scheduled stream rebroadcasting and recording
...
-send stream name back to Airtime: [("url","http://idobiradio.com/ "), ("title","Good Charlotte - Like It's Her Birthday")]
2012-08-15 15:12:44 -04:00
e98eda144a
cc-4105: removed naive replaygain again. added micro optimization to Insert into cc_files
2012-08-14 14:50:41 -04:00
6981a5cb49
cc-4105: added truncation of BPM to prevent crashes
2012-08-14 14:50:40 -04:00
ba03447946
cc-4105: added handling for pyinotify events and create more logical events
2012-08-14 14:50:39 -04:00
688d22e995
cc-4105: fixed metadata formatting bug
2012-08-14 14:50:39 -04:00
6e9db647c1
cc-4105: Fixed metadata handling. Added more error reporting to rmq requests
2012-08-14 14:50:39 -04:00
5f1024bb7d
cc-4105: Tweaked config params. Fixed error checking. Fixed unicode stuff. Removed redundant php
2012-08-14 14:50:39 -04:00
7abe882455
cc-4105-2: added retries on failed requests. added ignored files set like in the old media monitor
2012-08-14 14:50:39 -04:00
3422eb3cc0
cc-4105: added event packing to event objects
2012-08-14 14:50:39 -04:00
9964c826ab
cc-4105: Added problem dir moving. Also locale config from old media monitor
2012-08-14 14:50:37 -04:00
fa749c58f0
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-08-10 12:40:45 -04:00
8b13af2e04
fix bug on widget
2012-08-10 12:14:15 -04:00
fe3f4ea678
CC-1665: Scheduled stream rebroadcasting and recording
...
-capture stream mime type and store in db.
2012-08-10 00:57:03 -04:00
48a1bf3f02
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
2012-08-06 17:10:46 -04:00
40023d9086
CC-4152: Widget does not display current show in some modes
...
-fixed
2012-08-06 17:07:18 -04:00
3735579378
-remove cc_access table and gunid usage
2012-07-26 14:49:32 -04:00
647de9ed39
CC-84: Smart Playlists
...
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
2012-07-19 18:07:39 -04:00
c23023bcd9
Removed irrelevant comment
2012-07-17 16:43:04 -04:00
James
Martin Konecny
Rudi Grinberg
denise