Duncan Sommerville
|
459f9494c3
|
Merge saas-dev into soundcloud
|
2015-06-10 16:08:52 -04:00 |
Duncan Sommerville
|
b0b6e037ac
|
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
|
2015-06-03 16:57:17 -04:00 |
Albert Santoni
|
11c6818e61
|
Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts:
.gitignore
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/SystemstatusController.php
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/upgrade/Upgrades.php
airtime_mvc/application/views/scripts/systemstatus/index.phtml
airtime_mvc/build/airtime.conf
airtime_mvc/build/sql/defaultdata.sql
airtime_mvc/public/index.php
airtime_mvc/tests/application/helpers/AirtimeInstall.php
install_minimal/airtime-install
install_minimal/include/airtime-constants.php
install_minimal/include/airtime-copy-files.sh
install_minimal/include/airtime-db-install.php
install_minimal/include/airtime-initialize.sh
install_minimal/include/airtime-install.php
install_minimal/include/airtime-installed-check.php
install_minimal/include/airtime-remove-files.sh
install_minimal/include/airtime-upgrade.php
python_apps/media-monitor/install/media-monitor-copy-files.py
python_apps/monit/monit-airtime-generic.cfg
python_apps/pypo/airtime-playout
python_apps/pypo/install/pypo-copy-files.py
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
python_apps/pypo/liquidsoap/ls_script.liq
python_apps/pypo/pypo/__main__.py
python_apps/pypo/pypo/media/update/replaygain.py
python_apps/pypo/pypo/media/update/replaygainupdater.py
python_apps/pypo/pypo/media/update/silananalyzer.py
python_apps/python-virtualenv/airtime_virtual_env.pybundle
python_apps/python-virtualenv/requirements
utils/airtime-check-system.php
|
2015-05-22 16:05:29 -04:00 |
Albert Santoni
|
e8c333857e
|
Added utils/make_tarball.sh script
|
2015-04-07 19:06:27 -04:00 |
Albert Santoni
|
32c7e81685
|
Removed use of virtualenv in utils
|
2015-03-16 14:54:29 -04:00 |
Albert Santoni
|
19de887efb
|
Fixed airtime-import to work without the virtualenv
|
2015-03-16 14:51:57 -04:00 |
drigato
|
ca9750f415
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
|
2015-01-23 11:32:45 -05:00 |
Albert Santoni
|
6e43505379
|
Merge branch '2.5.x' into 2.5.x-installer
|
2015-01-22 17:36:12 -05:00 |
Albert Santoni
|
230cdcccb4
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
CREDITS
|
2015-01-22 11:29:38 -05:00 |
Albert Santoni
|
39445c945f
|
Added upgrade.py helper script (for development only)
|
2015-01-21 12:14:44 -05:00 |
Duncan Sommerville
|
5e22f929c7
|
Reverted commit mistakenly changing file modifiers to 755
|
2015-01-14 20:45:03 -05:00 |
Duncan Sommerville
|
f4c5cf1353
|
Added virtualenv back into install process
|
2015-01-05 16:41:03 -05:00 |
Duncan Sommerville
|
51a95fb989
|
More work on monitless installer
|
2014-12-16 20:12:20 -05:00 |
Duncan Sommerville
|
4dfd49d12c
|
Initial work on monitless installation
|
2014-12-16 12:24:41 -05:00 |
Duncan Sommerville
|
f5b4928538
|
More work on web installer
|
2014-12-09 17:48:16 -05:00 |
drigato
|
39db3d4aee
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
|
2014-05-05 11:21:02 -04:00 |
Albert Santoni
|
5dab498041
|
Removed this silly airtime-update-db-settings script
* No longer needed, was a horrible hack in the first place.
|
2014-05-02 17:16:03 -04:00 |
Albert Santoni
|
2f8461b2a6
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-04-23 14:58:36 -04:00 |
Albert Santoni
|
b920ed2598
|
Fixed a bunch of installer stuff for Naomi
|
2014-04-23 12:21:39 -04:00 |
Albert Santoni
|
ed78625fce
|
Merge branch '2.5.x' into 2.5.x-saas
|
2014-01-27 12:01:11 -05:00 |
Daniel James
|
c5a6e81690
|
SAAS-374 Don't expose API key when a component has failed
|
2014-01-06 11:31:18 +00:00 |
Naomi Aro
|
f2d5fa96da
|
Merge branch '2.4.x' into 2.4.x-saas
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
utils/phone_home_stat.php
|
2013-06-26 01:25:26 -04:00 |
Martin Konecny
|
8ca1caecbe
|
CC-5194:
Fail to execute phone_home_stat
-fixed by using native Zend autoloader
|
2013-05-30 15:52:29 -04:00 |
Naomi
|
28f957be92
|
CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar
|
2013-05-27 17:02:34 -04:00 |
Martin Konecny
|
3b9b23a7dd
|
Merge branch '2.3.x-saas' into 2.4.x-saas
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/models/Schedule.php
python_apps/pypo/airtime-playout
|
2013-05-21 16:40:10 -04:00 |
Martin Konecny
|
479e69de12
|
CC-5009:
Use Silan to silently update track length in the background
-done
|
2013-04-18 15:40:33 -04:00 |
Martin Konecny
|
00475275e5
|
Merge branch '2.3.x' into 2.3.x-saas
|
2013-03-22 14:24:12 -04:00 |
Martin Konecny
|
6d1025507a
|
Merge branch '2.3.x' into devel
|
2013-03-22 14:05:08 -04:00 |
Martin Konecny
|
5bc49341a1
|
CC-5023: Miss base_dir in GetServerType() will cause Web Server Type is "A"
-fixed
|
2013-03-12 17:01:31 -04:00 |
Martin Konecny
|
c563aaf608
|
CC-5023:
Miss base_dir in GetServerType() will cause Web Server Type is "A"
-fixed
|
2013-03-12 17:00:52 -04:00 |
Martin Konecny
|
13b3eec0ad
|
Merge branch '2.3.x' into 2.3.x-saas
|
2013-03-12 16:38:16 -04:00 |
Martin Konecny
|
3497a3730c
|
Merge branch '2.3.x' into devel
|
2013-03-06 18:24:48 -05:00 |
Martin Konecny
|
0321464ab8
|
CC-4999:
Do silan analysis quietly in the background
-fixed
|
2013-03-06 18:24:19 -05:00 |
Martin Konecny
|
43ffa2aece
|
Merge branch '2.3.x' into 2.3.x-saas
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
|
2013-03-06 13:47:21 -05:00 |
Martin Konecny
|
5ceeb88899
|
Merge branch '2.3.x' into devel
|
2013-03-06 13:46:01 -05:00 |
Martin Konecny
|
7ca178295f
|
CC-4993: airtime-check-system reports airtime-liquidsoap as down
-fixed
|
2013-03-06 13:43:22 -05:00 |
Martin Konecny
|
1c80701488
|
Merge branch '2.3.x' into 2.3.x-saas
|
2013-03-05 16:21:47 -05:00 |
Martin Konecny
|
cc69418215
|
Merge branch '2.3.x' into devel
|
2013-03-05 16:21:22 -05:00 |
Martin Konecny
|
ae61b9f4d3
|
do not break if a file fails to be silan-analyzed
|
2013-03-04 16:08:40 -05:00 |
Martin Konecny
|
b744ab74ee
|
Merge branch '2.3.x' into 2.3.x-saas
|
2013-03-01 18:22:12 -05:00 |
Martin Konecny
|
c9b755e851
|
CC-1999: Backup & Restore scripts
-initial barebones commit
|
2013-03-01 18:21:06 -05:00 |
Martin Konecny
|
e08732fba7
|
CC-4975: airtime-silan cmd error
-fixed
|
2013-02-25 19:45:26 -05:00 |
Martin Konecny
|
8573a005c9
|
Merge branch '2.3.x' into 2.3.x-saas
|
2013-02-22 12:08:40 -05:00 |
Martin Konecny
|
671c627607
|
CC-4965: Fix airtime-silan import tool
-prevent zombie processes
|
2013-02-20 15:22:58 -05:00 |
Martin Konecny
|
b8f9acc0e5
|
CC-4965: Fix airtime-silan import tool
-various fixes
|
2013-02-20 15:11:27 -05:00 |
Martin Konecny
|
0f19ffc7df
|
CC-4965: Fix airtime-silan import tool
-move to correct directory
|
2013-02-20 15:02:37 -05:00 |
Martin Konecny
|
c398ce930b
|
Merge branch '2.3.x' into 2.3.x-saas
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
|
2013-02-04 16:22:35 -05:00 |
Martin Konecny
|
331386f74f
|
CC-4910: Need to properly handle non-200 http status codes in api client
-fixed
|
2013-02-04 16:05:58 -05:00 |
Martin Konecny
|
0ea7cca966
|
Merge branch '2.3.x' into 2.3.x-saas
|
2013-02-02 21:00:04 -05:00 |
Martin Konecny
|
71b811348b
|
Merge branch '2.2.x' into 2.3.x
|
2013-02-02 20:59:47 -05:00 |