Commit afd236c
committed
Merge branch 'master' into develop2
# Conflicts:
# assets/plugins/elementsintree/includes/on_manager_tree_render.inc.php
# assets/plugins/extrascheck/lang/english.php
# assets/plugins/extrascheck/lang/italian.php
# assets/plugins/qm/css/actionButtons.css
# assets/plugins/qm/css/navButtons.css
# assets/plugins/qm/css/style.css
# assets/plugins/qm/qm.inc.php
# assets/plugins/tinymce4/tinymce/langs/fr.js
# assets/plugins/tinymce4/tpl/tpl.tinymce4.config.html
# install/actions/tpl_connection.html
# install/assets/plugins/OutdatedExtrasCheck.tpl
# install/assets/plugins/qm.tpl
# install/setup.data.sql
# install/setup.sql
# install/template.tpl
# manager/actions/category_mgr/skin/main.tpl.phtml
# manager/actions/modules.static.php
# manager/actions/mutate_module.dynamic.php
# manager/actions/welcome.static.php
# manager/includes/header.inc.php
# manager/includes/lang/english.inc.php
# manager/includes/lang/italian.inc.php
# manager/includes/lang/nederlands-utf8.inc.php
# manager/includes/preload.functions.inc.php
# manager/media/browser/mcpuk/themes/evo/style.css
# manager/media/browser/mcpuk/tpl/tpl_browser.php
# manager/media/style/common/spectrum/spectrum.css
# manager/media/style/default/color.switcher.php
# manager/media/style/default/css/color.switcher.css
# manager/media/style/default/css/custom.css
# manager/media/style/default/js/color.switcher.js1,431 files changed
Lines changed: 0 additions & 2 deletions
File tree
- assets
- .thumbs
- backup
- cache
- images
- updater
- docs
- export
- files
- images
- import
- js
- easy-ui
- editors
- plugins
- themes
- icons
- modx
- images
- euigrid
- js
- lang
- euiuploader
- css
- js
- lang
- tpl
- fileapi
- handlebars
- jquery
- lib
- Formatter
- Helpers
- MODxAPI
- SimpleTab
- modules
- docmanager
- classes
- js
- lang
- templates
- store
- css
- installer
- js/fancybox
- plugins
- codemirror
- cm
- lib
- mode
- theme
- elementsintree
- assets
- includes
- extrascheck/lang
- filesource
- lang
- forgotmanagerlogin
- managermanager
- js
- widgets
- ddmultiplefields
- ddselectdocuments
- mm_hideempty
- mm_hidefields
- mm_movecategorytotab
- mm_renamefield
- showimagetvs
- qm
- css
- images
- js
- tinymce4
- gsettings
- theme
- tinymce
- langs
- plugins
- advlist
- anchor
- autolink
- autoresize
- autosave
- bbcode
- charmap
- codesample
- css
- code
- colorpicker
- directionality
- emoticons
- img
- example_dependency
- example
- fullpage
- fullscreen
- help
- img
- hr
- imagetools
- image
- importcss
- insertdatetime
- layer
- legacyoutput
- link
- lists
- media
- modxlink
- nonbreaking
- noneditable
- pagebreak
- paste
- preview
- print
- save
- searchreplace
- spellchecker
- tabfocus
- table
- template
- textcolor
- textpattern
- toc
- visualblocks
- css
- visualchars
- wordcount
- youtube
- css
- fonts
- js
- langs
- slider
- css
- js
- less
- template
- skins/lightgray
- fonts
- img
- themes
- inlite
- modern
- tpl
- transalias
- transliterations
- updater
- lang
- snippets
- DocLister
- config/core
- core
- controller
- extender
- filter
- lib
- FormLister
- config/core
- core
- controller
- lang
- english
- russian-UTF8
- docs
- en
- examples/ru
- ru
- lib
- MailChimp
- captcha
- modxCaptcha
- reCaptcha
- smsCaptcha
- docinfo
- if
- custom
- phpthumb
- fonts
- tvs
- install
- actions
- assets
- chunks
- modules
- plugins
- snippets
- tvs
- img
- lang
- manager
- actions
- category_mgr
- inc
- skin
- chunks
- categorize
- edit
- css
- js
- help
- version_notices
- mutate_settings
- resources
- frames
- includes
- controls
- extenders
- modifiers
- lang
- country
- override
- media
- browser/mcpuk
- core
- types
- doc
- js
- browser
- lang
- lib
- themes
- evo
- img
- files
- big
- small
- icons
- oxygen
- img
- files
- big
- small
- icons
- tree
- tpl
- calendar
- debug
- rss
- extlib
- script
- air-datepicker
- css
- i18n
- bin
- bootstrap/js
- gridster
- jquery
- mootools
- spectrum
- style
- common
- bootstrap/css
- font-awesome
- css
- fonts
- images
- icons
- misc
- moo-datepicker
- spectrum
- default
- css
- fonts
- images
- credits
- icons
- misc
- tree
- js
- processors
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
File mode changed.
0 commit comments