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

471 commits

Author SHA1 Message Date
Naomi
3d1f0b0d0e CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 2013-12-10 17:41:59 -05:00
Naomi
3a2f9a24b5 CC-5627 : Check all Application_Common_DateHelper calculations that use timezone. 
working on getting widgets to work properly returning station local time.
 2013-12-10 16:45:05 -05:00
Naomi
20b32bab80 CC-5594 : Remove all date_default_timezone_get() 
simplifying code, removing unnecessary calculations.
 2013-12-04 16:05:18 -05:00
denise
c687b6ad24 Merge branch 'master' of https://github.com/jamieconnor/Airtime 
Conflicts:
	airtime_mvc/application/services/ShowService.php
 2013-10-08 11:16:25 -04:00
Naomi
1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi
7d739a0f66 CC-5316 : Playout History: Doesn't support webstream 
adding the webstream metadata to the history table.
 2013-09-30 13:56:27 -04:00
Jamie Connor
1c6d7725ca Modified weekInfo from ApiController to display current week and next, changed widget to display extra days. 2013-09-18 17:35:32 +12:00
Jamie Connor
6da9b6bf42 Removed repeated code 2013-09-07 14:52:45 +12:00
Naomi Aro
682a37894b Merge branch 'ryerson-history' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
 2013-09-02 15:52:43 -04:00
Naomi Aro
60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -04:00
Naomi
4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Jamie Connor
b1e71e5adf added optional parameter number_of_days for getting schedule information 2013-08-26 11:26:09 +12:00
denise
50d5685199 CC-5270: looping on InvalidContentType 2013-08-14 17:43:14 -04:00
drigato
b77b12c508 Merge branch '2.4.x' into 2.4.x-saas 2013-07-24 15:32:16 -04:00
drigato
4cbbd1145b CC-5285: API Request: Get ON AIR light status 2013-07-24 15:30:49 -04:00
drigato
d9859ff006 CC-5285: API Request: Get ON AIR light status 2013-07-24 15:17:10 -04:00
denise
c2f2a541c7 CC-5285: API Request: Get ON AIR light status 2013-07-23 17:39:38 -04:00
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