Tiki Wiki CMS Groupware / SVN-Code / Commit [r68498]

Commit [r68498] Maximize Restore History

[MRG] Automatic merge, branches/19.x 68483 to 68496

Conflicts occurred during the merge. Fixed manually:
templates/admin/admin_navbar.tpl (took 19.x version)
templates/tabular/edit.tpl (took 19.x version - button class conflicts - everything was btn-primary, why?)

Authored by: jonnybradley 2018-12-06

Browse code at this revision

Parent: [r68497]

Child: [r68499]

changed	/trunk
changed	/trunk/lib/jquery_tiki/tiki-mxgraph.js
changed	/trunk/lib/smarty_tiki/block.title.php
changed	/trunk/lib/wiki-plugins/wikiplugin_diagram.php
changed	/trunk/templates/admin/admin_navbar.tpl
changed	/trunk/templates/prefs/text.tpl
changed	/trunk/templates/tabular/edit.tpl
changed	/trunk/templates/tiki-lastchanges.tpl
changed	/trunk/templates/tiki-listpages.tpl
changed	/trunk/templates/tiki-orphan_pages.tpl
changed	/trunk/templates/tiki-pluginlist_experiment.tpl
changed	/trunk/themes/base_files/css/tiki_base.css
changed	/trunk/themes/base_files/scss/_tiki-miscellaneous_global.scss
changed	/trunk/themes/base_files/scss/_tiki-selectors.scss
changed	/trunk/tiki-editdiagram.php

/trunk

Directory.

/trunk/lib/jquery_tiki/tiki-mxgraph.js Diff Switch to side-by-side view

/trunk/lib/smarty_tiki/block.title.php Diff Switch to side-by-side view

/trunk/lib/wiki-plugins/wikiplugin_diagram.php Diff Switch to side-by-side view

/trunk/templates/admin/admin_navbar.tpl Diff Switch to side-by-side view

/trunk/templates/prefs/text.tpl Diff Switch to side-by-side view

/trunk/templates/tabular/edit.tpl Diff Switch to side-by-side view

/trunk/templates/tiki-lastchanges.tpl Diff Switch to side-by-side view

/trunk/templates/tiki-listpages.tpl Diff Switch to side-by-side view

/trunk/templates/tiki-orphan_pages.tpl Diff Switch to side-by-side view

/trunk/templates/tiki-pluginlist_experiment.tpl Diff Switch to side-by-side view

/trunk/themes/base_files/css/tiki_base.css Diff Switch to side-by-side view

/trunk/themes/base_files/scss/_tiki-miscellaneous_global.scss Diff Switch to side-by-side view

/trunk/themes/base_files/scss/_tiki-selectors.scss Diff Switch to side-by-side view

/trunk/tiki-editdiagram.php Diff Switch to side-by-side view