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 |
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 |