Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
sintonia/airtime_mvc/public/js
History
drigato 0a45de7fba Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	.gitignore
	airtime_mvc/application/configs/airtime-conf.php
	airtime_mvc/application/configs/classmap-airtime-conf.php
	airtime_mvc/application/models/RabbitMq.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
	airtime_mvc/application/models/airtime/map/CcShowTableMap.php
	airtime_mvc/application/models/airtime/om/BaseCcShow.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
	airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
	airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
	airtime_mvc/application/modules/rest/Bootstrap.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/build/sql/schema.sql
	airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
..
airtime Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -04:00
blockui needed to update jquery, fullcalendar needed updating for the new JS. 2013-07-29 08:57:31 -04:00
bootstrap Merge branch '2.2.x' into devel 2012-11-07 11:21:36 -05:00
bootstrap-datetime CC-5335 : I18N: Calendar picker strings are not translated. 2013-09-24 11:47:20 +02:00
colorpicker/js CRLF 2013-10-11 15:13:49 -04:00
contextmenu CC-3857: Chmod fixes for files which should not be executable 2012-05-22 11:22:43 -04:00
cookie Jquery cookie plugin 2013-01-10 14:57:47 -05:00
datatables Added Serbian Cyrillic, Serbian Latin and Croatian, thanks Zsolt! 2014-01-29 17:54:28 +00:00
flot CC-4717: Lintian warnings from devel branch 2012-11-22 15:14:55 -05:00
fullcalendar CRLF 2013-10-10 17:41:05 -04:00
i18n CC-1960: Internationalize Airtime / Support translations 2012-11-20 16:43:42 -05:00
jplayer Upgrade jPlayer library from 2.5.0 (7th November 2013) to 2.7.0 (1st September 2014) to resolve playback issues. 2014-10-21 20:15:05 +00:00
libs Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
plupload Japanese Plupload i18n file 2014-09-16 16:54:20 -04:00
qtip remove console.log from javascript library :/ 2012-09-19 11:04:01 -04:00
serverbrowse CC-1960: Internationalize Airtime / Support translations 2012-11-28 11:54:22 -05:00
sprintf
timepicker converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
tipsy CC-2258: Describe rights for each user type on the user page 2012-12-13 12:29:02 -05:00
waveformplaylist CC-5338 : Uncaught SyntaxError: audio resources unavailable for AudioContext construction 2013-09-24 18:50:41 +02:00