Merge lp://qastaging/~dangarner/xibo/server-170alpha into lp://qastaging/xibo/1.7
Proposed by
Dan Garner
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 341 | ||||||||||||||||||||
Proposed branch: | lp://qastaging/~dangarner/xibo/server-170alpha | ||||||||||||||||||||
Merge into: | lp://qastaging/xibo/1.7 | ||||||||||||||||||||
Diff against target: |
72436 lines (+29845/-33980) 454 files modified
.bzrignore (+3/-0) Vagrantfile (+23/-0) library/readme.txt (+1/-0) server-tests/features/login-about-popup.feature (+9/-0) server-tests/features/login-admin-user.feature (+10/-0) server-tests/features/schedule_view.feature (+7/-0) server-tests/features/step_definitions/generic.js (+97/-0) server-tests/features/step_definitions/login-admin-user.js (+14/-0) server-tests/features/support/teardown.js (+9/-0) server-tests/features/support/testproperties.json (+9/-0) server-tests/features/support/world.js (+37/-0) server-tests/package.json (+16/-0) server-tests/readme.md (+13/-0) server/3rdparty/jquery-file-upload/UploadHandler.php (+1/-36) server/3rdparty/jquery-file-upload/XiboUploadHandler.php (+38/-0) server/config/client.config.php (+477/-0) server/config/config.class.php (+218/-124) server/install.php (+117/-719) server/install/database/80.sql (+178/-0) server/install/header_upgrade.inc (+0/-50) server/install/master/data.sql (+97/-99) server/install/master/structure.sql (+56/-14) server/install/upgradestep.class.php (+51/-0) server/lib/app/app_functions.php (+0/-171) server/lib/app/datemanager.class.php (+1/-8) server/lib/app/formmanager.class.php (+222/-132) server/lib/app/helpmanager.class.php (+1/-17) server/lib/app/kit.class.php (+13/-6) server/lib/app/menumanager.class.php (+2/-12) server/lib/app/pagemanager.class.php (+20/-9) server/lib/app/pdoconnect.class.php (+44/-8) server/lib/app/responsemanager.class.php (+40/-25) server/lib/app/thememanager.class.php (+18/-14) server/lib/app/translationengine.class.php (+9/-6) server/lib/data/bandwidth.data.class.php (+62/-0) server/lib/data/data.class.php (+3/-2) server/lib/data/dataset.data.class.php (+2/-3) server/lib/data/datasetdata.data.class.php (+1/-1) server/lib/data/display.data.class.php (+325/-225) server/lib/data/displaygroup.data.class.php (+15/-10) server/lib/data/displaygroupsecurity.data.class.php (+3/-9) server/lib/data/displayprofile.data.class.php (+213/-0) server/lib/data/file.data.class.php (+6/-3) server/lib/data/layout.data.class.php (+407/-19) server/lib/data/media.data.class.php (+7/-0) server/lib/data/nonce.data.class.php (+248/-0) server/lib/data/region.data.class.php (+36/-17) server/lib/data/resolution.data.class.php (+16/-6) server/lib/data/schedule.data.class.php (+16/-49) server/lib/data/template.data.class.php (+2/-3) server/lib/data/userdata.data.class.php (+28/-0) server/lib/data/usergroup.data.class.php (+1/-1) server/lib/include.php (+25/-15) server/lib/modules/module.class.php (+436/-259) server/lib/modules/module.interface.php (+15/-3) server/lib/pages/admin.class.php (+221/-422) server/lib/pages/base.class.php (+44/-0) server/lib/pages/campaign.class.php (+138/-28) server/lib/pages/clock.class.php (+1/-16) server/lib/pages/content.class.php (+124/-45) server/lib/pages/dashboard.class.php (+1/-10) server/lib/pages/dataset.class.php (+167/-70) server/lib/pages/display.class.php (+409/-241) server/lib/pages/displaygroup.class.php (+57/-36) server/lib/pages/displayprofile.class.php (+352/-0) server/lib/pages/error.class.php (+1/-21) server/lib/pages/fault.class.php (+1/-10) server/lib/pages/group.class.php (+59/-24) server/lib/pages/help.class.php (+54/-30) server/lib/pages/index.class.php (+210/-190) server/lib/pages/install.class.php (+619/-0) server/lib/pages/layout.class.php (+828/-676) server/lib/pages/license.class.php (+1/-10) server/lib/pages/log.class.php (+122/-55) server/lib/pages/mediamanager.class.php (+63/-22) server/lib/pages/module.class.php (+164/-30) server/lib/pages/oauth.class.php (+51/-18) server/lib/pages/preview.class.php (+1/-9) server/lib/pages/resolution.class.php (+76/-54) server/lib/pages/schedule.class.php (+668/-1660) server/lib/pages/sessions.class.php (+55/-24) server/lib/pages/stats.class.php (+196/-23) server/lib/pages/statusdashboard.class.php (+165/-115) server/lib/pages/template.class.php (+65/-48) server/lib/pages/timeline.class.php (+120/-107) server/lib/pages/transition.class.php (+30/-31) server/lib/pages/upgrade.class.php (+301/-0) server/lib/pages/user.class.php (+197/-101) server/lib/service/rest.class.php (+2/-1) server/lib/service/service.wsdl (+51/-24) server/lib/service/xmdssoap.class.php (+842/-628) server/lib/xmds.inc.php (+13/-2) server/locale/dbtranslate.php (+112/-44) server/maintenance.php (+2/-2) server/manual/content/admin/api_layouts.php (+40/-16) server/manual/content/admin/displayprofiles.php (+47/-0) server/manual/content/admin/module_overview.php (+41/-0) server/manual/content/admin/module_template.php (+229/-0) server/manual/content/admin/modules.php (+10/-2) server/manual/content/admin/release_notes_1.6.3.php (+83/-0) server/manual/content/admin/release_notes_1.7.0-alpha.php (+82/-0) server/manual/content/admin/settings.php (+84/-250) server/manual/content/admin/settings_maintenance.php (+187/-0) server/manual/content/install/install_client.php (+55/-73) server/manual/content/layout/overview.php (+6/-1) server/manual/content/routes.php (+10/-0) server/manual/content/templates/overview.php (+2/-40) server/manual/content/templates/template_resolution.php (+41/-2) server/manual/content/toc_developer.php (+1/-0) server/manual/content/toc_developer_module.php (+5/-0) server/manual/content/toc_developer_releasenotes.php (+7/-1) server/manual/content/toc_getting_started.php (+1/-0) server/manual/content/toc_user_and_display.php (+1/-0) server/manual/template.php (+1/-1) server/modules/clock.module.php (+542/-0) server/modules/counter.module.php (+31/-18) server/modules/datasetview.module.php (+79/-64) server/modules/embedded.module.php (+51/-30) server/modules/flash.module.php (+0/-1) server/modules/image.module.php (+76/-24) server/modules/localvideo.module.php (+29/-48) server/modules/module_template.php (+286/-0) server/modules/module_user_general.php (+196/-28) server/modules/powerpoint.module.php (+1/-2) server/modules/preview/HtmlTemplate.html (+20/-0) server/modules/preview/HtmlTemplateForGetResource.html (+10/-11) server/modules/preview/HtmlTemplateSimple.html (+1/-1) server/modules/preview/html-preview.js (+18/-4) server/modules/preview/vendor/fittext.js (+43/-0) server/modules/preview/vendor/flipclock.css (+430/-0) server/modules/preview/vendor/flipclock.min.js (+2/-0) server/modules/preview/vendor/moment.js (+7/-0) server/modules/preview/xibo-text-render.js (+8/-4) server/modules/preview/xibo-webpage-render.js (+6/-1) server/modules/shellcommand.module.php (+24/-12) server/modules/text.module.php (+86/-67) server/modules/theme/HtmlTemplateForClock.html (+130/-0) server/modules/theme/HtmlTemplateForFlipClock.html (+71/-0) server/modules/ticker.module.php (+565/-464) server/modules/video.module.php (+0/-1) server/modules/webpage.module.php (+57/-56) server/services.php (+44/-0) server/theme/default/config.php (+6/-2) server/theme/default/css/calendar.css (+11/-144) server/theme/default/css/dashboard.css (+369/-0) server/theme/default/css/install.css (+38/-19) server/theme/default/css/timeline.css (+17/-14) server/theme/default/css/xibo.css (+36/-22) server/theme/default/fonts/montserrat-regular-webfont.eot (+568/-0) server/theme/default/fonts/montserrat-regular-webfont.svg (+5835/-0) server/theme/default/fonts/montserrat-regular-webfont.ttf (+553/-0) server/theme/default/fonts/montserrat-regular-webfont.woff (+561/-0) server/theme/default/html/about_page.php (+1/-10) server/theme/default/html/application_form_register.php (+0/-57) server/theme/default/html/applications_page.php (+0/-54) server/theme/default/html/campaign_form_add.php (+0/-35) server/theme/default/html/campaign_form_delete.php (+0/-31) server/theme/default/html/campaign_form_edit.php (+0/-36) server/theme/default/html/campaign_form_layout_assign.php (+2/-2) server/theme/default/html/campaign_form_layout_assign_list.php (+2/-1) server/theme/default/html/campaign_form_permissions.php (+0/-53) server/theme/default/html/campaign_page.php (+0/-52) server/theme/default/html/campaign_page_grid.php (+0/-60) server/theme/default/html/dataset_dataentry_page.php (+0/-51) server/theme/default/html/dataset_form_add.php (+0/-46) server/theme/default/html/dataset_form_column_add.php (+0/-68) server/theme/default/html/dataset_form_column_delete.php (+0/-31) server/theme/default/html/dataset_form_column_edit.php (+0/-68) server/theme/default/html/dataset_form_column_grid.php (+1/-1) server/theme/default/html/dataset_form_csv_import.php (+0/-70) server/theme/default/html/dataset_form_delete.php (+0/-31) server/theme/default/html/dataset_form_edit.php (+0/-46) server/theme/default/html/dataset_form_permissions.php (+0/-53) server/theme/default/html/dataset_page.php (+0/-51) server/theme/default/html/dataset_page_grid.php (+0/-65) server/theme/default/html/display_form_default_layout.php (+0/-36) server/theme/default/html/display_form_delete.php (+0/-31) server/theme/default/html/display_form_edit.php (+0/-129) server/theme/default/html/display_form_group_assign.php (+21/-15) server/theme/default/html/display_form_wakeonlan.php (+0/-31) server/theme/default/html/display_page.php (+0/-60) server/theme/default/html/display_page_grid.php (+0/-85) server/theme/default/html/displaygroup_fileassociations_form_assign.php (+2/-2) server/theme/default/html/displaygroup_fileassociations_form_assign_list.php (+2/-1) server/theme/default/html/displaygroup_form_add.php (+0/-39) server/theme/default/html/displaygroup_form_delete.php (+0/-31) server/theme/default/html/displaygroup_form_display_assign.php (+21/-15) server/theme/default/html/displaygroup_form_edit.php (+0/-41) server/theme/default/html/displaygroup_form_permissions.php (+0/-53) server/theme/default/html/displaygroup_page.php (+0/-51) server/theme/default/html/displaygroup_page_grid.php (+0/-60) server/theme/default/html/fault_page.php (+1/-10) server/theme/default/html/footer.php (+13/-8) server/theme/default/html/form_file_upload_single.php (+6/-33) server/theme/default/html/form_grid_pager.php (+41/-0) server/theme/default/html/form_render.php (+279/-0) server/theme/default/html/grid_pager.php (+7/-7) server/theme/default/html/grid_render.php (+206/-0) server/theme/default/html/header.php (+124/-58) server/theme/default/html/help_form_add.php (+0/-43) server/theme/default/html/help_form_delete.php (+0/-31) server/theme/default/html/help_form_edit.php (+0/-44) server/theme/default/html/help_page.php (+0/-51) server/theme/default/html/help_page_grid.php (+0/-63) server/theme/default/html/homepage_mediamanager.php (+0/-64) server/theme/default/html/homepage_mediamanager_grid.php (+1/-1) server/theme/default/html/install_footer.php (+9/-7) server/theme/default/html/install_header.php (+30/-21) server/theme/default/html/layout_designer.php (+17/-28) server/theme/default/html/layout_designer_form_timeline.php (+1/-1) server/theme/default/html/layout_form_add.php (+0/-56) server/theme/default/html/layout_form_background.php (+0/-55) server/theme/default/html/layout_form_copy.php (+0/-46) server/theme/default/html/layout_form_delete.php (+0/-31) server/theme/default/html/layout_form_edit.php (+0/-61) server/theme/default/html/layout_form_retire.php (+0/-32) server/theme/default/html/layout_jumplist_grid.php (+0/-40) server/theme/default/html/layout_page.php (+0/-76) server/theme/default/html/layout_page_grid.php (+0/-70) server/theme/default/html/library_form_add.php (+3/-3) server/theme/default/html/library_form_assign.php (+1/-1) server/theme/default/html/library_form_assign_list.php (+1/-1) server/theme/default/html/library_form_media_add.php (+8/-8) server/theme/default/html/library_page.php (+0/-80) server/theme/default/html/library_page_grid.php (+0/-90) server/theme/default/html/log_form_display_last100.php (+0/-47) server/theme/default/html/log_form_truncate.php (+0/-31) server/theme/default/html/log_page.php (+0/-77) server/theme/default/html/log_page_grid.php (+0/-47) server/theme/default/html/login_page.php (+8/-8) server/theme/default/html/media_form_counter_add.php (+0/-46) server/theme/default/html/media_form_counter_edit.php (+0/-46) server/theme/default/html/media_form_datasetview_add.php (+0/-40) server/theme/default/html/media_form_datasetview_edit.php (+8/-77) server/theme/default/html/media_form_embedded_add.php (+0/-63) server/theme/default/html/media_form_embedded_edit.php (+0/-63) server/theme/default/html/media_form_microblog_add.php (+28/-28) server/theme/default/html/media_form_microblog_edit.php (+26/-26) server/theme/default/html/media_form_shellcommand_add.php (+0/-42) server/theme/default/html/media_form_shellcommand_edit.php (+0/-42) server/theme/default/html/media_form_text_add.php (+0/-78) server/theme/default/html/media_form_text_edit.php (+7/-52) server/theme/default/html/media_form_ticker_add.php (+0/-57) server/theme/default/html/media_form_ticker_dataset_edit.php (+8/-115) server/theme/default/html/media_form_ticker_edit.php (+8/-121) server/theme/default/html/media_form_webpage_add.php (+0/-67) server/theme/default/html/media_form_webpage_edit.php (+0/-67) server/theme/default/html/message_box.php (+23/-0) server/theme/default/html/module_form_edit.php (+0/-47) server/theme/default/html/module_page.php (+0/-50) server/theme/default/html/module_page_grid.php (+0/-77) server/theme/default/html/module_page_install_modules.php (+40/-0) server/theme/default/html/new_user_welcome.php (+88/-0) server/theme/default/html/region_form_options.php (+0/-64) server/theme/default/html/region_form_options_no_transition.php (+0/-52) server/theme/default/html/resolution_form_add.php (+0/-44) server/theme/default/html/resolution_form_delete.php (+0/-31) server/theme/default/html/resolution_form_edit.php (+0/-49) server/theme/default/html/resolution_page.php (+0/-52) server/theme/default/html/resolution_page_grid.php (+0/-67) server/theme/default/html/schedule_form_add_event.php (+0/-96) server/theme/default/html/schedule_form_edit_event.php (+0/-96) server/theme/default/html/schedule_form_schedule_now.php (+0/-62) server/theme/default/html/schedule_page.php (+54/-26) server/theme/default/html/schedule_page_display_list.php (+0/-59) server/theme/default/html/sessions_form_logout.php (+0/-31) server/theme/default/html/sessions_page.php (+0/-61) server/theme/default/html/sessions_page_grid.php (+0/-62) server/theme/default/html/settings_page.php (+89/-21) server/theme/default/html/stats_page.php (+0/-64) server/theme/default/html/stats_page_bandwidth.php (+47/-0) server/theme/default/html/stats_page_grid.php (+19/-92) server/theme/default/html/status_dashboard.php (+184/-40) server/theme/default/html/table_render.php (+76/-0) server/theme/default/html/template_form_add.php (+0/-42) server/theme/default/html/template_form_delete.php (+0/-31) server/theme/default/html/template_form_permissions.php (+0/-53) server/theme/default/html/template_page.php (+0/-66) server/theme/default/html/template_page_grid.php (+0/-66) server/theme/default/html/transition_form_edit.php (+0/-40) server/theme/default/html/transition_page.php (+0/-50) server/theme/default/html/transition_page_grid.php (+0/-66) server/theme/default/html/upgrade_page.php (+35/-0) server/theme/default/html/user_form_add.php (+0/-57) server/theme/default/html/user_form_change_password.php (+0/-45) server/theme/default/html/user_form_delete.php (+0/-32) server/theme/default/html/user_form_edit.php (+0/-53) server/theme/default/html/user_form_set_homepage.php (+0/-37) server/theme/default/html/user_form_set_password.php (+0/-41) server/theme/default/html/user_page.php (+0/-65) server/theme/default/html/user_page_grid.php (+0/-63) server/theme/default/html/usergroup_form_add.php (+0/-35) server/theme/default/html/usergroup_form_delete.php (+0/-31) server/theme/default/html/usergroup_form_edit.php (+0/-35) server/theme/default/html/usergroup_form_pagesecurity.php (+1/-1) server/theme/default/html/usergroup_form_user_assign.php (+21/-15) server/theme/default/html/usergroup_page.php (+0/-62) server/theme/default/html/usergroup_page_grid.php (+0/-58) server/theme/default/js/install.js (+23/-0) server/theme/default/js/xibo-calendar.js (+110/-150) server/theme/default/js/xibo-cms.js (+175/-79) server/theme/default/js/xibo-forms.js (+7/-36) server/theme/default/js/xibo-layout-designer.js (+34/-57) server/theme/default/js/xibo-preview-timeline.js (+7/-8) server/theme/default/libraries/bootstrap-colorpicker/css/bootstrap-colorpicker.min.css (+9/-0) server/theme/default/libraries/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js (+1/-0) server/theme/default/libraries/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css (+9/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js (+1/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ar.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.bg.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ca.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.cs.js (+19/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.da.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.de.js (+18/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ee.js (+18/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.el.js (+15/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.es.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.fi.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.fr.js (+18/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.he.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.hr.js (+15/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.hu.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.id.js (+15/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.is.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.it.js (+18/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ja.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ko.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.lt.js (+18/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.lv.js (+18/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ms.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.nb.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.nl.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.no.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.pl.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.pt-BR.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.pt.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ro.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.rs-latin.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.rs.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ru.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.sk.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.sl.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.sv.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.sw.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.th.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.tr.js (+17/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.ua.js (+15/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.uk.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js (+16/-0) server/theme/default/libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.zh-TW.js (+16/-0) server/theme/default/libraries/bootstrap-select/css/bootstrap-select.css (+274/-0) server/theme/default/libraries/bootstrap-select/js/bootstrap-select.js.map (+1/-0) server/theme/default/libraries/bootstrap-select/js/bootstrap-select.min.js (+8/-0) server/theme/default/libraries/bootstrap/css/bootstrap-datetimepicker.min.css (+0/-8) server/theme/default/libraries/bootstrap/css/bootstrap-responsive.css (+0/-1109) server/theme/default/libraries/bootstrap/css/bootstrap-responsive.min.css (+0/-9) server/theme/default/libraries/bootstrap/css/bootstrap-theme.min.css (+5/-0) server/theme/default/libraries/bootstrap/css/bootstrap.css (+0/-6158) server/theme/default/libraries/bootstrap/css/bootstrap.min.css (+4/-8) server/theme/default/libraries/bootstrap/fonts/glyphicons-halflings-regular.svg (+229/-0) server/theme/default/libraries/bootstrap/js/bootbox.min.js (+2/-13) server/theme/default/libraries/bootstrap/js/bootstrap-datetimepicker.min.js (+0/-26) server/theme/default/libraries/bootstrap/js/bootstrap.js (+0/-2276) server/theme/default/libraries/bootstrap/js/bootstrap.min.js (+5/-5) server/theme/default/libraries/calendar/css/calendar.css (+506/-0) server/theme/default/libraries/calendar/css/calendar.min.css (+1/-0) server/theme/default/libraries/calendar/js/calendar.js (+1134/-0) server/theme/default/libraries/calendar/js/language/ar-SA.js (+63/-0) server/theme/default/libraries/calendar/js/language/bs-BA.js (+68/-0) server/theme/default/libraries/calendar/js/language/cs-CZ.js (+109/-0) server/theme/default/libraries/calendar/js/language/da-DK.js (+74/-0) server/theme/default/libraries/calendar/js/language/de-AT.js (+79/-0) server/theme/default/libraries/calendar/js/language/de-DE.js (+73/-0) server/theme/default/libraries/calendar/js/language/el-GR.js (+80/-0) server/theme/default/libraries/calendar/js/language/es-ES.js (+80/-0) server/theme/default/libraries/calendar/js/language/es-MX.js (+73/-0) server/theme/default/libraries/calendar/js/language/fi-FI.js (+109/-0) server/theme/default/libraries/calendar/js/language/fr-FR.js (+75/-0) server/theme/default/libraries/calendar/js/language/hr-HR.js (+61/-0) server/theme/default/libraries/calendar/js/language/hu-HU.js (+78/-0) server/theme/default/libraries/calendar/js/language/it-IT.js (+75/-0) server/theme/default/libraries/calendar/js/language/ja-JP.js (+105/-0) server/theme/default/libraries/calendar/js/language/ko-KR.js (+70/-0) server/theme/default/libraries/calendar/js/language/nl-NL.js (+75/-0) server/theme/default/libraries/calendar/js/language/no-NO.js (+64/-0) server/theme/default/libraries/calendar/js/language/pl-PL.js (+77/-0) server/theme/default/libraries/calendar/js/language/pt-BR.js (+72/-0) server/theme/default/libraries/calendar/js/language/ro-RO.js (+91/-0) server/theme/default/libraries/calendar/js/language/ru-RU.js (+74/-0) server/theme/default/libraries/calendar/js/language/sl-SL.js (+109/-0) server/theme/default/libraries/calendar/js/language/sv-SE.js (+75/-0) server/theme/default/libraries/calendar/js/language/template.js (+109/-0) server/theme/default/libraries/calendar/js/language/tr-TR.js (+71/-0) server/theme/default/libraries/calendar/js/language/zh-CN.js (+70/-0) server/theme/default/libraries/calendar/js/language/zh-TW.js (+66/-0) server/theme/default/libraries/calendar/tmpls/day.html (+73/-0) server/theme/default/libraries/calendar/tmpls/events-list.html (+13/-0) server/theme/default/libraries/calendar/tmpls/modal.html (+10/-0) server/theme/default/libraries/calendar/tmpls/month-day.html (+25/-0) server/theme/default/libraries/calendar/tmpls/month.html (+19/-0) server/theme/default/libraries/calendar/tmpls/week-days.html (+7/-0) server/theme/default/libraries/calendar/tmpls/week.html (+18/-0) server/theme/default/libraries/calendar/tmpls/year-month.html (+11/-0) server/theme/default/libraries/calendar/tmpls/year.html (+20/-0) server/theme/default/libraries/ckeditor/config.js (+3/-0) server/theme/default/libraries/ckeditor/contents.css (+5/-0) server/theme/default/libraries/flot/LICENSE.txt (+0/-22) server/theme/default/libraries/flot/excanvas.js (+0/-1428) server/theme/default/libraries/flot/excanvas.min.js (+0/-1) server/theme/default/libraries/flot/jquery.colorhelpers.js (+0/-180) server/theme/default/libraries/flot/jquery.colorhelpers.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.canvas.js (+0/-345) server/theme/default/libraries/flot/jquery.flot.canvas.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.categories.js (+0/-190) server/theme/default/libraries/flot/jquery.flot.categories.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.crosshair.js (+0/-176) server/theme/default/libraries/flot/jquery.flot.crosshair.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.errorbars.js (+0/-353) server/theme/default/libraries/flot/jquery.flot.errorbars.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.fillbetween.js (+0/-226) server/theme/default/libraries/flot/jquery.flot.fillbetween.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.image.js (+0/-241) server/theme/default/libraries/flot/jquery.flot.image.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.js (+0/-3137) server/theme/default/libraries/flot/jquery.flot.min.js (+0/-2) server/theme/default/libraries/flot/jquery.flot.navigate.js (+0/-346) server/theme/default/libraries/flot/jquery.flot.navigate.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.pie.js (+0/-817) server/theme/default/libraries/flot/jquery.flot.pie.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.resize.js (+0/-60) server/theme/default/libraries/flot/jquery.flot.resize.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.selection.js (+0/-360) server/theme/default/libraries/flot/jquery.flot.selection.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.stack.js (+0/-188) server/theme/default/libraries/flot/jquery.flot.stack.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.symbol.js (+0/-71) server/theme/default/libraries/flot/jquery.flot.symbol.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.threshold.js (+0/-142) server/theme/default/libraries/flot/jquery.flot.threshold.min.js (+0/-1) server/theme/default/libraries/flot/jquery.flot.time.js (+0/-431) server/theme/default/libraries/flot/jquery.flot.time.min.js (+0/-1) server/theme/default/libraries/font-awesome/css/font-awesome.min.css (+4/-0) server/theme/default/libraries/font-awesome/fonts/fontawesome-webfont.svg (+504/-0) server/theme/default/libraries/jquery/additional-methods.min.js (+4/-2) server/theme/default/libraries/jquery/jquery-1.11.1.min.js (+4/-0) server/theme/default/libraries/jquery/jquery.min.map (+1/-0) server/theme/default/libraries/jquery/jquery.validate.min.js (+4/-2) server/theme/default/libraries/jstimezonedetect/LICENCE.txt (+22/-0) server/theme/default/libraries/jstimezonedetect/jstz.min.js (+2/-0) server/theme/default/libraries/morrisjs/morris.css (+2/-0) server/theme/default/libraries/morrisjs/morris.min.js (+7/-0) server/theme/default/libraries/morrisjs/raphael.min.js (+11/-0) server/theme/default/libraries/underscore/underscore-min.js (+1/-0) server/upgrade.php (+0/-679) |
||||||||||||||||||||
To merge this branch: | bzr merge lp://qastaging/~dangarner/xibo/server-170alpha | ||||||||||||||||||||
Related bugs: |
|
||||||||||||||||||||
Related blueprints: |
Create Field Display Description
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Xibo Maintainters | Pending | ||
Review via email:
|
To post a comment you must log in.