Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
sintonia/airtime_mvc/application/views/scripts
History
Albert Santoni 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/public/index.php
 		2015-06-16 10:37:06 -04:00
..
airtime-recorder Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
api Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
audiopreview Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
dashboard Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
error Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
form Reformatted logo remove button to use Zend 2015-02-27 17:19:37 -05:00
index Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
library Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
listenerstat Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
login Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
partialviews Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
playlist Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
playouthistory Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
playouthistorytemplate Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
plupload Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
preference Moved the Station Logo field to GeneralPreferences, and stopped using 2015-01-15 16:28:18 -05:00
recorder Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
schedule Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
showbuilder Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
systemstatus Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise 2015-01-19 15:05:13 -05:00
user Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
webstream Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
menu.phtml Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00