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

322 commits

Author SHA1 Message Date
Naomi
c8cfdadb90 CC-5594 : Remove all date_default_timezone_get() 
removing unused old methods, changing listener stats to use the user timezone for display.
 2013-12-04 15:06:07 -05:00
drigato
4253608948 Small fix to overlapping show check 2013-12-03 15:14:53 -05:00
drigato
c18d53f403 CC-5593: Overlapping Show Bug 
Get instance depending on whether instance id is provided or not
 2013-12-03 15:07:40 -05:00
drigato
d49131db48 CC-5593: Overlapping Show Bug 
Need to check if the show instance has been deleted
 2013-12-03 14:39:53 -05:00
Naomi
109b313d37 CC-5424 : Same webstream playing will switch off ON AIR light 2013-10-16 12:26:39 -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
denise
91ea1f2240 CC-5184: Timeline -> Filter by show option doesn't work 2013-05-29 15:00:35 -04:00
Naomi Aro
4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -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
denise
3d09747990 CC-5150: Calendar->Add/Remove Show contents: Exception happens when try to adding contents for show 2013-05-16 13:42:06 -04:00
Martin Konecny
5080807a21 IM-629 
-fix minor SQL syntax error
 2013-05-14 19:18:41 -04:00
Martin Konecny
bb36556bb9 IM-629 
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
 2013-05-14 19:18:08 -04:00
Naomi
74c0e390b6 CC-5147 : check builder feed on now playing page updating when not needed 
wrong timestamp used when changing to prepared statement.
 2013-05-14 16:51:34 -04:00
denise
c173744929 CC-5090: Unscheduled tracks are still marked at Scheduled in linked show 2013-05-14 10:58:06 -04:00
Naomi
82945038d5 CRLF fix 2013-05-10 17:44:50 -04:00
Naomi
b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
Martin Konecny
9c05511613 CC-5121: fix some SQL statements not being escaped/prepared 2013-05-09 15:08:47 -04:00
denise
71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -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
denise
a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -04:00
denise
6766d208aa CC-4961: Show linking 
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
 2013-03-21 16:31:05 -04:00
denise
99c07272fd - Moved all form validation to it's own function in schedule service 
- Moved show creation to it's own function in schedule service
 2013-03-06 09:58:35 -05:00
drigato
bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise
d08f6cf3e1 CC-4961: Show linking 
-initial schedule service experimentation
 2013-03-06 09:58:35 -05:00
Martin Konecny
93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
Martin Konecny
0a198ae424 Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/models/User.php
 2013-01-30 18:31:45 -05:00
denise
cf2ed25bfb CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist 
-done
 2013-01-30 16:53:59 -05:00
drigato
c45440482a CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 08:57:59 -05:00
denise
5f3f2cd97c CC-4881: Cue in time can be greater than Cue out time in some situations 
-fixed
 2013-01-28 16:46:11 -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
dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-10 18:09:00 -05:00
James
048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
james
c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -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
75adf9b6a1 CC-4701: same webstream played twice in a row does not work. 
-fixed
 2012-11-23 14:03:31 -05:00
Martin Konecny
fe44d23b74 CC-4715: Better management of tracks that are shorter than they claim to be. 2012-11-20 16:31:27 -05:00
Martin Konecny
7efa7169ca CC-4700: Return mime type of streams instead of null 
-fixed
 2012-11-15 16:41:46 -05:00
James
f657ee4f20 Merge branch '2.2.x' into 2.2.x-saas 2012-11-08 17:27:51 -05:00
James
33b2520c14 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-08 17:27:28 -05:00
James
628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before 
- fixed
 2012-11-08 17:26:55 -05:00
Martin Konecny
fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
Martin Konecny
38d28d3346 SAAS-289: Remove all isSaaS checks 2012-11-06 16:48:34 -05:00
James
575400b4c2 CC-4623: Library: Preview button for Flac does not work 
- fixed
 2012-11-01 16:44:37 -04:00
James
5651dbce56 CC-4644: Exception from zendphp.log 
- fixed
 2012-10-29 16:37:27 -04:00
James
4861397872 CC-4644: Exception from zendphp.log 
- fixed
 2012-10-29 16:19:23 -04:00
Martin Konecny
4daaa776e2 CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table 
-fixed
 2012-10-23 17:45:55 -04:00
james
dff5bb4e2b CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table 
- fixed
 2012-10-23 12:24:38 -04:00