Commit graph

289 commits

Author SHA1 Message Date
Martin Konecny
6c6953a5d8 Merge branch 'cc-4630-2' of https://github.com/rgrinberg/Airtime into 2.2.x 2013-02-02 20:59:23 -05:00
Martin Konecny
f8208a355c Merge branch 'devel' into 2.3.x-saas 2013-01-18 12:22:45 -05:00
James
ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James
f70ca93b53 CC-4841: Silan script
done
2013-01-18 11:53:26 -05:00
denise
afaecbc24a CC-4861: airtime-check-system AIRTIME_STATUS_URL isn't formatted properly
-fixed
2013-01-17 13:58:43 -05:00
Martin Konecny
8b12f692cd CC-4854: Remove SaaS checking from codebase
-fixed
2013-01-16 14:31:43 -05:00
Martin Konecny
973a415164 -fix installation error 2013-01-15 15:37:26 -05:00
James
5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-14 16:16:14 -05:00
denise
f88a7bdb31 Merge branch '2.2.x' into devel 2012-11-21 10:54:17 -05:00
James
f246a09b1a CC-4662: Media Monitor: Unable to add watched folder because it's read only, by airtime-import command
- fixed
2012-11-20 17:35:18 -05:00
James
0870b1f018 CC-4697: airtime-import script fails silently on FLAC files
- fixed
2012-11-20 17:21:13 -05:00
Martin Konecny
fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny
2010778876 cleanup redundant code, remove whitespace 2012-11-15 13:33:27 -05:00
Rudi Grinberg
17087fc035 Added better error message. not much else can be done 2012-11-05 18:08:47 -05:00
denise
135aadf16b Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
Rudi Grinberg
6bcadd7ed6 cc-4630: Added permission set on permission folder before watching it 2012-11-01 17:01:32 -04:00
Rudi Grinberg
dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
Rudi Grinberg
35a9e77062 Formatted spaces. 2012-10-29 11:40:23 -04:00
Martin Konecny
f9f3f9527e CC-4624: phone_home_stat is broken in Ubuntu 12.10, with php 5.4
-fixed
2012-10-25 12:25:02 -04:00
denise
d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny
1ef2d70d3b -airtime-check-system: show logs when a process fails 2012-09-20 20:06:23 -04:00
Martin Konecny
c03eb5bf40 -airtime-check-system: show logs when a process fails 2012-09-20 00:04:58 -04:00
James
df476d9cb6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 17:47:53 -04:00
James
db52f1cfcf CC-4383: Fatal error in phone_home_stat script (2.2.0 dev)
- fixed
2012-09-17 17:47:32 -04:00
Rudi Grinberg
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
Rudi Grinberg
c7c74e18a7 removed carriege returns 2012-09-17 14:17:22 -04:00
James
903c7ef580 CC-4420: airtime-import is broken
- fixed
2012-09-13 11:16:42 -04:00
James
dcf3b4c3de CC-4383: Fatal error in phone_home_stat script (2.2.0 dev)
- fixed
2012-09-10 11:28:35 -04:00
Martin Konecny
83d79907f0 CC-4356: Improved method of detecting RabbitMQ PID
-fixed
2012-09-05 15:51:38 -04:00
Martin Konecny
c09c3ff151 CC-4356: Improved method of detecting RabbitMQ PID
-fixed
2012-09-05 12:42:40 -04:00
Martin Konecny
a874e9fff7 CC-4114: use liquidsoap shutdown() command to restart liquidsoap
-tying up loose ends
2012-08-20 16:54:01 -04:00
Martin Konecny
7cd814da06 airtime-check-system not using user define port in all cases 2012-08-13 11:04:21 -04:00
Martin Konecny
4ae09858f1 CC-4133: airtime-test-stream does not work with shoutcast streams
-fixed
2012-07-28 23:21:30 -04:00
Martin Konecny
82d4ee09ae CC-4059: airtime-test-stream -h option not shown in help text
-fixed
2012-07-10 23:25:35 -04:00
Martin Konecny
fa487fa24d fix typo in airtime-test-stream 2012-06-03 22:40:19 -04:00
denise
e11dcd33b0 CC-3887: Live Log data will not get deleted if user is not providing support feedback
-fixed
2012-05-25 11:00:10 -04:00
Martin Konecny
9ed4ca4259 CC-3838: Exception in "airtime-test-stream"
-fixed
2012-05-16 17:26:18 -04:00
denise
6add79268f CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent
- system info from airtime-check-system now displays in "Show Me What I Am Sending"
2012-05-14 18:10:20 -04:00
denise
eb182cf887 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
- added phone_home_stat testing parameter
- fixed problem if missing data in airtime_latest_version file
2012-05-11 17:27:14 -04:00
Martin Konecny
5e5ced6fe5 CC-3701: Need to differentiate between a service being down vs not-monitored (airtime-check-system)
-fixed
2012-04-22 14:28:02 -04:00
Martin Konecny
a4dc68c465 -missing -m option for arglist 2012-04-21 20:20:05 -04:00
paul.baranowski
96b010e7f0 CC-1927 Remove PEAR DB
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
  even when it cant connect to the database.  Also fixed return value to
  be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
2012-04-19 16:35:19 -04:00
Martin Konecny
f96b990275 Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Systemstatus.php
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/media-monitor/install/media-monitor-initialize.py
	python_apps/pypo/install/pypo-initialize.py
	python_apps/pypo/liquidsoap_bin
	python_apps/pypo/pypopush.py
	utils/airtime-log.php
2012-04-12 19:10:17 -04:00
Martin Konecny
5737053561 cc-3573: incorrect function used in airtime-import.py 2012-04-03 13:45:13 -04:00
Martin Konecny
6e127bbfdc cc-3473: use euid in airtime-check-system 2012-04-03 10:40:44 -04:00
Martin Konecny
c66f0c783f CC-3573: Use posix_geteuid instead of "whoami" to detect who is running PHP script
-done
2012-04-02 19:25:27 -04:00
Martin Konecny
61c5c839dd CC-3492: sudo airtime-log -t does not bring up show-recorder.log info
-fixed
2012-04-02 19:08:46 -04:00
Martin Konecny
45e57ee330 CC-3402: airtime-check-system is hardcoded to port 80
-fixed
2012-03-26 16:18:35 -04:00
Paul Baranowski
a1d3f67b2e CC-3492: sudo airtime-log -t does not bring up show-recorder.log info
Show recorder log still exists, but it's in a different place now.
Added recorder log back in and updated the path.
2012-03-23 17:54:00 -04:00
Paul Baranowski
b0cdc64b00 CC-3492: sudo airtime-log -t does not bring up show-recorder.log info
Fixed.
2012-03-23 16:25:31 -04:00