Skip to content
Snippets Groups Projects
  • Andreas Gohr's avatar
    3da7921f
    Merge branch 'master' into future · 3da7921f
    Andreas Gohr authored
    * master: (162 commits)
      fixed revision JS for images
      upgraded SimplePie to 1.3.1 FS#2708
      removed obsolete browser plugin (migrate does it)
      adjust spacing to match standard 1.4em grid
      added comment on use of whitelist vs blacklist
      Updated idfilter() function for IIS
      use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
      added 'home' class to first link in hierarchical breadcrumbs
      reduced required max width to go into tablet mode
      re-added linear gradients for firefox
      added missing styling for disabled form elements (FS#2705)
      fixed acronyms in italics (FS#2684)
      improved print styles (includes fixes for FS#2645 and FS#2707)
      basic styles improvements
      Greek language update
      Use list in acl help text, for more structure
      Galician language update
      touch the config on save, even if no changes were made
      unwind the width narrowing commit
      put some whitespace between form submit button and fieldset bottom border
      ...
    
    Conflicts:
    	lib/plugins/config/admin.php
    	lib/plugins/config/settings/config.class.php
    3da7921f
    History
    Merge branch 'master' into future
    Andreas Gohr authored
    * master: (162 commits)
      fixed revision JS for images
      upgraded SimplePie to 1.3.1 FS#2708
      removed obsolete browser plugin (migrate does it)
      adjust spacing to match standard 1.4em grid
      added comment on use of whitelist vs blacklist
      Updated idfilter() function for IIS
      use var and remove suggestions when needed Use variable for maximum number of suggestions for quicksearch. And hide suggestions when search field is emptied, or when no suggestion are found.
      added 'home' class to first link in hierarchical breadcrumbs
      reduced required max width to go into tablet mode
      re-added linear gradients for firefox
      added missing styling for disabled form elements (FS#2705)
      fixed acronyms in italics (FS#2684)
      improved print styles (includes fixes for FS#2645 and FS#2707)
      basic styles improvements
      Greek language update
      Use list in acl help text, for more structure
      Galician language update
      touch the config on save, even if no changes were made
      unwind the width narrowing commit
      put some whitespace between form submit button and fieldset bottom border
      ...
    
    Conflicts:
    	lib/plugins/config/admin.php
    	lib/plugins/config/settings/config.class.php
Code owners
Assign users and groups as approvers for specific file changes. Learn more.