cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
542553bbc1
Merge branch '2.3.x' into devel
2013-02-15 17:05:36 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
ec159131a8
Merge branch '2.3.x' into devel
2013-02-13 16:09:53 -05:00
525b2dcb33
CC-4895: Remove all json die() statements from code
...
- removed json_encode
2013-02-07 15:41:47 -05:00
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
d4e89df94e
CC-4895: Remove all json die() statements from code
2013-01-31 14:06:45 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
8b12f692cd
CC-4854: Remove SaaS checking from codebase
...
-fixed
2013-01-16 14:31:43 -05:00
8cd6bd9aa4
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
5a97fb69f2
CC-4384: Remove annoying usage of $CC_CONFIG
...
- done
2013-01-14 16:16:14 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
1ee90ed9b9
CC-4790: Media Monitor: Re-added files won't show up in Library
...
-fixed
2013-01-08 15:42:35 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
3a1945a818
CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
...
-fixed
2012-11-22 11:40:44 -05:00
5adadc2e91
CC-1960: Internationalize Airtime / Support translations
...
- added gettext wrapper function to all strings in controllers
2012-11-20 11:33:37 -05:00
d8165cbf44
- haproxy support subdomain name with '.'
2012-11-13 16:32:36 -05:00
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
b8d6132b52
- saas patch #1
2012-10-23 18:47:15 -04:00
58535bef88
CC-4580: No contents in rebroadcast show
...
- fixed
2012-10-19 16:40:32 -04:00
45801e5dc4
- fix spelling of some function name
2012-10-17 15:16:03 -04:00
0e82083ba1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-09-17 15:55:53 -04:00
4f576afc00
cc-4396. Initial fix problem was a module was not being included in the soundcloud upload script.
2012-09-17 15:24:02 -04:00
54bb414500
CC-4318: Widgets: Weekly show cannot show the schedule
...
-fixed
2012-09-17 14:56:34 -04:00
be80eeb5fd
CC-4404: restart airtime-liquidsoap will interrupt the output stream and never resume until restart playout engine
...
-fixed
2012-09-14 18:20:46 -04:00
8d08aa888b
cc-4421: Added special handling for files that mutagen returns None for.
2012-09-13 14:54:52 -04:00
4137602116
Cleaned up API controller
2012-09-13 14:21:15 -04:00
e043816bf4
Removed superfluous logging
2012-09-13 12:23:48 -04:00
a779142a08
-fix commenting error
2012-09-13 11:12:39 -04:00
e1403d45bd
CC-4368: Unused local variables in Airtime Controllers. Should be removed.
...
-done
2012-09-13 10:32:33 -04:00
cc88a9a8e3
Fixed a lot of unused variables
2012-09-12 18:36:27 -04:00
975830ff90
Removed wrong comments
2012-09-11 18:22:24 -04:00
e2d69df4a6
Removed unused code
2012-09-11 17:51:39 -04:00
dc91db1f46
formatting
2012-09-11 17:48:08 -04:00
bc5718ec09
logging removed
2012-09-11 17:39:28 -04:00
cc3ba90ec3
added debugging
2012-09-11 17:32:26 -04:00
b8db419717
All hands for America. Added robust debugging
2012-09-11 17:23:07 -04:00
fc8b2096af
Added debugging for Clifford
2012-09-11 17:21:20 -04:00
728a0dd736
Added todo documenting slight inefficiency
2012-09-11 16:24:59 -04:00
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
585ee579d6
CC-4005: Tag files with Last Played date and number of times played
...
- fixed CRLF
2012-09-10 18:07:12 -04:00
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
Martin Konecny
Naomi
denise
James
Martin Konecny
James
Rudi Grinberg
denise