Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
13942 commits 3 branches 0 tags 405 MiB
Commit graph

454 commits

Author SHA1 Message Date
Naomi
328c1f3cac IM-733 Create Development timetable for Airtime Development 
IM-777
Database structure for new History Feature
 2013-07-03 15:19:05 -04: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
046039ece1 CC-5207: 
media-monitor restart will reset the cuein/cueout value

-fixed
 2013-06-05 16:14:14 -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
2250d89cbd CC-5013: 
Re-Added watched folder wont update

-fixed
 2013-05-10 13:19:56 -04:00
Martin Konecny
f5fa033207 better flow in dispatchMetadata function 2013-05-09 17:37:23 -04:00
Martin Konecny
d902d38429 revert jsonEncode change not supported by older zend versions 2013-05-02 17:50:36 -04:00
Martin Konecny
ca22a25827 fix silly mistake with echoing json twice 2013-05-02 16:57:07 -04:00
Martin Konecny
acfc72f422 use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00
Martin Konecny
243dda60f8 remove useless comment 2013-04-19 20:25:26 -04:00
Martin Konecny
fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny
f39f9329cc CC-4992: 
Decouple pypo from Airtime install

-first commit
 2013-04-19 20:10:51 -04:00
Martin Konecny
018ec9231e don't print out anything extra after printing json 2013-04-18 16:20:34 -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
92d0a6178e Merge branch '2.3.x' into 2.3.x-saas 2013-04-05 15:34:04 -04:00
Martin Konecny
4595aab694 Merge branch '2.3.x' 2013-04-05 15:33:48 -04:00
Martin Konecny
d1f655d79d CC-5038: Silan error: list index out of range 
-fixed
 2013-04-05 15:32:44 -04:00
Martin Konecny
fcbac2a044 Merge branch '2.3.x' into devel 2013-04-04 15:15:19 -04:00
Martin Konecny
a061464ffb Merge branch '2.3.x' into 2.3.x-saas 2013-04-04 15:14:04 -04:00
Martin Konecny
301115c035 CC-5039: Encoded forward slash causing lots of apache error logs 
-fixed: data should have been sent as POST rather than GET
 2013-04-04 15:12:52 -04:00
Martin Konecny
d1e72cfeea Merge branch '2.3.x' into devel 2013-04-03 17:12:28 -04:00
Martin Konecny
eb3fda8423 Merge branch '2.3.x' into 2.3.x-saas 2013-04-03 17:12:14 -04:00
Martin Konecny
a748b05125 CC-5040: 
All API actions need to have consistent return value

-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
 2013-04-03 17:11:36 -04: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
cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -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
ae503121d8 CC-4984: Exception for replaygain 
-fixed
 2013-02-28 18:26:15 -05:00
Martin Konecny
e08732fba7 CC-4975: airtime-silan cmd error 
-fixed
 2013-02-25 19:45:26 -05:00
Martin Konecny
8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
Naomi
542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi
f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi
fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
denise
ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise
525b2dcb33 CC-4895: Remove all json die() statements from code 
- removed json_encode
 2013-02-07 15:41:47 -05:00
denise
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
denise
d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -05:00
Martin Konecny
f8208a355c Merge branch 'devel' into 2.3.x-saas 2013-01-18 12:22:45 -05:00
James
f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
Martin Konecny
8b12f692cd CC-4854: Remove SaaS checking from codebase 
-fixed
 2013-01-16 14:31:43 -05:00
Martin Konecny
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
James
5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -05:00
James
1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
Martin Konecny
1ee90ed9b9 CC-4790: Media Monitor: Re-added files won't show up in Library 
-fixed
 2013-01-08 15:42:35 -05:00
James
b8f80866cf CC-3018: Automatically strip out silence from audio tracks 
- done
 2013-01-03 14:02:06 -05:00
denise
b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
Martin Konecny
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
Martin Konecny
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
denise
5adadc2e91 CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-20 11:33:37 -05:00