sintonia/airtime_mvc/public/js
Albert Santoni 8b33acacd3 Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
..
airtime Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations 2015-09-29 18:58:55 -04:00
blockui Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
bootstrap Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
bootstrap-datetime Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
colorpicker/js Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
contextmenu Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
cookie Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
datatables CC-6077: Implement actions menu for library view 2015-08-18 14:55:32 -04:00
flot Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
fullcalendar Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
i18n Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
jplayer Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
js-timezone-detect SAAS-945: Language + Timezone Setup Popup 2015-07-27 14:38:42 -04:00
libs Merge branch 'saas-dev' into saas-showbuilder 2015-07-20 12:23:11 -04:00
plupload Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
qtip Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
serverbrowse Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
setup Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
sprintf Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
timepicker Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
tipsy Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00
waveformplaylist Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00