From 8152605e5a510feb525e7d0238acb1da530d7cdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Gaulin?= <jeremy@bnb.re>
Date: Thu, 27 Aug 2015 00:10:37 +0200
Subject: [PATCH 001/103] Fix Emmet expand by forcing syntax to html when
 editor is set to Twig.

---
 .../codeeditor/assets/js/codeeditor.js        |  18 ++
 .../codeeditor/assets/vendor/ace/ext-emmet.js |  59 ++--
 .../codeeditor/assets/vendor/emmet/emmet.js   | 259 +++++++++---------
 3 files changed, 176 insertions(+), 160 deletions(-)

diff --git a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
index 70299753f..d19228864 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
@@ -338,6 +338,24 @@
         this.editor.focus()
     }
 
+    // FIX EMMET HTML WHEN SYNTAX IS TWIG
+    // ==================================
+
+    +function (exports) {
+        if (exports.ace && typeof exports.ace.require == 'function') {
+            var emmetExt = exports.ace.require('ace/ext/emmet')
+
+            if (emmetExt && emmetExt.AceEmmetEditor && emmetExt.AceEmmetEditor.prototype.getSyntax) {
+                var coreGetSyntax = emmetExt.AceEmmetEditor.prototype.getSyntax
+
+                emmetExt.AceEmmetEditor.prototype.getSyntax = function () {
+                    var $syntax = $.proxy(coreGetSyntax, this)()
+                    return $syntax == 'twig' ? 'html' : $syntax
+                };
+            }
+        }
+    }(window)
+
     // CODEEDITOR PLUGIN DEFINITION
     // ============================
 
diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js
index 5616386bf..1f463a7ac 100755
--- a/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js
+++ b/modules/backend/formwidgets/codeeditor/assets/vendor/ace/ext-emmet.js
@@ -16,7 +16,7 @@ var SnippetManager = function() {
 
 (function() {
     oop.implement(this, EventEmitter);
-    
+
     this.getTokenizer = function() {
         function TabstopToken(str, _, stack) {
             str = str.substr(1);
@@ -239,7 +239,7 @@ var SnippetManager = function() {
         var line = editor.session.getLine(cursor.row);
         var tabString = editor.session.getTabString();
         var indentString = line.match(/^\s*/)[0];
-        
+
         if (cursor.column < indentString.length)
             indentString = indentString.slice(0, cursor.column);
 
@@ -271,7 +271,7 @@ var SnippetManager = function() {
                 return;
 
             var value = tokens.slice(i + 1, i1);
-            var isNested = value.some(function(t) {return typeof t === "object"});          
+            var isNested = value.some(function(t) {return typeof t === "object"});
             if (isNested && !ts.value) {
                 ts.value = value;
             } else if (value.length && (!ts.value || typeof ts.value !== "string")) {
@@ -305,7 +305,7 @@ var SnippetManager = function() {
                     expanding[id] = null;
                 continue;
             }
-            
+
             var ts = tabstops[id];
             var arg = typeof ts.value == "string" ? [ts.value] : copyValue(ts.value);
             arg.unshift(i + 1, Math.max(0, i1 - i));
@@ -340,16 +340,16 @@ var SnippetManager = function() {
         var selectionId = editor.inVirtualSelectionMode && editor.selection.index;
         tabstopManager.addTabstops(tabstops, range.start, end, selectionId);
     };
-    
+
     this.insertSnippet = function(editor, snippetText) {
         var self = this;
         if (editor.inVirtualSelectionMode)
             return self.insertSnippetForSelection(editor, snippetText);
-        
+
         editor.forEachSelection(function() {
             self.insertSnippetForSelection(editor, snippetText);
         }, null, {keepOrder: true});
-        
+
         if (editor.tabstopManager)
             editor.tabstopManager.tabNext();
     };
@@ -358,7 +358,7 @@ var SnippetManager = function() {
         var scope = editor.session.$mode.$id || "";
         scope = scope.split("/").pop();
         if (scope === "html" || scope === "php") {
-            if (scope === "php" && !editor.session.$mode.inlinePhp) 
+            if (scope === "php" && !editor.session.$mode.inlinePhp)
                 scope = "html";
             var c = editor.getCursorPosition();
             var state = editor.session.getState(c.row);
@@ -374,7 +374,7 @@ var SnippetManager = function() {
                     scope = "php";
             }
         }
-        
+
         return scope;
     };
 
@@ -398,7 +398,7 @@ var SnippetManager = function() {
             editor.tabstopManager.tabNext();
         return result;
     };
-    
+
     this.expandSnippetForSelection = function(editor, options) {
         var cursor = editor.getCursorPosition();
         var line = editor.session.getLine(cursor.row);
@@ -454,10 +454,10 @@ var SnippetManager = function() {
         var snippetMap = this.snippetMap;
         var snippetNameMap = this.snippetNameMap;
         var self = this;
-        
-        if (!snippets) 
+
+        if (!snippets)
             snippets = [];
-        
+
         function wrapRegexp(src) {
             if (src && !/^\^?\(.*\)\$?$|^\\b$/.test(src))
                 src = "(?:" + src + ")";
@@ -514,7 +514,7 @@ var SnippetManager = function() {
             addSnippet(snippets);
         else if (Array.isArray(snippets))
             snippets.forEach(addSnippet);
-        
+
         this._signal("registerSnippets", {scope: scope});
     };
     this.unregister = function(snippets, scope) {
@@ -731,9 +731,9 @@ var TabstopManager = function(editor) {
         ts = this.tabstops[this.index];
         if (!ts || !ts.length)
             return;
-        
+
         this.selectedTabstop = ts;
-        if (!this.editor.inVirtualSelectionMode) {        
+        if (!this.editor.inVirtualSelectionMode) {
             var sel = this.editor.multiSelect;
             sel.toSingleRange(ts.firstNonLinked.clone());
             for (var i = ts.length; i--;) {
@@ -746,7 +746,7 @@ var TabstopManager = function(editor) {
         } else {
             this.editor.selection.setRange(ts.firstNonLinked);
         }
-        
+
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
     };
     this.addTabstops = function(tabstops, start, end) {
@@ -765,7 +765,7 @@ var TabstopManager = function(editor) {
         var ranges = this.ranges;
         tabstops.forEach(function(ts, index) {
             var dest = this.$openTabstops[index] || ts;
-                
+
             for (var i = ts.length; i--;) {
                 var p = ts[i];
                 var range = Range.fromPoints(p.start, p.end || p.start);
@@ -792,7 +792,7 @@ var TabstopManager = function(editor) {
             }
             this.addTabstopMarkers(dest);
         }, this);
-        
+
         if (arg.length > 2) {
             if (this.tabstops.length)
                 arg.push(arg.splice(2, 1)[0]);
@@ -860,7 +860,7 @@ changeTracker.setPosition = function(row, column) {
 };
 changeTracker.update = function(pos, delta, $insertRight) {
     this.$insertRight = $insertRight;
-    this.pos = pos; 
+    this.pos = pos;
     this.onChange(delta);
 };
 
@@ -961,15 +961,15 @@ AceEmmetEditor.prototype = {
         if (end == null)
             end = start == null ? this.getContent().length : start;
         if (start == null)
-            start = 0;        
-        
+            start = 0;
+
         var editor = this.ace;
         var doc = editor.session.doc;
         var range = Range.fromPoints(doc.indexToPosition(start), doc.indexToPosition(end));
         editor.session.remove(range);
-        
+
         range.end = range.start;
-        
+
         value = this.$updateTabstops(value);
         snippetManager.insertSnippet(editor, value);
     },
@@ -1061,7 +1061,7 @@ AceEmmetEditor.prototype = {
         } else if (lastZero) {
             value = emmet.require('utils').replaceSubstring(value, '${0}', lastZero);
         }
-        
+
         return value;
     }
 };
@@ -1101,23 +1101,23 @@ exports.runEmmetCommand = function(editor) {
         if (editorProxy.getSyntax() == "php")
             return false;
         var actions = emmet.require("actions");
-    
+
         if (this.action == "expand_abbreviation_with_tab") {
             if (!editor.selection.isEmpty())
                 return false;
         }
-        
+
         if (this.action == "wrap_with_abbreviation") {
             return setTimeout(function() {
                 actions.run("wrap_with_abbreviation", editorProxy);
             }, 0);
         }
-        
+
         var pos = editor.selection.lead;
         var token = editor.session.getTokenAt(pos.row, pos.column);
         if (token && /\btag\b/.test(token.type))
             return false;
-        
+
         var result = actions.run(this.action, editorProxy);
     } catch(e) {
         editor._signal("changeStatus", typeof e == "string" ? e : e.message);
@@ -1187,4 +1187,3 @@ exports.setCore = function(e) {
                 (function() {
                     ace.require(["ace/ext/emmet"], function() {});
                 })();
-            
\ No newline at end of file
diff --git a/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js b/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js
index e67ec59d7..89260e50c 100644
--- a/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js
+++ b/modules/backend/formwidgets/codeeditor/assets/vendor/emmet/emmet.js
@@ -614,11 +614,11 @@ var _ = (function() {
     // Retrieve the names of an object's properties.
     // Delegates to **ECMAScript 5**'s native `Object.keys`
     _.keys = nativeKeys || function(obj) {
-        if (obj !== Object(obj)) throw new TypeError('Invalid object');
-        var keys = [];
-        for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
-        return keys;
-    };
+            if (obj !== Object(obj)) throw new TypeError('Invalid object');
+            var keys = [];
+            for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
+            return keys;
+        };
 
     // Retrieve the values of an object's properties.
     _.values = function(obj) {
@@ -788,8 +788,8 @@ var _ = (function() {
     // Is a given value an array?
     // Delegates to ECMA5's native Array.isArray
     _.isArray = nativeIsArray || function(obj) {
-        return toString.call(obj) == '[object Array]';
-    };
+            return toString.call(obj) == '[object Array]';
+        };
 
     // Is a given variable an object?
     _.isObject = function(obj) {
@@ -975,8 +975,8 @@ var _ = (function() {
         if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
 
         source = "var __p='';" +
-        "var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n" +
-        source + "return __p;\n";
+            "var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n" +
+            source + "return __p;\n";
 
         var render = new Function(settings.variable || 'obj', '_', source);
         if (data) return render(data, _);
@@ -987,7 +987,7 @@ var _ = (function() {
         // Provide the compiled function source as a convenience for build time
         // precompilation.
         template.source = 'function(' + (settings.variable || 'obj') + '){\n' +
-        source + '}';
+            source + '}';
 
         return template;
     };
@@ -1144,7 +1144,7 @@ var emmet = (function(global) {
     var moduleLoader = null;
 
     /**
-     * Generic Emmet module loader (actually, it doesn’t load anything, just
+     * Generic Emmet module loader (actually, it doesn’t load anything, just
      * returns module reference). Not using `require` name to avoid conflicts
      * with Node.js and RequireJS
      */
@@ -1395,7 +1395,7 @@ emmet.define('abbreviationParser', function(require, _) {
         },
 
         /**
-         * Removes current node from parent‘s child list
+         * Removes current node from parent‘s child list
          * @returns {AbbreviationNode} Current node itself
          */
         remove: function() {
@@ -1407,7 +1407,7 @@ emmet.define('abbreviationParser', function(require, _) {
         },
 
         /**
-         * Replaces current node in parent‘s children list with passed nodes
+         * Replaces current node in parent‘s children list with passed nodes
          * @param {AbbreviationNode} node Replacement node or array of nodes
          */
         replace: function() {
@@ -1572,7 +1572,7 @@ emmet.define('abbreviationParser', function(require, _) {
         },
 
         /**
-         * Returns index of current node in parent‘s children list
+         * Returns index of current node in parent‘s children list
          * @returns {Number}
          */
         index: function() {
@@ -1739,7 +1739,7 @@ emmet.define('abbreviationParser', function(require, _) {
 
     /**
      * Returns stripped string: a string without first and last character.
-     * Used for “unquoting” strings
+     * Used for “unquoting” strings
      * @param {String} str
      * @returns {String}
      */
@@ -2027,7 +2027,7 @@ emmet.define('abbreviationParser', function(require, _) {
     }
 
     /**
-     * “Un-rolls“ contents of current node: recursively replaces all repeating
+     * “Un-rolls“ contents of current node: recursively replaces all repeating
      * children with their repeated clones
      * @param {AbbreviationNode} node
      * @returns {AbbreviationNode}
@@ -2110,7 +2110,7 @@ emmet.define('abbreviationParser', function(require, _) {
             var tree = parseAbbreviation(abbr);
 
             if (options.contextNode) {
-                // add info about context node –
+                // add info about context node –
                 // a parent XHTML node in editor inside which abbreviation is 
                 // expanded
                 tree._name = options.contextNode.name;
@@ -2244,7 +2244,7 @@ emmet.exec(function(require, _) {
             if (_.isString(r)) {
                 child.data('resource', elements.create('snippet', r));
             } else if (elements.is(r, 'reference')) {
-                // it’s a reference to another abbreviation:
+                // it’s a reference to another abbreviation:
                 // parse it and insert instead of current child
                 /** @type AbbreviationNode */
                 var subtree = parser.parse(r.data, {
@@ -2264,7 +2264,7 @@ emmet.exec(function(require, _) {
                     });
                 }
 
-                // move child‘s children into the deepest child of new subtree
+                // move child‘s children into the deepest child of new subtree
                 var deepestChild = subtree.deepestChild();
                 if (deepestChild) {
                     _.each(child.children, function(c) {
@@ -2301,7 +2301,7 @@ emmet.exec(function(require, _) {
 });/**
  * Pasted content abbreviation processor. A pasted content is a content that
  * should be inserted into implicitly repeated abbreviation nodes.
- * This processor powers “Wrap With Abbreviation” action
+ * This processor powers “Wrap With Abbreviation” action
  * @param {Function} require
  * @param {Underscore} _
  */
@@ -2357,7 +2357,7 @@ emmet.exec(function(require, _) {
     }
 
     /**
-     * Check if parsed node contains output placeholder – a target where
+     * Check if parsed node contains output placeholder – a target where
      * pasted content should be inserted
      * @param {AbbreviationNode} node
      * @returns {Boolean}
@@ -4226,7 +4226,7 @@ emmet.define('handlerList', function(require, _) {
          * Adds function handler
          * @param {Function} fn Handler
          * @param {Object} options Handler options. Possible values are:<br><br>
-         * <b>order</b> : (<code>Number</code>) – order in handler list. Handlers
+         * <b>order</b> : (<code>Number</code>) – order in handler list. Handlers
          * with higher order value will be executed earlier.
          */
         add: function(fn, options) {
@@ -4527,8 +4527,8 @@ emmet.define('stringStream', function(require, _) {
         },
 
         /**
-         * Act like a multi-character <code>eat</code>—if <code>consume</code> is true or
-         * not given—or a look-ahead that doesn't update the stream position—if
+         * Act like a multi-character <code>eat</code>—if <code>consume</code> is true or
+         * not given—or a look-ahead that doesn't update the stream position—if
          * it is false. <code>pattern</code> can be either a string or a
          * regular expression starting with ^. When it is a string,
          * <code>caseInsensitive</code> can be set to true to make the match
@@ -4883,7 +4883,6 @@ emmet.define('resources', function(require, _) {
                     sectionKey = section['extends'];
                 } while (sectionKey && !_.include(memo, sectionKey));
 
-
                 cache[cacheKey] = _.extend.apply(_, stack.reverse());
             }
 
@@ -4900,15 +4899,15 @@ emmet.define('actions', function(require, _, zc) {
     var actions = {};
 
     /**
-     * “Humanizes” action name, makes it more readable for people
+     * “Humanizes” action name, makes it more readable for people
      * @param {String} name Action name (like 'expand_abbreviation')
      * @return Humanized name (like 'Expand Abbreviation')
      */
     function humanizeActionName(name) {
         return require('utils').trim(name.charAt(0).toUpperCase()
-        + name.substring(1).replace(/_[a-z]/g, function(str) {
-            return ' ' + str.charAt(1).toUpperCase();
-        }));
+            + name.substring(1).replace(/_[a-z]/g, function(str) {
+                return ' ' + str.charAt(1).toUpperCase();
+            }));
     }
 
     return {
@@ -4917,9 +4916,9 @@ emmet.define('actions', function(require, _, zc) {
          * @param {String} name Action name
          * @param {Function} fn Action function
          * @param {Object} options Custom action options:<br>
-         * <b>label</b> : (<code>String</code>) – Human-readable action name.
+         * <b>label</b> : (<code>String</code>) – Human-readable action name.
          * May contain '/' symbols as submenu separators<br>
-         * <b>hidden</b> : (<code>Boolean</code>) – Indicates whether action
+         * <b>hidden</b> : (<code>Boolean</code>) – Indicates whether action
          * should be displayed in menu (<code>getMenu()</code> method)
          *
          * @memberOf actions
@@ -5575,7 +5574,7 @@ emmet.define('actionUtils', function(require, _) {
         },
 
         /**
-         * Common syntax detection method for editors that doesn’t provide any
+         * Common syntax detection method for editors that doesn’t provide any
          * info about current syntax scope.
          * @param {IEmmetEditor} editor Current editor
          * @param {String} hint Any syntax hint that editor can provide
@@ -5882,7 +5881,7 @@ emmet.define('base64', function(require, _) {
 });/**
  * HTML matcher: takes string and searches for HTML tag pairs for given position
  *
- * Unlike “classic” matchers, it parses content from the specified
+ * Unlike “classic” matchers, it parses content from the specified
  * position, not from the start, so it may work even outside HTML documents
  * (for example, inside strings of programming languages like JavaScript, Python
  * etc.)
@@ -6234,23 +6233,23 @@ emmet.define('tabStops', function(require, _) {
          * @param {String} text Text to process
          * @param {Object} options List of processor options:<br>
          *
-         * <b>replaceCarets</b> : <code>Boolean</code> — replace all default
+         * <b>replaceCarets</b> : <code>Boolean</code> — replace all default
          * caret placeholders (like <i>{%::emmet-caret::%}</i>) with <i>${0:caret}</i><br>
          *
-         * <b>escape</b> : <code>Function</code> — function that handle escaped
+         * <b>escape</b> : <code>Function</code> — function that handle escaped
          * characters (mostly '$'). By default, it returns the character itself
          * to be displayed as is in output, but sometimes you will use
          * <code>extract</code> method as intermediate solution for further
          * processing and want to keep character escaped. Thus, you should override
          * <code>escape</code> method to return escaped symbol (e.g. '\\$')<br>
          *
-         * <b>tabstop</b> : <code>Function</code> – a tabstop handler. Receives
-         * a single argument – an object describing token: its position, number
+         * <b>tabstop</b> : <code>Function</code> – a tabstop handler. Receives
+         * a single argument – an object describing token: its position, number
          * group, placeholder and token itself. Should return a replacement
          * string that will appear in final output
          *
-         * <b>variable</b> : <code>Function</code> – variable handler. Receives
-         * a single argument – an object describing token: its position, name
+         * <b>variable</b> : <code>Function</code> – variable handler. Receives
+         * a single argument – an object describing token: its position, name
          * and original token itself. Should return a replacement
          * string that will appear in final output
          *
@@ -6439,7 +6438,7 @@ emmet.define('tabStops', function(require, _) {
             var placeholderMemo = {};
             var res = require('resources');
             return function(str, varName) {
-                // do not mark `child` variable as placeholder – it‘s a reserved
+                // do not mark `child` variable as placeholder – it‘s a reserved
                 // variable name
                 if (varName == 'child')
                     return str;
@@ -6938,13 +6937,13 @@ emmet.define('elements', function(require, _) {
     return result;
 });/**
  * Abstract implementation of edit tree interface.
- * Edit tree is a named container of editable “name-value” child elements,
+ * Edit tree is a named container of editable “name-value” child elements,
  * parsed from <code>source</code>. This container provides convenient methods
  * for editing/adding/removing child elements. All these update actions are
  * instantly reflected in the <code>source</code> code with respect of formatting.
  * <br><br>
  * For example, developer can create an edit tree from CSS rule and add or
- * remove properties from it–all changes will be immediately reflected in the
+ * remove properties from it–all changes will be immediately reflected in the
  * original source.
  * <br><br>
  * All classes defined in this module should be extended the same way as in
@@ -7114,7 +7113,7 @@ emmet.define('editTree', function(require, _, core) {
                 return element.value(value);
 
             if (!_.isUndefined(value)) {
-                // no such element — create it
+                // no such element — create it
                 return this.add(name, value, pos);
             }
         },
@@ -7479,7 +7478,7 @@ emmet.define('cssEditTree', function(require, _) {
             if (token.type == '}' || token.type == ';') {
                 // found value end
                 trimWhitespaceTokens(tokens, WHITESPACE_REMOVE_FROM_START
-                | (token.type == '}' ? WHITESPACE_REMOVE_FROM_END : 0));
+                    | (token.type == '}' ? WHITESPACE_REMOVE_FROM_END : 0));
 
                 if (tokens.length) {
                     start = tokens[0].start;
@@ -7634,7 +7633,7 @@ emmet.define('cssEditTree', function(require, _) {
                 // characters between rules may lead to undesired behavior,
                 // especially when current rule is duplicated or used as a donor
                 // to create new rule.
-                // To solve this issue, we‘ll take only last newline indentation
+                // To solve this issue, we‘ll take only last newline indentation
                 var lines = utils.splitByLines(p.styleBefore);
                 if (lines.length > 1) {
                     p.styleBefore = '\n' + _.last(lines);
@@ -7982,7 +7981,7 @@ emmet.define('xmlEditTree', function(require, _) {
             var attribute = new XMLEditElement(this,
                 editTree.createToken(start + styles.styleBefore.length, name),
                 editTree.createToken(start + styles.styleBefore.length + name.length
-                + styles.styleSeparator.length, value)
+                    + styles.styleSeparator.length, value)
             );
 
             _.extend(attribute, styles);
@@ -8350,7 +8349,7 @@ emmet.define('wrapWithAbbreviation', function(require, _) {
 });/**
  * Toggles HTML and CSS comments depending on current caret context. Unlike
  * the same action in most editors, this action toggles comment on currently
- * matched item—HTML tag or CSS selector—when nothing is selected.
+ * matched item—HTML tag or CSS selector—when nothing is selected.
  *
  * @param {Function} require
  * @param {Underscore} _
@@ -8424,7 +8423,7 @@ emmet.exec(function(require, _) {
         return _.find(rule.list(), function(item) {
             if (item.range().end === relPos) {
                 // at the end of property, but outside of it
-                // if there’s a space character at current position,
+                // if there’s a space character at current position,
                 // use current property
                 return reSafeChar.test(rule.source.charAt(relPos));
             }
@@ -8514,9 +8513,9 @@ emmet.exec(function(require, _) {
             // should add comment
             // make sure that there's no comment inside selection
             newContent = commentStart + ' ' +
-            range.substring(content)
-                .replace(new RegExp(utils.escapeForRegexp(commentStart) + '\\s*|\\s*' + utils.escapeForRegexp(commentEnd), 'g'), '') +
-            ' ' + commentEnd;
+                range.substring(content)
+                    .replace(new RegExp(utils.escapeForRegexp(commentStart) + '\\s*|\\s*' + utils.escapeForRegexp(commentEnd), 'g'), '') +
+                ' ' + commentEnd;
 
             // adjust caret position
             caretPos += commentStart.length + 1;
@@ -8569,7 +8568,7 @@ emmet.exec(function(require, _) {
     /**
      * Search for new caret insertion point
      * @param {IEmmetEditor} editor Editor instance
-     * @param {Number} inc Search increment: -1 — search left, 1 — search right
+     * @param {Number} inc Search increment: -1 — search left, 1 — search right
      * @param {Number} offset Initial offset relative to current caret position
      * @return {Number} Returns -1 if insertion point wasn't found
      */
@@ -8949,9 +8948,9 @@ emmet.exec(function(require, _) {
 
         // locate parts of complex values.
         // some examples:
-        // – 1px solid red: 3 parts
-        // – arial, sans-serif: enumeration, 2 parts
-        // – url(image.png): function value part
+        // – 1px solid red: 3 parts
+        // – arial, sans-serif: enumeration, 2 parts
+        // – url(image.png): function value part
         var value = property.value();
         _.each(property.valueParts(), function(r) {
             // add absolute range
@@ -9277,8 +9276,8 @@ emmet.exec(function(require, _) {
 });
 /**
  * Splits or joins tag, e.g. transforms it into a short notation and vice versa:<br>
- * &lt;div&gt;&lt;/div&gt; → &lt;div /&gt; : join<br>
- * &lt;div /&gt; → &lt;div&gt;&lt;/div&gt; : split
+ * &lt;div&gt;&lt;/div&gt; → &lt;div /&gt; : join<br>
+ * &lt;div /&gt; → &lt;div&gt;&lt;/div&gt; : split
  * @param {Function} require
  * @param {Underscore} _
  * @memberOf __splitJoinTagAction
@@ -9435,7 +9434,7 @@ emmet.define('reflectCSSValue', function(require, _) {
      * Returns value that should be reflected for <code>refName</code> CSS property
      * from <code>curName</code> property. This function is used for special cases,
      * when the same result must be achieved with different properties for different
-     * browsers. For example: opаcity:0.5; → filter:alpha(opacity=50);<br><br>
+     * browsers. For example: opаcity:0.5; → filter:alpha(opacity=50);<br><br>
      *
      * This function does value conversion between different CSS properties
      *
@@ -9629,10 +9628,10 @@ emmet.exec(function(require, _) {
     prefs.define('css.closeBraceIndentation', '\n',
         'Indentation before closing brace of CSS rule. Some users prefere '
         + 'indented closing brace of CSS rule for better readability. '
-        + 'This preference’s value will be automatically inserted before '
+        + 'This preference’s value will be automatically inserted before '
         + 'closing brace when user adds newline in newly created CSS rule '
-        + '(e.g. when “Insert formatted linebreak” action will be performed '
-        + 'in CSS file). If you’re such user, you may want to write put a value '
+        + '(e.g. when “Insert formatted linebreak” action will be performed '
+        + 'in CSS file). If you’re such user, you may want to write put a value '
         + 'like <code>\\n\\t</code> in this preference.');
 
     /**
@@ -9872,7 +9871,7 @@ emmet.exec(function(require, _) {
             }
 
             b64 = 'data:' + (actionUtils.mimeTypes[String(file.getExt(realImgPath))] || defaultMimeType) +
-            ';base64,' + b64;
+                ';base64,' + b64;
 
             editor.replaceContent('$0' + b64, pos, pos + imgPath.length);
         });
@@ -10002,7 +10001,7 @@ emmet.exec(function(require, _) {
     }
 
     require('actions').add('update_image_size', function(editor) {
-        // this action will definitely won’t work in SASS dialect,
+        // this action will definitely won’t work in SASS dialect,
         // but may work in SCSS or LESS
         if (_.include(['css', 'less', 'scss'], String(editor.getSyntax()))) {
             updateImageSizeCSS(editor);
@@ -10134,23 +10133,23 @@ emmet.define('cssResolver', function(require, _) {
         'Automatically generate vendor-prefixed copies of expanded CSS '
         + 'property. By default, Emmet will generate vendor-prefixed '
         + 'properties only when you put dash before abbreviation '
-        + '(e.g. <code>-bxsh</code>). With this option enabled, you don’t '
+        + '(e.g. <code>-bxsh</code>). With this option enabled, you don’t '
         + 'need dashes before abbreviations: Emmet will produce '
         + 'vendor-prefixed properties for you.');
 
     var descTemplate = _.template('A comma-separated list of CSS properties that may have '
-    + '<code><%= vendor %></code> vendor prefix. This list is used to generate '
-    + 'a list of prefixed properties when expanding <code>-property</code> '
-    + 'abbreviations. Empty list means that all possible CSS values may '
-    + 'have <code><%= vendor %></code> prefix.');
+        + '<code><%= vendor %></code> vendor prefix. This list is used to generate '
+        + 'a list of prefixed properties when expanding <code>-property</code> '
+        + 'abbreviations. Empty list means that all possible CSS values may '
+        + 'have <code><%= vendor %></code> prefix.');
 
     var descAddonTemplate = _.template('A comma-separated list of <em>additional</em> CSS properties '
-    + 'for <code>css.<%= vendor %>Preperties</code> preference. '
-    + 'You should use this list if you want to add or remove a few CSS '
-    + 'properties to original set. To add a new property, simply write its name, '
-    + 'to remove it, precede property with hyphen.<br>'
-    + 'For example, to add <em>foo</em> property and remove <em>border-radius</em> one, '
-    + 'the preference value will look like this: <code>foo, -border-radius</code>.');
+        + 'for <code>css.<%= vendor %>Preperties</code> preference. '
+        + 'You should use this list if you want to add or remove a few CSS '
+        + 'properties to original set. To add a new property, simply write its name, '
+        + 'to remove it, precede property with hyphen.<br>'
+        + 'For example, to add <em>foo</em> property and remove <em>border-radius</em> one, '
+        + 'the preference value will look like this: <code>foo, -border-radius</code>.');
 
     // properties list is created from cssFeatures.html file
     var props = {
@@ -10166,7 +10165,7 @@ emmet.define('cssResolver', function(require, _) {
     });
 
     prefs.define('css.unitlessProperties', 'z-index, line-height, opacity, font-weight, zoom',
-        'The list of properties whose values ​​must not contain units.');
+        'The list of properties whose values ​​must not contain units.');
 
     prefs.define('css.intUnit', 'px', 'Default unit for integer values');
     prefs.define('css.floatUnit', 'em', 'Default unit for float values');
@@ -10391,8 +10390,8 @@ emmet.define('cssResolver', function(require, _) {
     function formatProperty(property, syntax) {
         var ix = property.indexOf(':');
         property = property.substring(0, ix).replace(/\s+$/, '')
-        + getSyntaxPreference('valueSeparator', syntax)
-        + require('utils').trim(property.substring(ix + 1));
+            + getSyntaxPreference('valueSeparator', syntax)
+            + require('utils').trim(property.substring(ix + 1));
 
         return property.replace(/\s*;\s*$/, getSyntaxPreference('propertyEnd', syntax));
     }
@@ -10776,7 +10775,7 @@ emmet.define('cssResolver', function(require, _) {
             }
 
             if (!snippet && prefs.get('css.fuzzySearch')) {
-                // let’s try fuzzy search
+                // let’s try fuzzy search
                 snippet = resources.fuzzyFindSnippet(syntax, abbrData.property, parseFloat(prefs.get('css.fuzzySearchMinScore')));
             }
 
@@ -10794,8 +10793,8 @@ emmet.define('cssResolver', function(require, _) {
             var result = [];
             if (!value && abbrData.values) {
                 value = _.map(abbrData.values, function(val) {
-                    return this.normalizeValue(val, snippetObj.name);
-                }, this).join(' ') + ';';
+                        return this.normalizeValue(val, snippetObj.name);
+                    }, this).join(' ') + ';';
             }
 
             snippetObj.value = value || snippetObj.value;
@@ -11085,7 +11084,7 @@ emmet.define('cssGradient', function(require, _) {
         direction = textualDirection(direction);
 
         if(reDeg.test(direction))
-            throw "The direction is an angle that can’t be converted.";
+            throw "The direction is an angle that can’t be converted.";
 
         var v = function(pos) {
             return ~direction.indexOf(pos) ? '100%' : '0';
@@ -11330,7 +11329,7 @@ emmet.define('cssGradient', function(require, _) {
             cssProp = cssRule.itemFromPosition(pos, true);
             if (!cssProp) {
                 // in case user just started writing CSS property
-                // and didn't include semicolon–try another approach
+                // and didn't include semicolon–try another approach
                 cssProp = _.find(cssRule.list(), function(elem) {
                     return elem.range(true).end == pos;
                 });
@@ -11672,7 +11671,7 @@ emmet.define('tagName', function(require, _) {
         },
 
         /**
-         * Adds new parent–child mapping
+         * Adds new parent–child mapping
          * @param {String} parent
          * @param {String} child
          */
@@ -11735,11 +11734,11 @@ emmet.define('tagName', function(require, _) {
  */
 emmet.exec(function(require, _) {
     var prefs = require('preferences');
-    prefs.define('bem.elementSeparator', '__', 'Class name’s element separator.');
-    prefs.define('bem.modifierSeparator', '_', 'Class name’s modifier separator.');
+    prefs.define('bem.elementSeparator', '__', 'Class name’s element separator.');
+    prefs.define('bem.modifierSeparator', '_', 'Class name’s modifier separator.');
     prefs.define('bem.shortElementPrefix', '-',
-        'Symbol for describing short “block-element” notation. Class names '
-        + 'prefixed with this symbol will be treated as element name for parent‘s '
+        'Symbol for describing short “block-element” notation. Class names '
+        + 'prefixed with this symbol will be treated as element name for parent‘s '
         + 'block name. Each symbol instance traverses one level up in parsed '
         + 'tree for block name lookup. Empty value will disable short notation.');
 
@@ -11778,8 +11777,8 @@ emmet.exec(function(require, _) {
         if (!item.__bem.block) {
             reBlockName = /^[a-z]/i;
             item.__bem.block = _.find(classNames, function(name) {
-                return reBlockName.test(name);
-            }) || '';
+                    return reBlockName.test(name);
+                }) || '';
         }
 
         classNames = _.chain(classNames)
@@ -11937,16 +11936,16 @@ emmet.exec(function(require, _) {
      * It does several things:<br>
      * <ul>
      * <li>Expands complex class name (according to BEM symbol semantics):
-     * .block__elem_modifier → .block.block__elem.block__elem_modifier
+     * .block__elem_modifier → .block.block__elem.block__elem_modifier
      * </li>
      * <li>Inherits block name on child elements:
-     * .b-block > .__el > .__el → .b-block > .b-block__el > .b-block__el__el
+     * .b-block > .__el > .__el → .b-block > .b-block__el > .b-block__el__el
      * </li>
      * <li>Treats first dash symbol as '__'</li>
-     * <li>Double underscore (or typographic '–') is also treated as an element
-     * level lookup, e.g. ____el will search for element definition in parent’s
+     * <li>Double underscore (or typographic '–') is also treated as an element
+     * level lookup, e.g. ____el will search for element definition in parent’s
      * parent element:
-     * .b-block > .__el1 > .____el2 → .b-block > .b-block__el1 > .b-block__el2
+     * .b-block > .__el1 > .____el2 → .b-block > .b-block__el1 > .b-block__el2
      * </li>
      * </ul>
      *
@@ -12003,16 +12002,16 @@ emmet.exec(function(require, _) {
         + 'the following properties and functions are availabe:\n'
         + '<ul>'
 
-        + '<li><code>attr(name, before, after)</code> – a function that outputs'
+        + '<li><code>attr(name, before, after)</code> – a function that outputs'
         + 'specified attribute value concatenated with <code>before</code> '
         + 'and <code>after</code> strings. If attribute doesn\'t exists, the '
         + 'empty string will be returned.</li>'
 
-        + '<li><code>node</code> – current node (instance of <code>AbbreviationNode</code>)</li>'
+        + '<li><code>node</code> – current node (instance of <code>AbbreviationNode</code>)</li>'
 
-        + '<li><code>name</code> – name of current tag</li>'
+        + '<li><code>name</code> – name of current tag</li>'
 
-        + '<li><code>padding</code> – current string padding, can be used '
+        + '<li><code>padding</code> – current string padding, can be used '
         + 'for formatting</li>'
 
         +'</ul>');
@@ -12223,7 +12222,7 @@ emmet.exec(function(require, _){
     function processSnippet(item, profile, level) {
         item.start = item.end = '';
         if (!isVeryFirstChild(item) && profile.tag_nl !== false && shouldAddLineBreak(item, profile)) {
-            // check if we’re not inside inline element
+            // check if we’re not inside inline element
             if (isRoot(item.parent) || !require('abbreviationUtils').isInline(item.parent)) {
                 item.start = require('utils').getNewline() + item.start;
             }
@@ -12658,11 +12657,11 @@ emmet.exec(function(require, _) {
  * https://code.djangoproject.com/browser/django/trunk/django/contrib/webdesign/lorem_ipsum.py
  * <br><br>
  * Examples to test:<br>
- * <code>lipsum</code> – generates 30 words text.<br>
- * <code>lipsum*6</code> – generates 6 paragraphs (autowrapped with &lt;p&gt; element) of text.<br>
- * <code>ol>lipsum10*5</code> — generates ordered list with 5 list items (autowrapped with &lt;li&gt; tag)
+ * <code>lipsum</code> – generates 30 words text.<br>
+ * <code>lipsum*6</code> – generates 6 paragraphs (autowrapped with &lt;p&gt; element) of text.<br>
+ * <code>ol>lipsum10*5</code> — generates ordered list with 5 list items (autowrapped with &lt;li&gt; tag)
  * with text of 10 words on each line<br>
- * <code>span*3>lipsum20</code> – generates 3 paragraphs of 20-words text, each wrapped with &lt;span&gt; element .
+ * <code>span*3>lipsum20</code> – generates 3 paragraphs of 20-words text, each wrapped with &lt;span&gt; element .
  * Each paragraph phrase is unique
  * @param {Function} require
  * @param {Underscore} _
@@ -12704,33 +12703,33 @@ emmet.define('lorem', function(require, _) {
                 'maxime', 'corrupti']
         },
         ru: {
-            common: ['далеко-далеко', 'за', 'словесными', 'горами', 'в стране', 'гласных', 'и согласных', 'живут', 'рыбные', 'тексты'],
-            words: ['вдали', 'от всех', 'они', 'буквенных', 'домах', 'на берегу', 'семантика',
-                'большого', 'языкового', 'океана', 'маленький', 'ручеек', 'даль',
-                'журчит', 'по всей', 'обеспечивает', 'ее','всеми', 'необходимыми',
-                'правилами', 'эта', 'парадигматическая', 'страна', 'которой', 'жаренные',
-                'предложения', 'залетают', 'прямо', 'рот', 'даже', 'всемогущая',
-                'пунктуация', 'не', 'имеет', 'власти', 'над', 'рыбными', 'текстами',
-                'ведущими', 'безорфографичный', 'образ', 'жизни', 'однажды', 'одна',
-                'маленькая', 'строчка','рыбного', 'текста', 'имени', 'lorem', 'ipsum',
-                'решила', 'выйти', 'большой', 'мир', 'грамматики', 'великий', 'оксмокс',
-                'предупреждал', 'о', 'злых', 'запятых', 'диких', 'знаках', 'вопроса',
-                'коварных', 'точках', 'запятой', 'но', 'текст', 'дал', 'сбить',
-                'себя', 'толку', 'он', 'собрал', 'семь', 'своих', 'заглавных', 'букв',
-                'подпоясал', 'инициал', 'за', 'пояс', 'пустился', 'дорогу',
-                'взобравшись', 'первую', 'вершину', 'курсивных', 'гор', 'бросил',
-                'последний', 'взгляд', 'назад', 'силуэт', 'своего', 'родного', 'города',
-                'буквоград', 'заголовок', 'деревни', 'алфавит', 'подзаголовок', 'своего',
-                'переулка', 'грустный', 'реторический', 'вопрос', 'скатился', 'его',
-                'щеке', 'продолжил', 'свой', 'путь', 'дороге', 'встретил', 'рукопись',
-                'она', 'предупредила',  'моей', 'все', 'переписывается', 'несколько',
-                'раз', 'единственное', 'что', 'меня', 'осталось', 'это', 'приставка',
-                'возвращайся', 'ты', 'лучше', 'свою', 'безопасную', 'страну', 'послушавшись',
-                'рукописи', 'наш', 'продолжил', 'свой', 'путь', 'вскоре', 'ему',
-                'повстречался', 'коварный', 'составитель', 'рекламных', 'текстов',
-                'напоивший', 'языком', 'речью', 'заманивший', 'свое', 'агенство',
-                'которое', 'использовало', 'снова', 'снова', 'своих', 'проектах',
-                'если', 'переписали', 'то', 'живет', 'там', 'до', 'сих', 'пор']
+            common: ['далеко-далеко', 'за', 'словесными', 'горами', 'в стране', 'гласных', 'и согласных', 'живут', 'рыбные', 'тексты'],
+            words: ['вдали', 'от всех', 'они', 'буквенных', 'домах', 'на берегу', 'семантика',
+                'большого', 'языкового', 'океана', 'маленький', 'ручеек', 'даль',
+                'журчит', 'по всей', 'обеспечивает', 'ее','всеми', 'необходимыми',
+                'правилами', 'эта', 'парадигматическая', 'страна', 'которой', 'жаренные',
+                'предложения', 'залетают', 'прямо', 'рот', 'даже', 'всемогущая',
+                'пунктуация', 'не', 'имеет', 'власти', 'над', 'рыбными', 'текстами',
+                'ведущими', 'безорфографичный', 'образ', 'жизни', 'однажды', 'одна',
+                'маленькая', 'строчка','рыбного', 'текста', 'имени', 'lorem', 'ipsum',
+                'решила', 'выйти', 'большой', 'мир', 'грамматики', 'великий', 'оксмокс',
+                'предупреждал', 'о', 'злых', 'запятых', 'диких', 'знаках', 'вопроса',
+                'коварных', 'точках', 'запятой', 'но', 'текст', 'дал', 'сбить',
+                'себя', 'толку', 'он', 'собрал', 'семь', 'своих', 'заглавных', 'букв',
+                'подпоясал', 'инициал', 'за', 'пояс', 'пустился', 'дорогу',
+                'взобравшись', 'первую', 'вершину', 'курсивных', 'гор', 'бросил',
+                'последний', 'взгляд', 'назад', 'силуэт', 'своего', 'родного', 'города',
+                'буквоград', 'заголовок', 'деревни', 'алфавит', 'подзаголовок', 'своего',
+                'переулка', 'грустный', 'реторический', 'вопрос', 'скатился', 'его',
+                'щеке', 'продолжил', 'свой', 'путь', 'дороге', 'встретил', 'рукопись',
+                'она', 'предупредила',  'моей', 'все', 'переписывается', 'несколько',
+                'раз', 'единственное', 'что', 'меня', 'осталось', 'это', 'приставка',
+                'возвращайся', 'ты', 'лучше', 'свою', 'безопасную', 'страну', 'послушавшись',
+                'рукописи', 'наш', 'продолжил', 'свой', 'путь', 'вскоре', 'ему',
+                'повстречался', 'коварный', 'составитель', 'рекламных', 'текстов',
+                'напоивший', 'языком', 'речью', 'заманивший', 'свое', 'агенство',
+                'которое', 'использовало', 'снова', 'снова', 'своих', 'проектах',
+                'если', 'переписали', 'то', 'живет', 'там', 'до', 'сих', 'пор']
         }
     };
 

From d6356ac73336a646d217cfd6c773d6097b343c1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Gaulin?= <jeremy@bnb.re>
Date: Wed, 26 Aug 2015 22:59:31 +0200
Subject: [PATCH 002/103] Fix Swedish language code reference 'se' to 'sv' to
 reflect ISO code like in folder structure.

---
 modules/backend/models/BackendPreferences.php            | 2 +-
 modules/system/assets/js/lang/lang.hu.js                 | 2 +-
 modules/system/assets/js/lang/{lang.se.js => lang.sv.js} | 6 +++---
 modules/system/lang/de/lang.php                          | 2 +-
 modules/system/lang/el/lang.php                          | 2 +-
 modules/system/lang/en/lang.php                          | 2 +-
 modules/system/lang/es-ar/lang.php                       | 2 +-
 modules/system/lang/es/lang.php                          | 2 +-
 modules/system/lang/fa/lang.php                          | 2 +-
 modules/system/lang/fr/lang.php                          | 2 +-
 modules/system/lang/hu/lang.php                          | 2 +-
 modules/system/lang/id/lang.php                          | 2 +-
 modules/system/lang/it/lang.php                          | 2 +-
 modules/system/lang/ja/lang.php                          | 2 +-
 modules/system/lang/lv/lang.php                          | 2 +-
 modules/system/lang/nb-no/lang.php                       | 2 +-
 modules/system/lang/nl/lang.php                          | 2 +-
 modules/system/lang/pl/lang.php                          | 2 +-
 modules/system/lang/pt-br/lang.php                       | 2 +-
 modules/system/lang/ru/lang.php                          | 2 +-
 modules/system/lang/sv/lang.php                          | 2 +-
 modules/system/lang/tr/lang.php                          | 2 +-
 modules/system/lang/zh-cn/lang.php                       | 2 +-
 modules/system/lang/zh-tw/lang.php                       | 2 +-
 24 files changed, 26 insertions(+), 26 deletions(-)
 rename modules/system/assets/js/lang/{lang.se.js => lang.sv.js} (88%)

diff --git a/modules/backend/models/BackendPreferences.php b/modules/backend/models/BackendPreferences.php
index be0d078ad..ead2502ff 100644
--- a/modules/backend/models/BackendPreferences.php
+++ b/modules/backend/models/BackendPreferences.php
@@ -51,7 +51,7 @@ class BackendPreferences extends Model
             'pt-br' => [Lang::get('system::lang.locale.pt-br'), 'flag-br'],
             'ro' => [Lang::get('system::lang.locale.ro'), 'flag-ro'],
             'ru' => [Lang::get('system::lang.locale.ru'), 'flag-ru'],
-            'se' => [Lang::get('system::lang.locale.se'), 'flag-se'],
+            'sv' => [Lang::get('system::lang.locale.sv'), 'flag-se'],
             'tr' => [Lang::get('system::lang.locale.tr'), 'flag-tr'],
             'pl' => [Lang::get('system::lang.locale.pl'), 'flag-pl'],
             'sk' => [Lang::get('system::lang.locale.sk'), 'flag-sk'],
diff --git a/modules/system/assets/js/lang/lang.hu.js b/modules/system/assets/js/lang/lang.hu.js
index aafe3d0bd..6899a1ca5 100644
--- a/modules/system/assets/js/lang/lang.hu.js
+++ b/modules/system/assets/js/lang/lang.hu.js
@@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
 $.oc.langMessages['hu'] = $.extend(
     $.oc.langMessages['hu'] || {},
-    {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel"}}
+    {"markdowneditor":{"formatting":"Forr\u00e1sk\u00f3d","quote":"Id\u00e9zet","code":"K\u00f3d","header1":"F\u0151c\u00edm 1","header2":"F\u0151c\u00edm 2","header3":"F\u0151c\u00edm 3","header4":"F\u0151c\u00edm 4","header5":"F\u0151c\u00edm 5","header6":"F\u0151c\u00edm 6","bold":"F\u00e9lk\u00f6v\u00e9r","italic":"D\u00f6lt","unorderedlist":"Rendezett lista","orderedlist":"Sz\u00e1mozott lista","video":"Vide\u00f3","image":"K\u00e9p","link":"Hivatkoz\u00e1s","horizontalrule":"Vonal besz\u00far\u00e1sa","fullscreen":"Teljes k\u00e9perny\u0151","preview":"El\u0151n\u00e9zet"},"mediamanager":{"insert_link":"Hivatkoz\u00e1s besz\u00far\u00e1sa","insert_image":"K\u00e9p besz\u00far\u00e1sa","insert_video":"Vide\u00f3 besz\u00far\u00e1sa","insert_audio":"Audi\u00f3 besz\u00far\u00e1sa","invalid_file_empty_insert":"Hivatkoz\u00e1s k\u00e9sz\u00edt\u00e9s\u00e9hez jel\u00f6lj\u00f6n ki egy sz\u00f6vegr\u00e9szt.","invalid_file_single_insert":"K\u00e9rj\u00fck jel\u00f6lj\u00f6n ki egy f\u00e1jlt.","invalid_image_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy k\u00e9pet a besz\u00far\u00e1shoz.","invalid_video_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy vide\u00f3t a besz\u00far\u00e1shoz.","invalid_audio_empty_insert":"V\u00e1lasszon ki legal\u00e1bb egy audi\u00f3t a besz\u00far\u00e1shoz."},"alert":{"confirm_button_text":"OK","cancel_button_text":"M\u00e9gsem"}}
 );
\ No newline at end of file
diff --git a/modules/system/assets/js/lang/lang.se.js b/modules/system/assets/js/lang/lang.sv.js
similarity index 88%
rename from modules/system/assets/js/lang/lang.se.js
rename to modules/system/assets/js/lang/lang.sv.js
index fee3911fd..6ebb84fa7 100644
--- a/modules/system/assets/js/lang/lang.se.js
+++ b/modules/system/assets/js/lang/lang.sv.js
@@ -1,9 +1,9 @@
 /*
- * This file has been compiled from: /modules/system/lang/se/client.php
+ * This file has been compiled from: /modules/system/lang/sv/client.php
  */
 if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
-$.oc.langMessages['se'] = $.extend(
-    $.oc.langMessages['se'] || {},
+$.oc.langMessages['sv'] = $.extend(
+    $.oc.langMessages['sv'] || {},
     {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel"}}
 );
\ No newline at end of file
diff --git a/modules/system/lang/de/lang.php b/modules/system/lang/de/lang.php
index b695f051c..67e3c77ca 100644
--- a/modules/system/lang/de/lang.php
+++ b/modules/system/lang/de/lang.php
@@ -9,7 +9,7 @@ return [
         'en' => 'English',
         'nl' => 'Dutch',
         'ja' => 'Japanese',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'tr' => 'Turkish',
         'de' => 'German',
         'ru' => 'Russian',
diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php
index 3fb01307b..562f81701 100644
--- a/modules/system/lang/el/lang.php
+++ b/modules/system/lang/el/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Πορτογαλικά (Βραζιλία)',
         'ro' => 'Ρουμανικά',
         'ru' => 'Ρωσικά',
-        'se' => 'Σουηδικά',
+        'sv' => 'Σουηδικά',
         'sk' => 'Σλοβάκικα (Σλοβακία)',
         'tr' => 'Τουρκικά',
         'zh-cn' => 'Κινέζικα (Κίνα)',
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 67db14089..aba954258 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -24,7 +24,7 @@ return [
         'pt-br' => 'Portuguese (Brazil)',
         'ro' => 'Romanian',
         'ru' => 'Russian',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Turkish',
         'zh-cn' => 'Chinese (China)',
diff --git a/modules/system/lang/es-ar/lang.php b/modules/system/lang/es-ar/lang.php
index 159314188..fc5438f57 100644
--- a/modules/system/lang/es-ar/lang.php
+++ b/modules/system/lang/es-ar/lang.php
@@ -9,7 +9,7 @@ return [
         'en' => 'Inglés',
         'nl' => 'Holandés',
         'ja' => 'Japonés',
-        'se' => 'Suizo',
+        'sv' => 'Suizo',
         'tr' => 'Turco',
         'de' => 'Alemán',
         'ru' => 'Ruso',
diff --git a/modules/system/lang/es/lang.php b/modules/system/lang/es/lang.php
index a7608316d..921405ac1 100644
--- a/modules/system/lang/es/lang.php
+++ b/modules/system/lang/es/lang.php
@@ -9,7 +9,7 @@ return [
         'en'    => 'Inglés',
         'nl'    => 'Holandés',
         'ja'    => 'Japonés',
-        'se'    => 'Sueco',
+        'sv'    => 'Sueco',
         'tr'    => 'Turco',
         'br'    => 'Portugués Brasileño',
         'de'    => 'Alemán',
diff --git a/modules/system/lang/fa/lang.php b/modules/system/lang/fa/lang.php
index 5072aeafe..daa9b61ef 100644
--- a/modules/system/lang/fa/lang.php
+++ b/modules/system/lang/fa/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'پرتغالی برزیل',
         'ro' => 'رومانیایی',
         'ru' => 'روسی',
-        'se' => 'سوئدی',
+        'sv' => 'سوئدی',
         'sk' => 'اسلواکی',
         'tr' => 'ترکی',
         'zh-cn' => 'چینی',
diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php
index a8970ebfe..b4d515eb4 100644
--- a/modules/system/lang/fr/lang.php
+++ b/modules/system/lang/fr/lang.php
@@ -24,7 +24,7 @@ return [
         'pt-br' => 'Portugais-Brésilien',
         'ro' => 'Roumain',
         'ru' => 'Russe',
-        'se' => 'Suédois',
+        'sv' => 'Suédois',
         'sk' => 'Slovaque (Slovaquie)',
         'tr' => 'Turque',
         'zh-cn' => 'Chinois (Chine)',
diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php
index 850c6f630..d4dd9656e 100644
--- a/modules/system/lang/hu/lang.php
+++ b/modules/system/lang/hu/lang.php
@@ -24,7 +24,7 @@ return [
         'pt-br' => 'Portugál (brazíl)',
         'ro' => 'Román',
         'ru' => 'Orosz',
-        'se' => 'Svéd',
+        'sv' => 'Svéd',
         'sk' => 'Szlovák',
         'tr' => 'Török',
         'zh-cn' => 'Kínai',
diff --git a/modules/system/lang/id/lang.php b/modules/system/lang/id/lang.php
index 2f8ada28d..deec10fbe 100644
--- a/modules/system/lang/id/lang.php
+++ b/modules/system/lang/id/lang.php
@@ -21,7 +21,7 @@ return [
         'pt-br' => 'Portugis (Brazil)',
         'ro' => 'Romania',
         'ru' => 'Rusia',
-        'se' => 'Swedia',
+        'sv' => 'Swedia',
         'sk' => 'Slowakia (Slovakia)',
         'tr' => 'Turki',
         'nb-no' => 'Norwegian (Bokmål)'
diff --git a/modules/system/lang/it/lang.php b/modules/system/lang/it/lang.php
index 659cd12b5..4d64bfa6f 100644
--- a/modules/system/lang/it/lang.php
+++ b/modules/system/lang/it/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Portoghese (Brasile)',
         'ro' => 'Romeno',
         'ru' => 'Russo',
-        'se' => 'Svedese',
+        'sv' => 'Svedese',
         'sk' => 'Slovacco (Slovacchia)',
         'tr' => 'Turco',
         'zh-cn' => 'Cinese (Cina)',
diff --git a/modules/system/lang/ja/lang.php b/modules/system/lang/ja/lang.php
index b7ee6ddd9..9e6117739 100644
--- a/modules/system/lang/ja/lang.php
+++ b/modules/system/lang/ja/lang.php
@@ -19,7 +19,7 @@ return [
         'pt-br' => 'Brazilian Portuguese',
         'ro' => 'Romanian',
         'ru' => 'Russian',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'tr' => 'Turkish',
         'nb-no' => 'Norwegian (Bokmål)'
     ],
diff --git a/modules/system/lang/lv/lang.php b/modules/system/lang/lv/lang.php
index 51b371eb5..35c856332 100644
--- a/modules/system/lang/lv/lang.php
+++ b/modules/system/lang/lv/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Portuguese (Brazil)',
         'ro' => 'Romanian',
         'ru' => 'Russian',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Turkish',
         'zh-cn' => 'Chinese (China)',
diff --git a/modules/system/lang/nb-no/lang.php b/modules/system/lang/nb-no/lang.php
index c5e5f9149..f8c36aca5 100644
--- a/modules/system/lang/nb-no/lang.php
+++ b/modules/system/lang/nb-no/lang.php
@@ -21,7 +21,7 @@ return [
         'pt-br' => 'Brasiliansk Portugisk',
         'ro' => 'Rumensk',
         'ru' => 'Russisk',
-        'se' => 'Svensk',
+        'sv' => 'Svensk',
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Tyrkisk',
         'nb-no' => 'Norsk (Bokmål)',
diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php
index f042ad3f3..5cdb6b7dd 100644
--- a/modules/system/lang/nl/lang.php
+++ b/modules/system/lang/nl/lang.php
@@ -9,7 +9,7 @@ return [
         'en' => 'Engels',
         'nl' => 'Nederlands',
         'ja' => 'Japans',
-        'se' => 'Zweeds',
+        'sv' => 'Zweeds',
         'tr' => 'Turks',
         'de' => 'Duits',
         'ru' => 'Russisch',
diff --git a/modules/system/lang/pl/lang.php b/modules/system/lang/pl/lang.php
index e6fe6e51a..28d387aa2 100644
--- a/modules/system/lang/pl/lang.php
+++ b/modules/system/lang/pl/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Brazylisjki Portugalski',
         'ro' => 'Rumuński',
         'ru' => 'Rosyjski',
-        'se' => 'Szwedzki',
+        'sv' => 'Szwedzki',
 		'sk' => 'Słowacki (Słowacja)',
         'tr' => 'Turecki',
         'zh-cn' => 'Chiński (Chiny)'
diff --git a/modules/system/lang/pt-br/lang.php b/modules/system/lang/pt-br/lang.php
index 067e4024d..93b0a68f8 100644
--- a/modules/system/lang/pt-br/lang.php
+++ b/modules/system/lang/pt-br/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Português (Brasil)',
         'ro' => 'Romeno',
         'ru' => 'Russo',
-        'se' => 'Sueco',
+        'sv' => 'Sueco',
         'sk' => 'Eslovaco',
         'tr' => 'Turco',
         'zh-cn' => 'Chinês (China)',
diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php
index b7eb24aa1..fd3e0ed8f 100644
--- a/modules/system/lang/ru/lang.php
+++ b/modules/system/lang/ru/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Portuguese (Brazil)',
         'ro' => 'Romanian',
         'ru' => 'Russian',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Turkish',
         'zh-cn' => 'Chinese (China)',
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
index 24e5b8562..d92a6bbd8 100644
--- a/modules/system/lang/sv/lang.php
+++ b/modules/system/lang/sv/lang.php
@@ -21,7 +21,7 @@ return [
         'pt-br' => 'Brazilian Portuguese',
         'ro' => 'Romanian',
         'ru' => 'Russian',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Turkish',
         'nb-no' => 'Norska (Bokmål)'
diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php
index ca8a09988..b511c0241 100644
--- a/modules/system/lang/tr/lang.php
+++ b/modules/system/lang/tr/lang.php
@@ -19,7 +19,7 @@ return [
         'pt-br' => 'Português (Brasil)',
         'ro' => 'Română (România)',
         'ru' => 'Русский (Россия - Russia)',
-        'se' => 'Svenska (Sverige)',
+        'sv' => 'Svenska (Sverige)',
         'tr' => 'Türkçe (Türkiye)',
         'nb-no' => 'Norwegian (Bokmål)'
     ],
diff --git a/modules/system/lang/zh-cn/lang.php b/modules/system/lang/zh-cn/lang.php
index 7ccc45fe0..7a2d24196 100644
--- a/modules/system/lang/zh-cn/lang.php
+++ b/modules/system/lang/zh-cn/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Portuguese (Brazil)',
         'ro' => 'Romanian',
         'ru' => 'Russian',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Turkish',
         'zh-cn' => '简体中文',
diff --git a/modules/system/lang/zh-tw/lang.php b/modules/system/lang/zh-tw/lang.php
index fd902ebb6..9f5648340 100644
--- a/modules/system/lang/zh-tw/lang.php
+++ b/modules/system/lang/zh-tw/lang.php
@@ -23,7 +23,7 @@ return [
         'pt-br' => 'Portuguese (Brazil)',
         'ro' => 'Romanian',
         'ru' => 'Russian',
-        'se' => 'Swedish',
+        'sv' => 'Swedish',
         'sk' => 'Slovak (Slovakia)',
         'tr' => 'Turkish',
         'zh-cn' => 'Chinese (China)',

From aa5e9c6034bca8fe6d1e5511eb5aea94169c7b12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Gaulin?= <jeremy@bnb.re>
Date: Thu, 27 Aug 2015 20:50:13 +0200
Subject: [PATCH 003/103] Fix encryption settings to reflect laravel encryption
 config.

---
 modules/system/lang/en/lang.php               |  4 ++++
 modules/system/lang/fr/lang.php               |  2 ++
 modules/system/models/MailSettings.php        | 21 ++++++++++++++++++-
 .../system/models/mailsettings/fields.yaml    |  7 ++++---
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 67db14089..f3d59a847 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -146,6 +146,10 @@ return [
         'smtp_password' => 'Password',
         'smtp_port' => 'SMTP port',
         'smtp_ssl' => 'SSL connection required',
+        'smtp_encryption' => 'SMTP encryption protocol',
+        'smtp_encryption_none' => 'No encryption',
+        'smtp_encryption_tls' => 'TLS',
+        'smtp_encryption_ssl' => 'SSL',
         'sendmail' => 'Sendmail',
         'sendmail_path' => 'Sendmail path',
         'sendmail_path_comment' => 'Please specify the path of the sendmail program.',
diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php
index a8970ebfe..a1ed2395a 100644
--- a/modules/system/lang/fr/lang.php
+++ b/modules/system/lang/fr/lang.php
@@ -146,6 +146,8 @@ return [
         'smtp_password' => 'Mot de passe',
         'smtp_port' => 'Port SMTP',
         'smtp_ssl' => 'Connexion SSL requise',
+        'smtp_encryption' => 'Protocole de sécurisation des échanges SMTP',
+        'smtp_encryption_none' => 'Aucun cryptage',
         'sendmail' => 'Sendmail',
         'sendmail_path' => 'Chemin vers Sendmail',
         'sendmail_path_comment' => 'Saisir le chemin du programme Sendmail.',
diff --git a/modules/system/models/MailSettings.php b/modules/system/models/MailSettings.php
index 94803257a..56bd95acd 100644
--- a/modules/system/models/MailSettings.php
+++ b/modules/system/models/MailSettings.php
@@ -44,7 +44,8 @@ class MailSettings extends Model
         $this->smtp_port = $config->get('mail.port', 587);
         $this->smtp_user = $config->get('mail.username');
         $this->smtp_password = $config->get('mail.password');
-        $this->smtp_authorization = strlen($this->smtp_user);
+        $this->smtp_authorization = !!strlen($this->smtp_user);
+        $this->smtp_encryption = $config->get('mail.encryption');
     }
 
     public function getSendModeOptions()
@@ -80,6 +81,11 @@ class MailSettings extends Model
                     $config->set('mail.username', null);
                     $config->set('mail.password', null);
                 }
+                if ($settings->smtp_encryption) {
+                    $config->set('mail.encryption', $settings->smtp_encryption);
+                } else {
+                    $config->set('mail.encryption', null);
+                }
                 break;
 
             case self::MODE_SENDMAIL:
@@ -97,4 +103,17 @@ class MailSettings extends Model
         }
 
     }
+
+
+    /**
+     * @return array smtp_encryption options values
+     */
+    public function getSmtpEncryptionOptions()
+    {
+        return [
+            '' => 'system::lang.mail.smtp_encryption_none',
+            'tls' => 'system::lang.mail.smtp_encryption_tls',
+            'ssl' => 'system::lang.mail.smtp_encryption_ssl',
+        ];
+    }
 }
diff --git a/modules/system/models/mailsettings/fields.yaml b/modules/system/models/mailsettings/fields.yaml
index 0e37e30fc..38f24078e 100644
--- a/modules/system/models/mailsettings/fields.yaml
+++ b/modules/system/models/mailsettings/fields.yaml
@@ -73,10 +73,11 @@ tabs:
                 field: send_mode
                 condition: value[smtp]
 
-        smtp_ssl:
-            type: checkbox
-            label: system::lang.mail.smtp_ssl
+        smtp_encryption:
+            type: dropdown
+            label: system::lang.mail.smtp_encryption
             tab: system::lang.mail.general
+            span: left
             trigger:
                 action: show
                 field: send_mode

From 6ec42da5841d73c28b18c670db0395cad8271b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Gaulin?= <jeremy@bnb.re>
Date: Thu, 27 Aug 2015 21:44:48 +0200
Subject: [PATCH 004/103] Hide FormWidget tabs when they contain no fields or
 only hidden fields after a toggle event on a field has occurred

---
 .../widgets/form/assets/js/october.form.js    | 40 +++++++++++++++----
 .../system/assets/ui/docs/input-trigger.md    |  1 +
 modules/system/assets/ui/js/input.trigger.js  |  2 +
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/modules/backend/widgets/form/assets/js/october.form.js b/modules/backend/widgets/form/assets/js/october.form.js
index a6dd4dc5a..28d4646a0 100644
--- a/modules/backend/widgets/form/assets/js/october.form.js
+++ b/modules/backend/widgets/form/assets/js/october.form.js
@@ -34,6 +34,7 @@
         this.bindCheckboxlist()
         this.toggleEmptyTabs()
         this.bindCollapsibleSections()
+        this.bindEvents()
 
         this.$el.one('dispose-control', this.proxy(this.dispose))
     }
@@ -48,6 +49,15 @@
         BaseProto.dispose.call(this)
     }
 
+    FormWidget.prototype.bindEvents = function() {
+        var self = this
+
+        // Update tab visibility status after fields toggle (deferred)
+        this.$el.on('oc.triggerOn.afterUpdate', function() {
+            self.toggleEmptyTabs(true)
+        })
+    }
+
     /*
      * Logic for checkboxlist
      */
@@ -133,17 +143,31 @@
 
     /*
      * Hides tabs that have no content
+     * - deferred - boolean to defer the action (only one effective call per execution cycle)
      */
-    FormWidget.prototype.toggleEmptyTabs = function() {
-        var tabControl = $('[data-control=tab]', this.$el)
+    FormWidget.prototype.toggleEmptyTabs = function(deferred) {
+        if(deferred) {
+            var self = this
 
-        if (!tabControl.length)
-            return
+            if(this.$$toggleEmptyTabsTimeout) {
+                clearTimeout(this.$$toggleEmptyTabsTimeout)
+            }
 
-        $('.tab-pane', tabControl).each(function() {
-            $('[data-target="#' + $(this).attr('id') + '"]', tabControl)
-                .toggle(!!$('.form-group:not(:empty)', $(this)).length)
-        })
+            this.$$toggleEmptyTabsTimeout = setTimeout(function() {
+                self.toggleEmptyTabs(false)
+                delete self.$$toggleEmptyTabsTimeout
+            }, 1);
+        } else {
+            var tabControl = $('[data-control=tab]', this.$el)
+
+            if (!tabControl.length)
+                return
+
+            $('.tab-pane', tabControl).each(function() {
+                $('[data-target="#' + $(this).attr('id') + '"]', tabControl)
+                    .toggle(!!$('.form-group:not(:empty):not(.hide)', $(this)).length)
+            })
+        }
     }
 
     /*
diff --git a/modules/system/assets/ui/docs/input-trigger.md b/modules/system/assets/ui/docs/input-trigger.md
index 1b66f9142..d3fe5a856 100644
--- a/modules/system/assets/ui/docs/input-trigger.md
+++ b/modules/system/assets/ui/docs/input-trigger.md
@@ -65,6 +65,7 @@ Multie value conditions are supported:
 ### Supported events:
 
 - oc.triggerOn.update - triggers the update. Trigger this event on the element the plugin is bound to to force it to check the condition and update itself. This is useful when the page content is updated with AJAX.
+- oc.triggerOn.afterUpdate - triggered after the element is updated
 
 ### JavaScript API:
 
diff --git a/modules/system/assets/ui/js/input.trigger.js b/modules/system/assets/ui/js/input.trigger.js
index 7a5fd6653..1e63ea0d6 100644
--- a/modules/system/assets/ui/js/input.trigger.js
+++ b/modules/system/assets/ui/js/input.trigger.js
@@ -87,6 +87,8 @@
         })
 
         $(window).trigger('resize')
+
+        this.$el.trigger('oc.triggerOn.afterUpdate', status)
     }
 
     TriggerOn.prototype.updateTargetAction = function(action, status) {

From 917cfd437f00245e5b26837bca9b70fe853600ff Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 29 Aug 2015 16:45:01 +1000
Subject: [PATCH 005/103] Make sure a tab is defined always - Refs #1397

---
 modules/backend/classes/AuthManager.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/backend/classes/AuthManager.php b/modules/backend/classes/AuthManager.php
index d77a3d0c0..c6eefb701 100644
--- a/modules/backend/classes/AuthManager.php
+++ b/modules/backend/classes/AuthManager.php
@@ -144,7 +144,10 @@ class AuthManager extends RainAuthManager
         $tabs = [];
 
         foreach ($this->listPermissions() as $permission) {
-            $tab = isset($permission->tab) ? $permission->tab : null;
+            $tab = isset($permission->tab)
+                ? $permission->tab
+                : 'backend::lang.form.undefined_tab';
+
             if (!array_key_exists($tab, $tabs)) {
                 $tabs[$tab] = [];
             }

From 275463996ee6633af2135386a3884f67a61076c7 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 29 Aug 2015 18:42:29 +1000
Subject: [PATCH 006/103] When toggling empty tabs: if a hidden tab was
 selected, select the first visible tab Induce tab overlap using negative
 right margin instead (first-child tab can be hidden) Use a slightly cleaner
 approach than in #1401

---
 .../codeeditor/assets/js/build-min.js         | 30 ++++++-----
 .../widgets/form/assets/js/october.form.js    | 51 ++++++++++---------
 modules/system/assets/ui/less/tab.less        |  9 ++--
 modules/system/assets/ui/storm-min.js         |  3 +-
 modules/system/assets/ui/storm.css            |  5 +-
 modules/system/models/MailSettings.php        |  3 +-
 6 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/modules/backend/formwidgets/codeeditor/assets/js/build-min.js b/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
index 7245d135c..9ca99cb1b 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
@@ -566,10 +566,10 @@ function intLength(num){num=num.replace(/^\-/,'');if(~num.indexOf('.')){return n
 return num.length;}
 var actions=require('actions');_.each([1,-1,10,-10,0.1,-0.1],function(num){var prefix=num>0?'increment':'decrement';actions.add(prefix+'_number_by_'+String(Math.abs(num)).replace('.','').substring(0,2),function(editor){return incrementNumber(editor,num);},{label:'Numbers/'+prefix.charAt(0).toUpperCase()+prefix.substring(1)+' number by '+Math.abs(num)});});});emmet.exec(function(require,_){var actions=require('actions');var prefs=require('preferences');prefs.define('css.closeBraceIndentation','\n','Indentation before closing brace of CSS rule. Some users prefere '
 +'indented closing brace of CSS rule for better readability. '
-+'This preference’s value will be automatically inserted before '
++'This preference’s value will be automatically inserted before '
 +'closing brace when user adds newline in newly created CSS rule '
-+'(e.g. when “Insert formatted linebreak” action will be performed '
-+'in CSS file). If you’re such user, you may want to write put a value '
++'(e.g. when “Insert formatted linebreak” action will be performed '
++'in CSS file). If you’re such user, you may want to write put a value '
 +'like <code>\\n\\t</code> in this preference.');actions.add('insert_formatted_line_break_only',function(editor){var utils=require('utils');var res=require('resources');var info=require('editorUtils').outputInfo(editor);var caretPos=editor.getCaretPos();var nl=utils.getNewline();if(_.include(['html','xml','xsl'],info.syntax)){var pad=res.getVariable('indentation');var tag=require('htmlMatcher').tag(info.content,caretPos);if(tag&&!tag.innerRange.length()){editor.replaceContent(nl+pad+utils.getCaretPlaceholder()+nl,caretPos);return true;}}else if(info.syntax=='css'){var content=info.content;if(caretPos&&content.charAt(caretPos-1)=='{'){var append=prefs.get('css.closeBraceIndentation');var pad=res.getVariable('indentation');var hasCloseBrace=content.charAt(caretPos)=='}';if(!hasCloseBrace){for(var i=caretPos,il=content.length,ch;i<il;i++){ch=content.charAt(i);if(ch=='{'){break;}
 if(ch=='}'){append='';hasCloseBrace=true;break;}}}
 if(!hasCloseBrace){append+='}';}
@@ -612,7 +612,7 @@ return true;});});emmet.define('cssResolver',function(require,_){var module=null
 +'when expanding CSS abbreviations in SASS dialect.');prefs.define('css.autoInsertVendorPrefixes',true,'Automatically generate vendor-prefixed copies of expanded CSS '
 +'property. By default, Emmet will generate vendor-prefixed '
 +'properties only when you put dash before abbreviation '
-+'(e.g. <code>-bxsh</code>). With this option enabled, you don’t '
++'(e.g. <code>-bxsh</code>). With this option enabled, you don’t '
 +'need dashes before abbreviations: Emmet will produce '
 +'vendor-prefixed properties for you.');var descTemplate=_.template('A comma-separated list of CSS properties that may have '
 +'<code><%= vendor %></code> vendor prefix. This list is used to generate '
@@ -624,7 +624,7 @@ return true;});});emmet.define('cssResolver',function(require,_){var module=null
 +'properties to original set. To add a new property, simply write its name, '
 +'to remove it, precede property with hyphen.<br>'
 +'For example, to add <em>foo</em> property and remove <em>border-radius</em> one, '
-+'the preference value will look like this: <code>foo, -border-radius</code>.');var props={'webkit':'animation, animation-delay, animation-direction, animation-duration, animation-fill-mode, animation-iteration-count, animation-name, animation-play-state, animation-timing-function, appearance, backface-visibility, background-clip, background-composite, background-origin, background-size, border-fit, border-horizontal-spacing, border-image, border-vertical-spacing, box-align, box-direction, box-flex, box-flex-group, box-lines, box-ordinal-group, box-orient, box-pack, box-reflect, box-shadow, color-correction, column-break-after, column-break-before, column-break-inside, column-count, column-gap, column-rule-color, column-rule-style, column-rule-width, column-span, column-width, dashboard-region, font-smoothing, highlight, hyphenate-character, hyphenate-limit-after, hyphenate-limit-before, hyphens, line-box-contain, line-break, line-clamp, locale, margin-before-collapse, margin-after-collapse, marquee-direction, marquee-increment, marquee-repetition, marquee-style, mask-attachment, mask-box-image, mask-box-image-outset, mask-box-image-repeat, mask-box-image-slice, mask-box-image-source, mask-box-image-width, mask-clip, mask-composite, mask-image, mask-origin, mask-position, mask-repeat, mask-size, nbsp-mode, perspective, perspective-origin, rtl-ordering, text-combine, text-decorations-in-effect, text-emphasis-color, text-emphasis-position, text-emphasis-style, text-fill-color, text-orientation, text-security, text-stroke-color, text-stroke-width, transform, transition, transform-origin, transform-style, transition-delay, transition-duration, transition-property, transition-timing-function, user-drag, user-modify, user-select, writing-mode, svg-shadow, box-sizing, border-radius','moz':'animation-delay, animation-direction, animation-duration, animation-fill-mode, animation-iteration-count, animation-name, animation-play-state, animation-timing-function, appearance, backface-visibility, background-inline-policy, binding, border-bottom-colors, border-image, border-left-colors, border-right-colors, border-top-colors, box-align, box-direction, box-flex, box-ordinal-group, box-orient, box-pack, box-shadow, box-sizing, column-count, column-gap, column-rule-color, column-rule-style, column-rule-width, column-width, float-edge, font-feature-settings, font-language-override, force-broken-image-icon, hyphens, image-region, orient, outline-radius-bottomleft, outline-radius-bottomright, outline-radius-topleft, outline-radius-topright, perspective, perspective-origin, stack-sizing, tab-size, text-blink, text-decoration-color, text-decoration-line, text-decoration-style, text-size-adjust, transform, transform-origin, transform-style, transition, transition-delay, transition-duration, transition-property, transition-timing-function, user-focus, user-input, user-modify, user-select, window-shadow, background-clip, border-radius','ms':'accelerator, backface-visibility, background-position-x, background-position-y, behavior, block-progression, box-align, box-direction, box-flex, box-line-progression, box-lines, box-ordinal-group, box-orient, box-pack, content-zoom-boundary, content-zoom-boundary-max, content-zoom-boundary-min, content-zoom-chaining, content-zoom-snap, content-zoom-snap-points, content-zoom-snap-type, content-zooming, filter, flow-from, flow-into, font-feature-settings, grid-column, grid-column-align, grid-column-span, grid-columns, grid-layer, grid-row, grid-row-align, grid-row-span, grid-rows, high-contrast-adjust, hyphenate-limit-chars, hyphenate-limit-lines, hyphenate-limit-zone, hyphens, ime-mode, interpolation-mode, layout-flow, layout-grid, layout-grid-char, layout-grid-line, layout-grid-mode, layout-grid-type, line-break, overflow-style, perspective, perspective-origin, perspective-origin-x, perspective-origin-y, scroll-boundary, scroll-boundary-bottom, scroll-boundary-left, scroll-boundary-right, scroll-boundary-top, scroll-chaining, scroll-rails, scroll-snap-points-x, scroll-snap-points-y, scroll-snap-type, scroll-snap-x, scroll-snap-y, scrollbar-arrow-color, scrollbar-base-color, scrollbar-darkshadow-color, scrollbar-face-color, scrollbar-highlight-color, scrollbar-shadow-color, scrollbar-track-color, text-align-last, text-autospace, text-justify, text-kashida-space, text-overflow, text-size-adjust, text-underline-position, touch-action, transform, transform-origin, transform-origin-x, transform-origin-y, transform-origin-z, transform-style, transition, transition-delay, transition-duration, transition-property, transition-timing-function, user-select, word-break, word-wrap, wrap-flow, wrap-margin, wrap-through, writing-mode','o':'dashboard-region, animation, animation-delay, animation-direction, animation-duration, animation-fill-mode, animation-iteration-count, animation-name, animation-play-state, animation-timing-function, border-image, link, link-source, object-fit, object-position, tab-size, table-baseline, transform, transform-origin, transition, transition-delay, transition-duration, transition-property, transition-timing-function, accesskey, input-format, input-required, marquee-dir, marquee-loop, marquee-speed, marquee-style'};_.each(props,function(v,k){prefs.define('css.'+k+'Properties',v,descTemplate({vendor:k}));prefs.define('css.'+k+'PropertiesAddon','',descAddonTemplate({vendor:k}));});prefs.define('css.unitlessProperties','z-index, line-height, opacity, font-weight, zoom','The list of properties whose values ​​must not contain units.');prefs.define('css.intUnit','px','Default unit for integer values');prefs.define('css.floatUnit','em','Default unit for float values');prefs.define('css.keywords','auto, inherit','A comma-separated list of valid keywords that can be used in CSS abbreviations.');prefs.define('css.keywordAliases','a:auto, i:inherit, s:solid, da:dashed, do:dotted, t:transparent','A comma-separated list of keyword aliases, used in CSS abbreviation. '
++'the preference value will look like this: <code>foo, -border-radius</code>.');var props={'webkit':'animation, animation-delay, animation-direction, animation-duration, animation-fill-mode, animation-iteration-count, animation-name, animation-play-state, animation-timing-function, appearance, backface-visibility, background-clip, background-composite, background-origin, background-size, border-fit, border-horizontal-spacing, border-image, border-vertical-spacing, box-align, box-direction, box-flex, box-flex-group, box-lines, box-ordinal-group, box-orient, box-pack, box-reflect, box-shadow, color-correction, column-break-after, column-break-before, column-break-inside, column-count, column-gap, column-rule-color, column-rule-style, column-rule-width, column-span, column-width, dashboard-region, font-smoothing, highlight, hyphenate-character, hyphenate-limit-after, hyphenate-limit-before, hyphens, line-box-contain, line-break, line-clamp, locale, margin-before-collapse, margin-after-collapse, marquee-direction, marquee-increment, marquee-repetition, marquee-style, mask-attachment, mask-box-image, mask-box-image-outset, mask-box-image-repeat, mask-box-image-slice, mask-box-image-source, mask-box-image-width, mask-clip, mask-composite, mask-image, mask-origin, mask-position, mask-repeat, mask-size, nbsp-mode, perspective, perspective-origin, rtl-ordering, text-combine, text-decorations-in-effect, text-emphasis-color, text-emphasis-position, text-emphasis-style, text-fill-color, text-orientation, text-security, text-stroke-color, text-stroke-width, transform, transition, transform-origin, transform-style, transition-delay, transition-duration, transition-property, transition-timing-function, user-drag, user-modify, user-select, writing-mode, svg-shadow, box-sizing, border-radius','moz':'animation-delay, animation-direction, animation-duration, animation-fill-mode, animation-iteration-count, animation-name, animation-play-state, animation-timing-function, appearance, backface-visibility, background-inline-policy, binding, border-bottom-colors, border-image, border-left-colors, border-right-colors, border-top-colors, box-align, box-direction, box-flex, box-ordinal-group, box-orient, box-pack, box-shadow, box-sizing, column-count, column-gap, column-rule-color, column-rule-style, column-rule-width, column-width, float-edge, font-feature-settings, font-language-override, force-broken-image-icon, hyphens, image-region, orient, outline-radius-bottomleft, outline-radius-bottomright, outline-radius-topleft, outline-radius-topright, perspective, perspective-origin, stack-sizing, tab-size, text-blink, text-decoration-color, text-decoration-line, text-decoration-style, text-size-adjust, transform, transform-origin, transform-style, transition, transition-delay, transition-duration, transition-property, transition-timing-function, user-focus, user-input, user-modify, user-select, window-shadow, background-clip, border-radius','ms':'accelerator, backface-visibility, background-position-x, background-position-y, behavior, block-progression, box-align, box-direction, box-flex, box-line-progression, box-lines, box-ordinal-group, box-orient, box-pack, content-zoom-boundary, content-zoom-boundary-max, content-zoom-boundary-min, content-zoom-chaining, content-zoom-snap, content-zoom-snap-points, content-zoom-snap-type, content-zooming, filter, flow-from, flow-into, font-feature-settings, grid-column, grid-column-align, grid-column-span, grid-columns, grid-layer, grid-row, grid-row-align, grid-row-span, grid-rows, high-contrast-adjust, hyphenate-limit-chars, hyphenate-limit-lines, hyphenate-limit-zone, hyphens, ime-mode, interpolation-mode, layout-flow, layout-grid, layout-grid-char, layout-grid-line, layout-grid-mode, layout-grid-type, line-break, overflow-style, perspective, perspective-origin, perspective-origin-x, perspective-origin-y, scroll-boundary, scroll-boundary-bottom, scroll-boundary-left, scroll-boundary-right, scroll-boundary-top, scroll-chaining, scroll-rails, scroll-snap-points-x, scroll-snap-points-y, scroll-snap-type, scroll-snap-x, scroll-snap-y, scrollbar-arrow-color, scrollbar-base-color, scrollbar-darkshadow-color, scrollbar-face-color, scrollbar-highlight-color, scrollbar-shadow-color, scrollbar-track-color, text-align-last, text-autospace, text-justify, text-kashida-space, text-overflow, text-size-adjust, text-underline-position, touch-action, transform, transform-origin, transform-origin-x, transform-origin-y, transform-origin-z, transform-style, transition, transition-delay, transition-duration, transition-property, transition-timing-function, user-select, word-break, word-wrap, wrap-flow, wrap-margin, wrap-through, writing-mode','o':'dashboard-region, animation, animation-delay, animation-direction, animation-duration, animation-fill-mode, animation-iteration-count, animation-name, animation-play-state, animation-timing-function, border-image, link, link-source, object-fit, object-position, tab-size, table-baseline, transform, transform-origin, transition, transition-delay, transition-duration, transition-property, transition-timing-function, accesskey, input-format, input-required, marquee-dir, marquee-loop, marquee-speed, marquee-style'};_.each(props,function(v,k){prefs.define('css.'+k+'Properties',v,descTemplate({vendor:k}));prefs.define('css.'+k+'PropertiesAddon','',descAddonTemplate({vendor:k}));});prefs.define('css.unitlessProperties','z-index, line-height, opacity, font-weight, zoom','The list of properties whose values ​​must not contain units.');prefs.define('css.intUnit','px','Default unit for integer values');prefs.define('css.floatUnit','em','Default unit for float values');prefs.define('css.keywords','auto, inherit','A comma-separated list of valid keywords that can be used in CSS abbreviations.');prefs.define('css.keywordAliases','a:auto, i:inherit, s:solid, da:dashed, do:dotted, t:transparent','A comma-separated list of keyword aliases, used in CSS abbreviation. '
 +'Each alias should be defined as <code>alias:keyword_name</code>.');prefs.define('css.unitAliases','e:em, p:%, x:ex, r:rem','A comma-separated list of unit aliases, used in CSS abbreviation. '
 +'Each alias should be defined as <code>alias:unit_value</code>.');prefs.define('css.color.short',true,'Should color values like <code>#ffffff</code> be shortened to '
 +'<code>#fff</code> after abbreviation with color was expanded.');prefs.define('css.color.case','keep','Letter case of color values generated by abbreviations with color '
@@ -727,7 +727,7 @@ cs.position=1;if('position'in cs){var start=colorStops[from].position||0;var ste
 function textualDirection(direction){var angle=parseFloat(direction);if(!_.isNaN(angle)){switch(angle%360){case 0:return'left';case 90:return'bottom';case 180:return'right';case 240:return'top';}}
 return direction;}
 function oldWebkitDirection(direction){direction=textualDirection(direction);if(reDeg.test(direction))
-throw"The direction is an angle that can’t be converted.";var v=function(pos){return~direction.indexOf(pos)?'100%':'0';};return v('right')+' '+v('bottom')+', '+v('left')+' '+v('top');}
+throw"The direction is an angle that can’t be converted.";var v=function(pos){return~direction.indexOf(pos)?'100%':'0';};return v('right')+' '+v('bottom')+', '+v('left')+' '+v('top');}
 function getPrefixedNames(name){var prefixes=prefs.getArray('css.gradient.prefixes');var names=prefixes?_.map(prefixes,function(p){return'-'+p+'-'+name;}):[];names.push(name);return names;}
 function getPropertiesForGradient(gradient,propertyName){var props=[];var css=require('cssResolver');if(prefs.get('css.gradient.fallback')&&~propertyName.toLowerCase().indexOf('background')){props.push({name:'background-color',value:'${1:'+gradient.colorStops[0].color+'}'});}
 _.each(prefs.getArray('css.gradient.prefixes'),function(prefix){var name=css.prefixed(propertyName,prefix);if(prefix=='webkit'&&prefs.get('css.gradient.oldWebkit')){try{props.push({name:name,value:module.oldWebkitLinearGradient(gradient)});}catch(e){}}
@@ -771,8 +771,8 @@ return this.getMapping(name);if(this.isInlineLevel(name))
 return'span';return'div';},getMapping:function(name){return elementMap[name.toLowerCase()];},isInlineLevel:function(name){return this.isTypeOf(name,'inlineLevel');},isBlockLevel:function(name){return this.isTypeOf(name,'blockLevel');},isEmptyElement:function(name){return this.isTypeOf(name,'empty');},isTypeOf:function(name,type){return _.include(elementTypes[type],name);},addMapping:function(parent,child){elementMap[parent]=child;},removeMapping:function(parent){if(parent in elementMap)
 delete elementMap[parent];},addElementToCollection:function(name,collection){if(!elementTypes[collection])
 elementTypes[collection]=[];var col=this.getCollection(collection);if(!_.include(col,name))
-col.push(name);},removeElementFromCollection:function(name,collection){if(collection in elementTypes){elementTypes[collection]=_.without(this.getCollection(collection),name);}},getCollection:function(name){return elementTypes[name];}};});emmet.exec(function(require,_){var prefs=require('preferences');prefs.define('bem.elementSeparator','__','Class name’s element separator.');prefs.define('bem.modifierSeparator','_','Class name’s modifier separator.');prefs.define('bem.shortElementPrefix','-','Symbol for describing short “block-element” notation. Class names '
-+'prefixed with this symbol will be treated as element name for parent‘s '
+col.push(name);},removeElementFromCollection:function(name,collection){if(collection in elementTypes){elementTypes[collection]=_.without(this.getCollection(collection),name);}},getCollection:function(name){return elementTypes[name];}};});emmet.exec(function(require,_){var prefs=require('preferences');prefs.define('bem.elementSeparator','__','Class name’s element separator.');prefs.define('bem.modifierSeparator','_','Class name’s modifier separator.');prefs.define('bem.shortElementPrefix','-','Symbol for describing short “block-element” notation. Class names '
++'prefixed with this symbol will be treated as element name for parent‘s '
 +'block name. Each symbol instance traverses one level up in parsed '
 +'tree for block name lookup. Empty value will disable short notation.');var shouldRunHtmlFilter=false;function getSeparators(){return{element:prefs.get('bem.elementSeparator'),modifier:prefs.get('bem.modifierSeparator')};}
 function bemParse(item){if(require('abbreviationUtils').isSnippet(item))
@@ -801,13 +801,13 @@ return tree;});});emmet.exec(function(require,_){var prefs=require('preferences'
 +'function (see Underscore.js docs for details). In template context, '
 +'the following properties and functions are availabe:\n'
 +'<ul>'
-+'<li><code>attr(name, before, after)</code> – a function that outputs'
++'<li><code>attr(name, before, after)</code> – a function that outputs'
 +'specified attribute value concatenated with <code>before</code> '
 +'and <code>after</code> strings. If attribute doesn\'t exists, the '
 +'empty string will be returned.</li>'
-+'<li><code>node</code> – current node (instance of <code>AbbreviationNode</code>)</li>'
-+'<li><code>name</code> – name of current tag</li>'
-+'<li><code>padding</code> – current string padding, can be used '
++'<li><code>node</code> – current node (instance of <code>AbbreviationNode</code>)</li>'
++'<li><code>name</code> – name of current tag</li>'
++'<li><code>padding</code> – current string padding, can be used '
 +'for formatting</li>'
 +'</ul>');prefs.define('filter.commentBefore','','A definition of comment that should be placed <i>before</i> matched '
 +'element when <code>comment</code> filter is applied. '
@@ -872,7 +872,7 @@ item.start=item.start.replace(reNl,'');item.end=item.end.replace(reNl,'');item.c
 item.content=item.content.replace(re,'');process(item,re);});return tree;}
 require('filters').add('t',function(tree){var re=new RegExp(require('preferences').get('filter.trimRegexp'));return process(tree,re);});});emmet.exec(function(require,_){var tags={'xsl:variable':1,'xsl:with-param':1};function trimAttribute(node){node.start=node.start.replace(/\s+select\s*=\s*(['"]).*?\1/,'');}
 require('filters').add('xsl',function process(tree){var abbrUtils=require('abbreviationUtils');_.each(tree.children,function(item){if(!abbrUtils.isSnippet(item)&&(item.name()||'').toLowerCase()in tags&&item.children.length)
-trimAttribute(item);process(item);});return tree;});});emmet.define('lorem',function(require,_){var langs={en:{common:['lorem','ipsum','dolor','sit','amet','consectetur','adipisicing','elit'],words:['exercitationem','perferendis','perspiciatis','laborum','eveniet','sunt','iure','nam','nobis','eum','cum','officiis','excepturi','odio','consectetur','quasi','aut','quisquam','vel','eligendi','itaque','non','odit','tempore','quaerat','dignissimos','facilis','neque','nihil','expedita','vitae','vero','ipsum','nisi','animi','cumque','pariatur','velit','modi','natus','iusto','eaque','sequi','illo','sed','ex','et','voluptatibus','tempora','veritatis','ratione','assumenda','incidunt','nostrum','placeat','aliquid','fuga','provident','praesentium','rem','necessitatibus','suscipit','adipisci','quidem','possimus','voluptas','debitis','sint','accusantium','unde','sapiente','voluptate','qui','aspernatur','laudantium','soluta','amet','quo','aliquam','saepe','culpa','libero','ipsa','dicta','reiciendis','nesciunt','doloribus','autem','impedit','minima','maiores','repudiandae','ipsam','obcaecati','ullam','enim','totam','delectus','ducimus','quis','voluptates','dolores','molestiae','harum','dolorem','quia','voluptatem','molestias','magni','distinctio','omnis','illum','dolorum','voluptatum','ea','quas','quam','corporis','quae','blanditiis','atque','deserunt','laboriosam','earum','consequuntur','hic','cupiditate','quibusdam','accusamus','ut','rerum','error','minus','eius','ab','ad','nemo','fugit','officia','at','in','id','quos','reprehenderit','numquam','iste','fugiat','sit','inventore','beatae','repellendus','magnam','recusandae','quod','explicabo','doloremque','aperiam','consequatur','asperiores','commodi','optio','dolor','labore','temporibus','repellat','veniam','architecto','est','esse','mollitia','nulla','a','similique','eos','alias','dolore','tenetur','deleniti','porro','facere','maxime','corrupti']},ru:{common:['далеко-далеко','за','словесными','горами','в стране','гласных','и согласных','живут','рыбные','тексты'],words:['вдали','от всех','они','буквенных','домах','на берегу','семантика','большого','языкового','океана','маленький','ручеек','даль','журчит','по всей','обеспечивает','ее','всеми','необходимыми','правилами','эта','парадигматическая','страна','которой','жаренные','предложения','залетают','прямо','рот','даже','всемогущая','пунктуация','не','имеет','власти','над','рыбными','текстами','ведущими','безорфографичный','образ','жизни','однажды','одна','маленькая','строчка','рыбного','текста','имени','lorem','ipsum','решила','выйти','большой','мир','грамматики','великий','оксмокс','предупреждал','о','злых','запятых','диких','знаках','вопроса','коварных','точках','запятой','но','текст','дал','сбить','себя','толку','он','собрал','семь','своих','заглавных','букв','подпоясал','инициал','за','пояс','пустился','дорогу','взобравшись','первую','вершину','курсивных','гор','бросил','последний','взгляд','назад','силуэт','своего','родного','города','буквоград','заголовок','деревни','алфавит','подзаголовок','своего','переулка','грустный','реторический','вопрос','скатился','его','щеке','продолжил','свой','путь','дороге','встретил','рукопись','она','предупредила','моей','все','переписывается','несколько','раз','единственное','что','меня','осталось','это','приставка','возвращайся','ты','лучше','свою','безопасную','страну','послушавшись','рукописи','наш','продолжил','свой','путь','вскоре','ему','повстречался','коварный','составитель','рекламных','текстов','напоивший','языком','речью','заманивший','свое','агенство','которое','использовало','снова','снова','своих','проектах','если','переписали','то','живет','там','до','сих','пор']}};var prefs=require('preferences');prefs.define('lorem.defaultLang','en');require('abbreviationParser').addPreprocessor(function(tree,options){var re=/^(?:lorem|lipsum)([a-z]{2})?(\d*)$/i,match;tree.findAll(function(node){if(node._name&&(match=node._name.match(re))){var wordCound=match[2]||30;var lang=match[1]||prefs.get('lorem.defaultLang')||'en';node._name='';node.data('forceNameResolving',node.isRepeating()||node.attributeList().length);node.data('pasteOverwrites',true);node.data('paste',function(i,content){return paragraph(lang,wordCound,!i);});}});});function randint(from,to){return Math.round(Math.random()*(to-from)+from);}
+trimAttribute(item);process(item);});return tree;});});emmet.define('lorem',function(require,_){var langs={en:{common:['lorem','ipsum','dolor','sit','amet','consectetur','adipisicing','elit'],words:['exercitationem','perferendis','perspiciatis','laborum','eveniet','sunt','iure','nam','nobis','eum','cum','officiis','excepturi','odio','consectetur','quasi','aut','quisquam','vel','eligendi','itaque','non','odit','tempore','quaerat','dignissimos','facilis','neque','nihil','expedita','vitae','vero','ipsum','nisi','animi','cumque','pariatur','velit','modi','natus','iusto','eaque','sequi','illo','sed','ex','et','voluptatibus','tempora','veritatis','ratione','assumenda','incidunt','nostrum','placeat','aliquid','fuga','provident','praesentium','rem','necessitatibus','suscipit','adipisci','quidem','possimus','voluptas','debitis','sint','accusantium','unde','sapiente','voluptate','qui','aspernatur','laudantium','soluta','amet','quo','aliquam','saepe','culpa','libero','ipsa','dicta','reiciendis','nesciunt','doloribus','autem','impedit','minima','maiores','repudiandae','ipsam','obcaecati','ullam','enim','totam','delectus','ducimus','quis','voluptates','dolores','molestiae','harum','dolorem','quia','voluptatem','molestias','magni','distinctio','omnis','illum','dolorum','voluptatum','ea','quas','quam','corporis','quae','blanditiis','atque','deserunt','laboriosam','earum','consequuntur','hic','cupiditate','quibusdam','accusamus','ut','rerum','error','minus','eius','ab','ad','nemo','fugit','officia','at','in','id','quos','reprehenderit','numquam','iste','fugiat','sit','inventore','beatae','repellendus','magnam','recusandae','quod','explicabo','doloremque','aperiam','consequatur','asperiores','commodi','optio','dolor','labore','temporibus','repellat','veniam','architecto','est','esse','mollitia','nulla','a','similique','eos','alias','dolore','tenetur','deleniti','porro','facere','maxime','corrupti']},ru:{common:['далеко-далеко','за','словесными','горами','в стране','гласных','и согласных','живут','рыбные','тексты'],words:['вдали','от всех','они','буквенных','домах','на берегу','семантика','большого','языкового','океана','маленький','ручеек','даль','журчит','по всей','обеспечивает','ее','всеми','необходимыми','правилами','эта','парадигматическая','страна','которой','жаренные','предложения','залетают','прямо','рот','даже','всемогущая','пунктуация','не','имеет','власти','над','рыбными','текстами','ведущими','безорфографичный','образ','жизни','однажды','одна','маленькая','строчка','рыбного','текста','имени','lorem','ipsum','решила','выйти','большой','мир','грамматики','великий','оксмокс','предупреждал','о','злых','запятых','диких','знаках','вопроса','коварных','точках','запятой','но','текст','дал','сбить','себя','толку','он','собрал','семь','своих','заглавных','букв','подпоясал','инициал','за','пояс','пустился','дорогу','взобравшись','первую','вершину','курсивных','гор','бросил','последний','взгляд','назад','силуэт','своего','родного','города','буквоград','заголовок','деревни','алфавит','подзаголовок','своего','переулка','грустный','реторический','вопрос','скатился','его','щеке','продолжил','свой','путь','дороге','встретил','рукопись','она','предупредила','моей','все','переписывается','несколько','раз','единственное','что','меня','осталось','это','приставка','возвращайся','ты','лучше','свою','безопасную','страну','послушавшись','рукописи','наш','продолжил','свой','путь','вскоре','ему','повстречался','коварный','составитель','рекламных','текстов','напоивший','языком','речью','заманивший','свое','агенство','которое','использовало','снова','снова','своих','проектах','если','переписали','то','живет','там','до','сих','пор']}};var prefs=require('preferences');prefs.define('lorem.defaultLang','en');require('abbreviationParser').addPreprocessor(function(tree,options){var re=/^(?:lorem|lipsum)([a-z]{2})?(\d*)$/i,match;tree.findAll(function(node){if(node._name&&(match=node._name.match(re))){var wordCound=match[2]||30;var lang=match[1]||prefs.get('lorem.defaultLang')||'en';node._name='';node.data('forceNameResolving',node.isRepeating()||node.attributeList().length);node.data('pasteOverwrites',true);node.data('paste',function(i,content){return paragraph(lang,wordCound,!i);});}});});function randint(from,to){return Math.round(Math.random()*(to-from)+from);}
 function sample(arr,count){var len=arr.length;var iterations=Math.min(len,count);var result=[];while(result.length<iterations){var randIx=randint(0,len-1);if(!_.include(result,randIx))
 result.push(randIx);}
 return _.map(result,function(ix){return arr[ix];});}
@@ -4267,6 +4267,10 @@ if(this.isFullscreen){$('body').css({overflow:'hidden'})}
 else{$('body').css({overflow:'inherit'})}
 this.editor.resize()
 this.editor.focus()}
++function(exports){if(exports.ace&&typeof exports.ace.require=='function'){var emmetExt=exports.ace.require('ace/ext/emmet')
+if(emmetExt&&emmetExt.AceEmmetEditor&&emmetExt.AceEmmetEditor.prototype.getSyntax){var coreGetSyntax=emmetExt.AceEmmetEditor.prototype.getSyntax
+emmetExt.AceEmmetEditor.prototype.getSyntax=function(){var $syntax=$.proxy(coreGetSyntax,this)()
+return $syntax=='twig'?'html':$syntax};}}}(window)
 var old=$.fn.codeEditor
 $.fn.codeEditor=function(option){var args=Array.prototype.slice.call(arguments,1),result
 this.each(function(){var $this=$(this)
diff --git a/modules/backend/widgets/form/assets/js/october.form.js b/modules/backend/widgets/form/assets/js/october.form.js
index 28d4646a0..6d1bc2e14 100644
--- a/modules/backend/widgets/form/assets/js/october.form.js
+++ b/modules/backend/widgets/form/assets/js/october.form.js
@@ -34,8 +34,8 @@
         this.bindCheckboxlist()
         this.toggleEmptyTabs()
         this.bindCollapsibleSections()
-        this.bindEvents()
 
+        this.$el.on('oc.triggerOn.afterUpdate', this.proxy(this.toggleEmptyTabs))
         this.$el.one('dispose-control', this.proxy(this.dispose))
     }
 
@@ -49,15 +49,6 @@
         BaseProto.dispose.call(this)
     }
 
-    FormWidget.prototype.bindEvents = function() {
-        var self = this
-
-        // Update tab visibility status after fields toggle (deferred)
-        this.$el.on('oc.triggerOn.afterUpdate', function() {
-            self.toggleEmptyTabs(true)
-        })
-    }
-
     /*
      * Logic for checkboxlist
      */
@@ -142,32 +133,42 @@
     }
 
     /*
-     * Hides tabs that have no content
-     * - deferred - boolean to defer the action (only one effective call per execution cycle)
+     * Hides tabs that have no content, it is possible this can be
+     * called multiple times in a single cycle due to input.trigger.
      */
-    FormWidget.prototype.toggleEmptyTabs = function(deferred) {
-        if(deferred) {
-            var self = this
+    FormWidget.prototype.toggleEmptyTabs = function() {
 
-            if(this.$$toggleEmptyTabsTimeout) {
-                clearTimeout(this.$$toggleEmptyTabsTimeout)
-            }
+        if (this.toggleEmptyTabsTimer !== undefined) {
+            window.clearTimeout(this.toggleEmptyTabsTimer)
+        }
 
-            this.$$toggleEmptyTabsTimeout = setTimeout(function() {
-                self.toggleEmptyTabs(false)
-                delete self.$$toggleEmptyTabsTimeout
-            }, 1);
-        } else {
-            var tabControl = $('[data-control=tab]', this.$el)
+        this.toggleEmptyTabsTimer = window.setTimeout(function() {
+
+            var tabControl = $('[data-control=tab]', this.$el),
+                tabContainer = $('.nav-tabs', tabControl)
 
             if (!tabControl.length)
                 return
 
+            /*
+             * Check each tab pane for form field groups
+             */
             $('.tab-pane', tabControl).each(function() {
                 $('[data-target="#' + $(this).attr('id') + '"]', tabControl)
+                    .closest('li')
                     .toggle(!!$('.form-group:not(:empty):not(.hide)', $(this)).length)
             })
-        }
+
+            /*
+             * If a hidden tab was selected, select the first visible tab
+             */
+            if (!$('> li.active:visible', tabContainer).length) {
+                $('> li:visible:first', tabContainer)
+                    .find('> a:first')
+                    .tab('show')
+            }
+
+        }, 1)
     }
 
     /*
diff --git a/modules/system/assets/ui/less/tab.less b/modules/system/assets/ui/less/tab.less
index de22c4a47..4dffdac72 100644
--- a/modules/system/assets/ui/less/tab.less
+++ b/modules/system/assets/ui/less/tab.less
@@ -255,15 +255,18 @@
             > li {
                 padding-right: 10px;
                 padding-left: 11px;
-                margin-right: 0;
-                margin-left: -30px;
+                margin-left: 0;
+                margin-right: -30px;
                 background: transparent;
 
                 &:first-child {
-                    margin-left: 0;
                     padding-left: 15px !important;
                 }
 
+                &:last-child {
+                    margin-right: 0;
+                }
+
                 a {
                     font-size: 12px;
                     padding-bottom: 3px;
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index dec0d1b98..b5d0ab812 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -3437,7 +3437,8 @@ if(!!trigger.length){triggerValue=trigger.val()}
 this.updateTarget($.inArray(triggerValue,this.triggerConditionValue)!=-1)}}
 TriggerOn.prototype.updateTarget=function(status){var self=this,actions=this.options.triggerAction.split('|')
 $.each(actions,function(index,action){self.updateTargetAction(action,status)})
-$(window).trigger('resize')}
+$(window).trigger('resize')
+this.$el.trigger('oc.triggerOn.afterUpdate',status)}
 TriggerOn.prototype.updateTargetAction=function(action,status){if(action=='show'){this.$el.toggleClass('hide',!status).trigger('hide.oc.triggerapi',[!status])}
 else if(action=='hide'){this.$el.toggleClass('hide',status).trigger('hide.oc.triggerapi',[status])}
 else if(action=='enable'){this.$el.prop('disabled',!status).toggleClass('control-disabled',!status).trigger('disable.oc.triggerapi',[!status])}
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index acd8155ea..1ca12f548 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -1372,8 +1372,9 @@ div.progress{height:9px;-webkit-box-shadow:none;box-shadow:none;background:#d9de
 .control-tabs.primary,.control-tabs.primary-tabs{margin-bottom:5px}
 .control-tabs.primary > ul.nav-tabs,.control-tabs.primary-tabs > ul.nav-tabs,.control-tabs.primary > div > ul.nav-tabs,.control-tabs.primary-tabs > div > ul.nav-tabs,.control-tabs.primary > div > div > ul.nav-tabs,.control-tabs.primary-tabs > div > div > ul.nav-tabs{position:relative;margin-left:0;margin-right:0}
 .control-tabs.primary > ul.nav-tabs:before,.control-tabs.primary-tabs > ul.nav-tabs:before,.control-tabs.primary > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > ul.nav-tabs:before,.control-tabs.primary > div > div > ul.nav-tabs:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs:before{position:absolute;top:26px;height:1px;width:100%;content:' ';border-bottom:1px solid #d7d7d7}
-.control-tabs.primary > ul.nav-tabs > li,.control-tabs.primary-tabs > ul.nav-tabs > li,.control-tabs.primary > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > ul.nav-tabs > li,.control-tabs.primary > div > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li{padding-right:10px;padding-left:11px;margin-right:0;margin-left:-30px;background:transparent}
-.control-tabs.primary > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > ul.nav-tabs > li:first-child,.control-tabs.primary > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:first-child,.control-tabs.primary > div > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:first-child{margin-left:0;padding-left:15px !important}
+.control-tabs.primary > ul.nav-tabs > li,.control-tabs.primary-tabs > ul.nav-tabs > li,.control-tabs.primary > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > ul.nav-tabs > li,.control-tabs.primary > div > div > ul.nav-tabs > li,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li{padding-right:10px;padding-left:11px;margin-left:0;margin-right:-30px;background:transparent}
+.control-tabs.primary > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > ul.nav-tabs > li:first-child,.control-tabs.primary > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:first-child,.control-tabs.primary > div > div > ul.nav-tabs > li:first-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:first-child{padding-left:15px !important}
+.control-tabs.primary > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > ul.nav-tabs > li:last-child,.control-tabs.primary > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > ul.nav-tabs > li:last-child,.control-tabs.primary > div > div > ul.nav-tabs > li:last-child,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li:last-child{margin-right:0}
 .control-tabs.primary > ul.nav-tabs > li a,.control-tabs.primary-tabs > ul.nav-tabs > li a,.control-tabs.primary > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > ul.nav-tabs > li a,.control-tabs.primary > div > div > ul.nav-tabs > li a,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a{font-size:12px;padding-bottom:3px;padding:0 16px;margin:0;position:relative;z-index:101;background:transparent;overflow:visible}
 .control-tabs.primary > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title{position:relative;display:inline-block;padding:5px 5px 9px 5px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-top:1px solid #f0f0f0;z-index:100}
 .control-tabs.primary > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:before,.control-tabs.primary > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary > div > div > ul.nav-tabs > li a > span.title:after,.control-tabs.primary-tabs > div > div > ul.nav-tabs > li a > span.title:after{content:' ';position:absolute;background:transparent url('images/primary-tab-shape.png') no-repeat left -31px;width:16px;height:26px;display:block;top:-1px;z-index:100}
diff --git a/modules/system/models/MailSettings.php b/modules/system/models/MailSettings.php
index 56bd95acd..767bf63c1 100644
--- a/modules/system/models/MailSettings.php
+++ b/modules/system/models/MailSettings.php
@@ -83,7 +83,8 @@ class MailSettings extends Model
                 }
                 if ($settings->smtp_encryption) {
                     $config->set('mail.encryption', $settings->smtp_encryption);
-                } else {
+                }
+                else {
                     $config->set('mail.encryption', null);
                 }
                 break;

From 6f029426ffbe8203149844714250fc72a1f5eb60 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 29 Aug 2015 18:59:45 +1000
Subject: [PATCH 007/103] Rejigg SMTP fields

---
 .../system/models/mailsettings/fields.yaml    | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/modules/system/models/mailsettings/fields.yaml b/modules/system/models/mailsettings/fields.yaml
index 38f24078e..cec33ac26 100644
--- a/modules/system/models/mailsettings/fields.yaml
+++ b/modules/system/models/mailsettings/fields.yaml
@@ -37,6 +37,25 @@ tabs:
                 field: send_mode
                 condition: value[smtp]
 
+        smtp_port:
+            label: system::lang.mail.smtp_port
+            tab: system::lang.mail.general
+            span: auto
+            trigger:
+                action: show
+                field: send_mode
+                condition: value[smtp]
+
+        smtp_encryption:
+            type: dropdown
+            label: system::lang.mail.smtp_encryption
+            tab: system::lang.mail.general
+            span: auto
+            trigger:
+                action: show
+                field: send_mode
+                condition: value[smtp]
+
         smtp_authorization:
             type: checkbox
             label: system::lang.mail.smtp_authorization
@@ -65,24 +84,6 @@ tabs:
                 field: send_mode
                 condition: value[smtp]
 
-        smtp_port:
-            label: system::lang.mail.smtp_port
-            tab: system::lang.mail.general
-            trigger:
-                action: show
-                field: send_mode
-                condition: value[smtp]
-
-        smtp_encryption:
-            type: dropdown
-            label: system::lang.mail.smtp_encryption
-            tab: system::lang.mail.general
-            span: left
-            trigger:
-                action: show
-                field: send_mode
-                condition: value[smtp]
-
         sendmail_path:
             label: system::lang.mail.sendmail_path
             commentAbove: system::lang.mail.sendmail_path_comment

From ee38c72f04ce3bf921efe551c5dfaf77cdb9ac64 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 29 Aug 2015 20:12:55 +1000
Subject: [PATCH 008/103] Protected properties were once [incorrectly]
 available

---
 modules/backend/behaviors/ImportExportController.php | 3 ++-
 modules/system/behaviors/SettingsModel.php           | 6 +++---
 modules/system/reportwidgets/Status.php              | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index a78a1707f..1663fadf0 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -5,6 +5,7 @@ use Lang;
 use View;
 use Response;
 use Backend;
+use BackendAuth;
 use Backend\Classes\ControllerBehavior;
 use League\Csv\Reader as CsvReader;
 use League\Csv\Writer as CsvWriter;
@@ -620,7 +621,7 @@ class ImportExportController extends ControllerBehavior
     {
         if (
             ($permissions = $this->getConfig($type.'[permissions]')) &&
-            (!$this->controller->user->hasAnyAccess((array) $permissions))
+            (!BackendAuth::getUser()->hasAnyAccess((array) $permissions))
         ) {
             return Response::make(View::make('backend::access_denied'), 403);
         }
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 66f16be11..ac66811fe 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -39,9 +39,9 @@ class SettingsModel extends ModelBehavior
     {
         parent::__construct($model);
 
-        $this->model->table = 'system_settings';
-        $this->model->jsonable = ['value'];
-        $this->model->guarded = [];
+        $this->model->setTable('system_settings');
+        $this->model->jsonable(['value']);
+        $this->model->guard([]);
         $this->model->timestamps = false;
 
         // Option A: (@todo Determine which is faster by benchmark)
diff --git a/modules/system/reportwidgets/Status.php b/modules/system/reportwidgets/Status.php
index be05f9e99..294bed4da 100644
--- a/modules/system/reportwidgets/Status.php
+++ b/modules/system/reportwidgets/Status.php
@@ -1,5 +1,6 @@
 <?php namespace System\ReportWidgets;
 
+use BackendAuth;
 use System\Models\Parameters;
 use System\Classes\UpdateManager;
 use Cms\Models\MaintenanceSettings;
@@ -46,7 +47,7 @@ class Status extends ReportWidgetBase
     {
         $manager = UpdateManager::instance();
         $this->vars['inMaintenance'] = MaintenanceSettings::get('is_enabled');
-        $this->vars['showUpdates'] = $this->controller->user->hasAccess('system.manage_updates');
+        $this->vars['showUpdates'] = BackendAuth::getUser()->hasAccess('system.manage_updates');
         $this->vars['updates'] = $manager->check();
     }
 }

From 24d8cb8f66bd25b8c53f31de09ee24b3dc60d9a3 Mon Sep 17 00:00:00 2001
From: Antony Tsioukas <tsioukas@itvg.gr>
Date: Sat, 29 Aug 2015 15:22:08 +0300
Subject: [PATCH 009/103] Update Greek Language

---
 modules/backend/lang/el/lang.php  |  7 ++++++-
 modules/system/lang/el/client.php | 11 +++++++++--
 modules/system/lang/el/lang.php   | 14 +++++++++++---
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/modules/backend/lang/el/lang.php b/modules/backend/lang/el/lang.php
index b98c8deff..e0b96299f 100644
--- a/modules/backend/lang/el/lang.php
+++ b/modules/backend/lang/el/lang.php
@@ -1,5 +1,5 @@
 <?php
-/* Greek Language Updated on 2015-08-07 v1.04 */
+/* Greek Language Updated on 2015-08-29 v1.05 */
 return [
     'auth' => [
         'title' => 'Περιοχή Διαχείρισης',
@@ -236,6 +236,10 @@ return [
         'unlink_name' => 'Αποσύνδεση :name',
         'unlink_confirm' => 'Είστε σίγουροι;',
     ],
+    'reorder' => [
+        'default_title' => 'Αναδιάταξη εγγραφών',
+        'no_records' => 'Δεν υπάρχουν διαθέσιμες εγγραφές για ταξινόμηση.',
+    ],    
     'model' => [
         'name' => 'Μοντέλο',
         'not_found' => "Η κλάση ':class' του μοντέλου με ID :id δεν μπόρεσε να βρεθεί",
@@ -260,6 +264,7 @@ return [
         'code_folding' => 'Αναδίπλωση κώδικα',
         'word_wrap' => 'Αναδίπλωση κειμένου',
         'highlight_active_line' => 'Επισήμανση ενεργής σειράς',
+        'auto_closing' => 'Αυτόματο κλείσιμο ετικετών και ειδικών χαρακτήρων',
         'show_invisibles' => 'Εμφάνιση αόρατων χαρακτήρων',
         'show_gutter' => 'Εμφάνιση περιθωρίου',
         'theme' => 'Χρωματική απεικόνιση',
diff --git a/modules/system/lang/el/client.php b/modules/system/lang/el/client.php
index d4caf3924..1a130b1cd 100644
--- a/modules/system/lang/el/client.php
+++ b/modules/system/lang/el/client.php
@@ -1,5 +1,5 @@
 <?php
-/* Greek Language Updated on 2015-08-07 v1.00 */
+/* Greek Language Updated on 2015-08-29 v1.01 */
 return [
 
     /*
@@ -39,8 +39,15 @@ return [
         'insert_image' => "Εισαγωγή Εικόνας από τα Μέσα",
         'insert_video' => "Εισαγωγή Βίντεο από τα Μέσα",
         'insert_audio' => "Εισαγωγή Ήχου από τα Μέσα",
-        'invalid_file_empty_insert' => "Παρακαλούμε επιλέξτε αρχείο για να εισάγετε συνδέσμους σε αυτό.",
+        'invalid_file_empty_insert' => "Παρακαλούμε επιλέξτε ένα αρχείο για να εισάγετε συνδέσμους σε αυτό.",
         'invalid_file_single_insert' => "Παρακαλούμε επιλέξτε ένα μοναδικό αρχείο.",
+        'invalid_image_empty_insert' => "Παρακαλούμε επιλέξτε την εικόνα ή τις εικόνες για εισαγωγη.",
+        'invalid_video_empty_insert' => "Παρακαλούμε επιλέξτε ένα αρχείο βίντεο για εισαγωγή.",
+        'invalid_audio_empty_insert' => "Παρακαλούμε επιλέξτε ένα αρχείο ήχου για εισαγωγή.",
     ],
 
+    'alert' => [
+        'confirm_button_text' => 'Εντάξει',
+        'cancel_button_text' => 'Άκυρο',
+    ],
 ];
diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php
index 562f81701..f7cac295e 100644
--- a/modules/system/lang/el/lang.php
+++ b/modules/system/lang/el/lang.php
@@ -1,5 +1,5 @@
 <?php
-/* Greek Language Updated on 2015-07-11 v1.03 */
+/* Greek Language Updated on 2015-08-29 v1.04 */
 return [
     'app' => [
         'name' => 'October CMS',
@@ -8,6 +8,7 @@ return [
     'locale' => [
         'en' => 'Αγγλικά',
         'de' => 'Γερμανικά',
+        'el' => 'Ελληνικά',
         'es' => 'Ισπανικά',
         'es-ar' => 'Ισπανικά (Αργεντινή)',
         'fa' => 'Περσικά',
@@ -27,8 +28,7 @@ return [
         'sk' => 'Σλοβάκικα (Σλοβακία)',
         'tr' => 'Τουρκικά',
         'zh-cn' => 'Κινέζικα (Κίνα)',
-        'zh-tw' => 'Chinese (Taiwan)',
-        'el' => 'Ελληνικά',
+        'zh-tw' => 'Κινέζικα (Ταϊβάν)',
     ],
     'directory' => [
         'create_fail' => 'Δεν είναι δυνατή η δημιουργία του καταλόγου: :name'
@@ -146,6 +146,10 @@ return [
         'smtp_password' => 'Κωδικός',
         'smtp_port' => 'SMTP Port',
         'smtp_ssl' => 'Απαιτείται SSL σύνδεση',
+        'smtp_encryption' => 'Πρωτόκολλο κρυπτογράφησης SMTP',
+        'smtp_encryption_none' => 'Χωρίς κρυπτογράφηση',
+        'smtp_encryption_tls' => 'TLS',
+        'smtp_encryption_ssl' => 'SSL',
         'sendmail' => 'Sendmail',
         'sendmail_path' => 'Διαδρομή Sendmail',
         'sendmail_path_comment' => 'Παρακαλούμε καθορίστε την διαδρομή του λογισμικού Sendmail.',
@@ -170,6 +174,7 @@ return [
         'menu_layouts_label' => 'Πρότυπα Ηλεκτρονικού Ταχυδρομείου',
         'layout' => 'Διάταξη',
         'layouts' => 'Διάταξεις',
+        'no_layout' => '-- Χωρίς διάταξη --',        
         'name' => 'Όνομα',
         'name_comment' => 'Μοναδικό όνομα που χρησιμοποιείται για την αναφορά σε αυτό το πρότυπο',
         'code' => 'Κωδικος',
@@ -183,6 +188,9 @@ return [
         'test_send' => 'Αποστολή δοκιμαστικού μηνύματος',
         'test_success' => 'Το δοκιμαστικό μήνυμα έχει αποσταλεί ευτυχώς.',
         'return' => 'Επιστροφή στην λίστα με τα πρότυπα',
+        'test_confirm' => 'Ένα δοκιμαστικό μήνυμα θα σταλεί στο :email. Συνέχεια;',
+        'saving' => 'Αποθήκευση Προτύπου...',
+        'sending' => 'Αποστολή δοκιμαστικού μηνύματος...',
     ],
     'install' => [
         'project_label' => 'Σύνδεση με το Project',

From 51c7878e8f37cf9d125da4103fb76420d6f401a8 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sun, 30 Aug 2015 11:56:44 +1000
Subject: [PATCH 010/103] Fixes rendering 2 shared component partials nukes
 context

---
 modules/cms/classes/ComponentBase.php | 4 +++-
 modules/cms/classes/Controller.php    | 5 ++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/cms/classes/ComponentBase.php b/modules/cms/classes/ComponentBase.php
index c10230550..4228d0088 100644
--- a/modules/cms/classes/ComponentBase.php
+++ b/modules/cms/classes/ComponentBase.php
@@ -140,7 +140,9 @@ abstract class ComponentBase extends Extendable
     public function renderPartial()
     {
         $this->controller->setComponentContext($this);
-        return call_user_func_array([$this->controller, 'renderPartial'], func_get_args());
+        $result = call_user_func_array([$this->controller, 'renderPartial'], func_get_args());
+        $this->controller->setComponentContext(null);
+        return $result;
     }
 
     /**
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 37b781b00..eff540c21 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -106,7 +106,7 @@ class Controller
     /**
      * @var Cms\Classes\ComponentBase Object of the active component, used internally.
      */
-    protected $componentContext;
+    protected $componentContext = null;
 
     /**
      * @var array Component partial stack, used internally.
@@ -903,7 +903,6 @@ class Controller
         }
 
         $this->vars = $vars;
-        $this->componentContext = null;
         return $result;
     }
 
@@ -1287,7 +1286,7 @@ class Controller
      * @param ComponentBase $component
      * @return void
      */
-    public function setComponentContext(ComponentBase $component)
+    public function setComponentContext(ComponentBase $component = null)
     {
         $this->componentContext = $component;
     }

From 8a28ce4e5f9ca4def8ecf96bcab230fccd983072 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Mon, 31 Aug 2015 17:19:25 +1000
Subject: [PATCH 011/103] Fixes protection level bug

---
 modules/backend/behaviors/UserPreferencesModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/UserPreferencesModel.php b/modules/backend/behaviors/UserPreferencesModel.php
index e5b73d9db..d65b40623 100644
--- a/modules/backend/behaviors/UserPreferencesModel.php
+++ b/modules/backend/behaviors/UserPreferencesModel.php
@@ -27,7 +27,7 @@ class UserPreferencesModel extends SettingsModel
     {
         parent::__construct($model);
 
-        $this->model->table = 'backend_user_preferences';
+        $this->model->setTable('backend_user_preferences');
     }
 
     /**

From 37f7c1d62e478897316b4b115c53b09e3acabb5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20P=C5=82odowski?= <michal.plodowski@gmail.com>
Date: Mon, 31 Aug 2015 20:19:58 +0200
Subject: [PATCH 012/103] Fix #1407

---
 .../relationcontroller/partials/_pivot_form.htm        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm
index 1e356ca42..c27b4d6e5 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_pivot_form.htm
@@ -2,7 +2,7 @@
 
     <?= Form::ajax('onRelationManagePivotUpdate', [
         'data' => ['_relation_field' => $relationField, 'manage_id' => $relationManageId],
-        'data-stripe-load-indicator' => true
+        'data-popup-load-indicator' => true
     ]) ?>
 
         <div class="modal-header">
@@ -23,8 +23,7 @@
             <?php else: ?>
                 <button
                     type="submit"
-                    class="btn btn-primary"
-                    data-dismiss="popup">
+                    class="btn btn-primary">
                     <?= e(trans('backend::lang.relation.update')) ?>
                 </button>
                 <button
@@ -42,7 +41,7 @@
 
     <?= Form::ajax('onRelationManagePivotCreate', [
         'data' => ['_relation_field' => $relationField, 'foreign_id' => $foreignId],
-        'data-stripe-load-indicator' => true
+        'data-popup-load-indicator' => true
     ]) ?>
 
         <div class="modal-header">
@@ -55,8 +54,7 @@
         <div class="modal-footer">
             <button
                 type="submit"
-                class="btn btn-primary"
-                data-dismiss="popup">
+                class="btn btn-primary">
                 <?= e(trans('backend::lang.relation.add')) ?>
             </button>
             <button

From e388c183695c50768d1800631e6d5440fdbfbd24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20P=C5=82odowski?= <michal.plodowski@gmail.com>
Date: Mon, 31 Aug 2015 20:21:50 +0200
Subject: [PATCH 013/103] Added focus on search field when pivot popup opens.

---
 .../behaviors/relationcontroller/partials/_manage_pivot.htm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm
index 57cc1b53a..bda2792b8 100644
--- a/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm
+++ b/modules/backend/behaviors/relationcontroller/partials/_manage_pivot.htm
@@ -38,3 +38,9 @@
         </div>
     <?= Form::close() ?>
 </div>
+<script>
+    setTimeout(
+            function(){ $('#relationManagePivotPopup input.form-control:first').focus() },
+            310
+    )
+</script>
\ No newline at end of file

From 7a2c0eea0788acb372a9e255ae00cfbd5e87c372 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Tue, 1 Sep 2015 19:05:44 +1000
Subject: [PATCH 014/103] Update BS sweet alert to latest, recompile assets

---
 modules/backend/assets/css/october.css        |  3 +-
 modules/backend/assets/js/october-min.js      | 14 +++---
 .../backend/assets/less/controls/alert.less   |  2 +-
 .../assets/vendor/sweet-alert/sweet-alert.js  | 49 ++++++++++++++++---
 .../vendor/sweet-alert/sweet-alert.less       |  5 --
 modules/system/assets/js/lang/lang.el.js      |  2 +-
 6 files changed, 52 insertions(+), 23 deletions(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 874d9d783..c905ac475 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -85,7 +85,6 @@
 .pulseWarningIns{-webkit-animation:pulseWarningIns 0.75s infinite alternate;animation:pulseWarningIns 0.75s infinite alternate}
 .sweet-overlay{background-color:rgba(0,0,0,0.4);position:fixed;left:0;right:0;top:0;bottom:0;display:none;z-index:8050}
 .sweet-alert{background-color:#f9f9f9;width:478px;padding:17px;border-radius:5px;text-align:center;position:fixed;left:50%;top:50%;margin-left:-256px;margin-top:-200px;overflow:hidden;display:none;z-index:9050}
-.sweet-alert h4{margin:30px 0;word-wrap:break-word}
 @media all and (max-width:767px){.sweet-alert{width:auto;margin-left:0;margin-right:0;left:15px;right:15px}
 }
 .sweet-alert .icon{width:80px;height:80px;border:4px solid gray;border-radius:50%;margin:20px auto;position:relative;box-sizing:content-box}
@@ -117,7 +116,7 @@
 .sweet-alert .btn-warning:focus{border-color:#eea236;outline:0}
 .sweet-alert button::-moz-focus-inner{border:0}
 .sweet-alert{text-align:right}
-.sweet-alert h4{word-break:word-break;word-wrap:break-word;max-height:350px;overflow-y:auto;margin:10px 0 17px 0;color:#2b3e50;text-align:left;font-size:15px;line-height:23px}
+.sweet-alert h2{word-break:word-break;word-wrap:break-word;max-height:350px;overflow-y:auto;margin:10px 0 17px 0;color:#2b3e50;text-align:left;font-size:15px;line-height:23px}
 .sweet-alert p{margin:0}
 .sweet-alert p.text-muted{margin-bottom:20px;color:#555555}
 .control-simplelist{font-size:13px}
diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js
index 5b1bf868d..d3a32ec98 100644
--- a/modules/backend/assets/js/october-min.js
+++ b/modules/backend/assets/js/october-min.js
@@ -415,15 +415,15 @@ ratio=py/ih;if(ratio===0){return 1;}else{return ratio;}};drawImageIOSFix=functio
 (e.type==="load"?win:doc)[rem](pre+e.type,init,false);if(!done&&(done=true)){return fn.call(win,e.type||e);}};poll=function(){var e;try{root.doScroll("left");}catch(_error){e=_error;setTimeout(poll,50);return;}
 return init("poll");};if(doc.readyState!=="complete"){if(doc.createEventObject&&root.doScroll){try{top=!win.frameElement;}catch(_error){}
 if(top){poll();}}
-doc[add](pre+"DOMContentLoaded",init,false);doc[add](pre+"readystatechange",init,false);return win[add](pre+"load",init,false);}};Dropzone._autoDiscoverFunction=function(){if(Dropzone.autoDiscover){return Dropzone.discover();}};contentLoaded(window,Dropzone._autoDiscoverFunction);}).call(this);(function(window,document){var modalClass='.sweet-alert',overlayClass='.sweet-overlay',alertTypes=['error','warning','info','success'],defaultParams={title:'',text:'',type:null,allowOutsideClick:false,showCancelButton:false,closeOnConfirm:true,closeOnCancel:true,confirmButtonText:'OK',confirmButtonClass:'btn-primary',cancelButtonText:'Cancel',cancelButtonClass:'btn-default',imageUrl:null,imageSize:null,timer:null};var getModal=function(){return document.querySelector(modalClass);},getOverlay=function(){return document.querySelector(overlayClass);},hasClass=function(elem,className){return new RegExp(' '+className+' ').test(' '+elem.className+' ');},addClass=function(elem,className){if(!hasClass(elem,className)){elem.className+=' '+className;}},removeClass=function(elem,className){var newClass=' '+elem.className.replace(/[\t\r\n]/g,' ')+' ';if(hasClass(elem,className)){while(newClass.indexOf(' '+className+' ')>=0){newClass=newClass.replace(' '+className+' ',' ');}
+doc[add](pre+"DOMContentLoaded",init,false);doc[add](pre+"readystatechange",init,false);return win[add](pre+"load",init,false);}};Dropzone._autoDiscoverFunction=function(){if(Dropzone.autoDiscover){return Dropzone.discover();}};contentLoaded(window,Dropzone._autoDiscoverFunction);}).call(this);(function(window,document){var modalClass='.sweet-alert',overlayClass='.sweet-overlay',alertTypes=['error','warning','info','success'],defaultParams={title:'',text:'',type:null,allowOutsideClick:false,showCancelButton:false,showConfirmButton:true,closeOnConfirm:true,closeOnCancel:true,confirmButtonText:'OK',confirmButtonClass:'btn-primary',cancelButtonText:'Cancel',cancelButtonClass:'btn-default',containerClass:'',titleClass:'',textClass:'',imageUrl:null,imageSize:null,timer:null};var getModal=function(){return document.querySelector(modalClass);},getOverlay=function(){return document.querySelector(overlayClass);},hasClass=function(elem,className){return new RegExp(' '+className+' ').test(' '+elem.className+' ');},addClass=function(elem,className){if(className&&!hasClass(elem,className)){elem.className+=' '+className;}},removeClass=function(elem,className){var newClass=' '+elem.className.replace(/[\t\r\n]/g,' ')+' ';if(hasClass(elem,className)){while(newClass.indexOf(' '+className+' ')>=0){newClass=newClass.replace(' '+className+' ',' ');}
 elem.className=newClass.replace(/^\s+|\s+$/g,'');}},escapeHtml=function(str){var div=document.createElement('div');div.appendChild(document.createTextNode(str));return div.innerHTML;},_show=function(elem){elem.style.opacity='';elem.style.display='block';},show=function(elems){if(elems&&!elems.length){return _show(elems);}
 for(var i=0;i<elems.length;++i){_show(elems[i]);}},_hide=function(elem){elem.style.opacity='';elem.style.display='none';},hide=function(elems){if(elems&&!elems.length){return _hide(elems);}
 for(var i=0;i<elems.length;++i){_hide(elems[i]);}},isDescendant=function(parent,child){var node=child.parentNode;while(node!==null){if(node===parent){return true;}
 node=node.parentNode;}
-return false;},getTopMargin=function(elem){elem.style.left='-9999px';elem.style.display='block';var height=elem.clientHeight;var padding=parseInt(getComputedStyle(elem).getPropertyValue('padding'),10);elem.style.left='';elem.style.display='none';return('-'+parseInt(height/2+padding)+'px');},fadeIn=function(elem,interval){if(+elem.style.opacity<1){interval=interval||16;elem.style.opacity=0;elem.style.display='block';var last=+new Date();var tick=function(){elem.style.opacity=+elem.style.opacity+(new Date()-last)/100;last=+new Date();if(+elem.style.opacity<1){setTimeout(tick,interval);}};tick();}},fadeOut=function(elem,interval){interval=interval||16;elem.style.opacity=1;var last=+new Date();var tick=function(){elem.style.opacity=+elem.style.opacity-(new Date()-last)/100;last=+new Date();if(+elem.style.opacity>0){setTimeout(tick,interval);}else{elem.style.display='none';}};tick();},fireClick=function(node){if(MouseEvent){var mevt=new MouseEvent('click',{view:window,bubbles:false,cancelable:true});node.dispatchEvent(mevt);}else if(document.createEvent){var evt=document.createEvent('MouseEvents');evt.initEvent('click',false,false);node.dispatchEvent(evt);}else if(document.createEventObject){node.fireEvent('onclick');}else if(typeof node.onclick==='function'){node.onclick();}},stopEventPropagation=function(e){if(typeof e.stopPropagation==='function'){e.stopPropagation();e.preventDefault();}else if(window.event&&window.event.hasOwnProperty('cancelBubble')){window.event.cancelBubble=true;}};var previousActiveElement,previousDocumentClick,previousWindowKeyDown,lastFocusedButton;window.sweetAlertInitialize=function(){var sweetHTML='<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <div class="icon custom"></div> <h4>Title</h4><p class="text-muted">Text</p><p><button class="cancel btn" tabIndex="2">Cancel</button> <button class="confirm btn" tabIndex="1">OK</button></p></div>',sweetWrap=document.createElement('div');sweetWrap.innerHTML=sweetHTML;document.body.appendChild(sweetWrap);}
+return false;},getTopMargin=function(elem){elem.style.left='-9999px';elem.style.display='block';var height=elem.clientHeight;var padding=parseInt(getComputedStyle(elem).getPropertyValue('padding'),10);elem.style.left='';elem.style.display='none';return('-'+parseInt(height/2+padding)+'px');},fadeIn=function(elem,interval){if(+elem.style.opacity<1){interval=interval||16;elem.style.opacity=0;elem.style.display='block';var last=+new Date();var tick=function(){elem.style.opacity=+elem.style.opacity+(new Date()-last)/100;last=+new Date();if(+elem.style.opacity<1){setTimeout(tick,interval);}};tick();}},fadeOut=function(elem,interval){interval=interval||16;elem.style.opacity=1;var last=+new Date();var tick=function(){elem.style.opacity=+elem.style.opacity-(new Date()-last)/100;last=+new Date();if(+elem.style.opacity>0){setTimeout(tick,interval);}else{elem.style.display='none';}};tick();},fireClick=function(node){if(MouseEvent){var mevt=new MouseEvent('click',{view:window,bubbles:false,cancelable:true});node.dispatchEvent(mevt);}else if(document.createEvent){var evt=document.createEvent('MouseEvents');evt.initEvent('click',false,false);node.dispatchEvent(evt);}else if(document.createEventObject){node.fireEvent('onclick');}else if(typeof node.onclick==='function'){node.onclick();}},stopEventPropagation=function(e){if(typeof e.stopPropagation==='function'){e.stopPropagation();e.preventDefault();}else if(window.event&&window.event.hasOwnProperty('cancelBubble')){window.event.cancelBubble=true;}};var previousActiveElement,previousDocumentClick,previousWindowKeyDown,lastFocusedButton;window.sweetAlertInitialize=function(){var sweetHTML='<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <div class="icon custom"></div> <h2>Title</h2><p class="lead text-muted">Text</p><p><button class="cancel btn" tabIndex="2">Cancel</button> <button class="confirm btn" tabIndex="1">OK</button></p></div>',sweetWrap=document.createElement('div');sweetWrap.innerHTML=sweetHTML;document.body.appendChild(sweetWrap);}
 window.sweetAlert=window.swal=function(){if(arguments[0]===undefined){window.console.error('sweetAlert expects at least 1 attribute!');return false;}
 var params=extend({},defaultParams);switch(typeof arguments[0]){case'string':params.title=arguments[0];params.text=arguments[1]||'';params.type=arguments[2]||'';break;case'object':if(arguments[0].title===undefined){window.console.error('Missing "title" argument!');return false;}
-params.title=arguments[0].title;params.text=arguments[0].text||defaultParams.text;params.type=arguments[0].type||defaultParams.type;params.allowOutsideClick=arguments[0].allowOutsideClick||defaultParams.allowOutsideClick;params.showCancelButton=arguments[0].showCancelButton!==undefined?arguments[0].showCancelButton:defaultParams.showCancelButton;params.closeOnConfirm=arguments[0].closeOnConfirm!==undefined?arguments[0].closeOnConfirm:defaultParams.closeOnConfirm;params.closeOnCancel=arguments[0].closeOnCancel!==undefined?arguments[0].closeOnCancel:defaultParams.closeOnCancel;params.timer=arguments[0].timer||defaultParams.timer;params.confirmButtonText=(defaultParams.showCancelButton)?'Confirm':defaultParams.confirmButtonText;params.confirmButtonText=arguments[0].confirmButtonText||defaultParams.confirmButtonText;params.confirmButtonClass=arguments[0].confirmButtonClass||defaultParams.confirmButtonClass;params.cancelButtonText=arguments[0].cancelButtonText||defaultParams.cancelButtonText;params.cancelButtonClass=arguments[0].cancelButtonClass||defaultParams.cancelButtonClass;params.imageUrl=arguments[0].imageUrl||defaultParams.imageUrl;params.imageSize=arguments[0].imageSize||defaultParams.imageSize;params.doneFunction=arguments[1]||null;break;default:window.console.error('Unexpected type of argument! Expected "string" or "object", got '+typeof arguments[0]);return false;}
+params.title=arguments[0].title;params.text=arguments[0].text||defaultParams.text;params.type=arguments[0].type||defaultParams.type;params.allowOutsideClick=arguments[0].allowOutsideClick||defaultParams.allowOutsideClick;params.showCancelButton=arguments[0].showCancelButton!==undefined?arguments[0].showCancelButton:defaultParams.showCancelButton;params.showConfirmButton=arguments[0].showConfirmButton!==undefined?arguments[0].showConfirmButton:defaultParams.showConfirmButton;params.closeOnConfirm=arguments[0].closeOnConfirm!==undefined?arguments[0].closeOnConfirm:defaultParams.closeOnConfirm;params.closeOnCancel=arguments[0].closeOnCancel!==undefined?arguments[0].closeOnCancel:defaultParams.closeOnCancel;params.timer=arguments[0].timer||defaultParams.timer;params.confirmButtonText=(defaultParams.showCancelButton)?'Confirm':defaultParams.confirmButtonText;params.confirmButtonText=arguments[0].confirmButtonText||defaultParams.confirmButtonText;params.confirmButtonClass=arguments[0].confirmButtonClass||(arguments[0].type?'btn-'+arguments[0].type:null)||defaultParams.confirmButtonClass;params.cancelButtonText=arguments[0].cancelButtonText||defaultParams.cancelButtonText;params.cancelButtonClass=arguments[0].cancelButtonClass||defaultParams.cancelButtonClass;params.containerClass=arguments[0].containerClass||defaultParams.containerClass;params.titleClass=arguments[0].titleClass||defaultParams.titleClass;params.textClass=arguments[0].textClass||defaultParams.textClass;params.imageUrl=arguments[0].imageUrl||defaultParams.imageUrl;params.imageSize=arguments[0].imageSize||defaultParams.imageSize;params.doneFunction=arguments[1]||null;break;default:window.console.error('Unexpected type of argument! Expected "string" or "object", got '+typeof arguments[0]);return false;}
 setParameters(params);fixVerticalPosition();openModal();var modal=getModal();var onButtonEvent=function(e){var target=e.target||e.srcElement,targetedConfirm=(target.className.indexOf('confirm')>-1),modalIsVisible=hasClass(modal,'visible'),doneFunctionExists=(params.doneFunction&&modal.getAttribute('data-has-done-function')==='true');switch(e.type){case("click"):if(targetedConfirm&&doneFunctionExists&&modalIsVisible){params.doneFunction(true);if(params.closeOnConfirm){closeModal();}}else if(doneFunctionExists&&modalIsVisible){var functionAsStr=String(params.doneFunction).replace(/\s/g,'');var functionHandlesCancel=functionAsStr.substring(0,9)==="function("&&functionAsStr.substring(9,10)!==")";if(functionHandlesCancel){params.doneFunction(false);}
 if(params.closeOnCancel){closeModal();}}else{closeModal();}
 break;}};var $buttons=modal.querySelectorAll('button');for(var i=0;i<$buttons.length;i++){$buttons[i].onclick=onButtonEvent;}
@@ -437,17 +437,19 @@ if(modalIsVisible){var btnIndex=-1;if($focusElement!==null){for(var i=0;i<$modal
 if(btnIndex===-1){$targetElement.focus();}}else{lastFocusedButton=$targetElement;}}}
 $okButton.onblur=handleOnBlur;$cancelButton.onblur=handleOnBlur;window.onfocus=function(){window.setTimeout(function(){if(lastFocusedButton!==undefined){lastFocusedButton.focus();lastFocusedButton=undefined;}},0);};};window.swal.setDefaults=function(userParams){if(!userParams){throw new Error('userParams is required');}
 if(typeof userParams!=='object'){throw new Error('userParams has to be a object');}
-extend(defaultParams,userParams);};function setParameters(params){var modal=getModal();var $title=modal.querySelector('h4'),$text=modal.querySelector('p'),$cancelBtn=modal.querySelector('button.cancel'),$confirmBtn=modal.querySelector('button.confirm');$title.innerHTML=escapeHtml(params.title).split("\n").join("<br>");$text.innerHTML=escapeHtml(params.text||'').split("\n").join("<br>");if(params.text){show($text);}
+extend(defaultParams,userParams);};window.swal.close=function(){closeModal();}
+function setParameters(params){var modal=getModal();var $title=modal.querySelector('h2'),$text=modal.querySelector('p'),$cancelBtn=modal.querySelector('button.cancel'),$confirmBtn=modal.querySelector('button.confirm');$title.innerHTML=escapeHtml(params.title).split("\n").join("<br>");$text.innerHTML=escapeHtml(params.text||'').split("\n").join("<br>");if(params.text){show($text);}
 hide(modal.querySelectorAll('.icon'));if(params.type){var validType=false;for(var i=0;i<alertTypes.length;i++){if(params.type===alertTypes[i]){validType=true;break;}}
 if(!validType){window.console.error('Unknown alert type: '+params.type);return false;}
 var $icon=modal.querySelector('.icon.'+params.type);show($icon);switch(params.type){case"success":addClass($icon,'animate');addClass($icon.querySelector('.tip'),'animateSuccessTip');addClass($icon.querySelector('.long'),'animateSuccessLong');break;case"error":addClass($icon,'animateErrorIcon');addClass($icon.querySelector('.x-mark'),'animateXMark');break;case"warning":addClass($icon,'pulseWarning');addClass($icon.querySelector('.body'),'pulseWarningIns');addClass($icon.querySelector('.dot'),'pulseWarningIns');break;}}
 if(params.imageUrl){var $customIcon=modal.querySelector('.icon.custom');$customIcon.style.backgroundImage='url('+params.imageUrl+')';show($customIcon);var _imgWidth=80,_imgHeight=80;if(params.imageSize){var imgWidth=params.imageSize.split('x')[0];var imgHeight=params.imageSize.split('x')[1];if(!imgWidth||!imgHeight){window.console.error("Parameter imageSize expects value with format WIDTHxHEIGHT, got "+params.imageSize);}else{_imgWidth=imgWidth;_imgHeight=imgHeight;$customIcon.css({'width':imgWidth+'px','height':imgHeight+'px'});}}
 $customIcon.setAttribute('style',$customIcon.getAttribute('style')+'width:'+_imgWidth+'px; height:'+_imgHeight+'px');}
 modal.setAttribute('data-has-cancel-button',params.showCancelButton);if(params.showCancelButton){$cancelBtn.style.display='inline-block';}else{hide($cancelBtn);}
+modal.setAttribute('data-has-confirm-button',params.showConfirmButton);if(params.showConfirmButton){$confirmBtn.style.display='inline-block';}else{hide($confirmBtn);}
 if(params.cancelButtonText){$cancelBtn.innerHTML=escapeHtml(params.cancelButtonText);}
 if(params.confirmButtonText){$confirmBtn.innerHTML=escapeHtml(params.confirmButtonText);}
 $confirmBtn.className='confirm btn'
-addClass($confirmBtn,params.confirmButtonClass);addClass($cancelBtn,params.cancelButtonClass);modal.setAttribute('data-allow-ouside-click',params.allowOutsideClick);var hasDoneFunction=(params.doneFunction)?true:false;modal.setAttribute('data-has-done-function',hasDoneFunction);modal.setAttribute('data-timer',params.timer);}
+addClass(modal,params.containerClass);addClass($confirmBtn,params.confirmButtonClass);addClass($cancelBtn,params.cancelButtonClass);addClass($title,params.titleClass);addClass($text,params.textClass);modal.setAttribute('data-allow-ouside-click',params.allowOutsideClick);var hasDoneFunction=(params.doneFunction)?true:false;modal.setAttribute('data-has-done-function',hasDoneFunction);modal.setAttribute('data-timer',params.timer);}
 function colorLuminance(hex,lum){hex=String(hex).replace(/[^0-9a-f]/gi,'');if(hex.length<6){hex=hex[0]+hex[0]+hex[1]+hex[1]+hex[2]+hex[2];}
 lum=lum||0;var rgb="#",c,i;for(i=0;i<3;i++){c=parseInt(hex.substr(i*2,2),16);c=Math.round(Math.min(Math.max(0,c+(c*lum)),255)).toString(16);rgb+=("00"+c).substr(c.length);}
 return rgb;}
@@ -459,7 +461,7 @@ function openModal(){var modal=getModal();fadeIn(getOverlay(),10);show(modal);ad
 function closeModal(){var modal=getModal();fadeOut(getOverlay(),5);fadeOut(modal,5);removeClass(modal,'showSweetAlert');addClass(modal,'hideSweetAlert');removeClass(modal,'visible');var $successIcon=modal.querySelector('.icon.success');removeClass($successIcon,'animate');removeClass($successIcon.querySelector('.tip'),'animateSuccessTip');removeClass($successIcon.querySelector('.long'),'animateSuccessLong');var $errorIcon=modal.querySelector('.icon.error');removeClass($errorIcon,'animateErrorIcon');removeClass($errorIcon.querySelector('.x-mark'),'animateXMark');var $warningIcon=modal.querySelector('.icon.warning');removeClass($warningIcon,'pulseWarning');removeClass($warningIcon.querySelector('.body'),'pulseWarningIns');removeClass($warningIcon.querySelector('.dot'),'pulseWarningIns');window.onkeydown=previousWindowKeyDown;document.onclick=previousDocumentClick;if(previousActiveElement){previousActiveElement.focus();}
 lastFocusedButton=undefined;}
 function fixVerticalPosition(){var modal=getModal();modal.style.marginTop=getTopMargin(getModal());}
-(function(){if(document.readyState==="complete"||document.readyState==="interactive"&&document.body){sweetAlertInitialize();}else{if(document.addEventListener){document.addEventListener('DOMContentLoaded',function factorial(){document.removeEventListener('DOMContentLoaded',arguments.callee,false);sweetAlertInitialize();},false);}else if(document.attachEvent){document.attachEvent('onreadystatechange',function(){if(document.readyState==='complete'){document.detachEvent('onreadystatechange',arguments.callee);sweetAlertInitialize();}});}}})();})(window,document);(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,_ua=navigator.userAgent.toLowerCase(),is_msie=/msie/.test(_ua),ie6mode=/msie [1-6]\./.test(_ua);function px(n){return Math.round(n)+'px';}
+(function(){if(document.readyState==="complete"||document.readyState==="interactive"&&document.body){sweetAlertInitialize();}else{if(document.addEventListener){document.addEventListener('DOMContentLoaded',function handler(){document.removeEventListener('DOMContentLoaded',handler,false);sweetAlertInitialize();},false);}else if(document.attachEvent){document.attachEvent('onreadystatechange',function handler(){if(document.readyState==='complete'){document.detachEvent('onreadystatechange',handler);sweetAlertInitialize();}});}}})();})(window,document);(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,_ua=navigator.userAgent.toLowerCase(),is_msie=/msie/.test(_ua),ie6mode=/msie [1-6]\./.test(_ua);function px(n){return Math.round(n)+'px';}
 function cssClass(cl){return options.baseClass+'-'+cl;}
 function supportsColorFade(){return $.fx.step.hasOwnProperty('backgroundColor');}
 function getPos(obj)
diff --git a/modules/backend/assets/less/controls/alert.less b/modules/backend/assets/less/controls/alert.less
index 66ff9c66d..406d2a5bb 100644
--- a/modules/backend/assets/less/controls/alert.less
+++ b/modules/backend/assets/less/controls/alert.less
@@ -6,7 +6,7 @@
 .sweet-alert {
     text-align: right;
 
-    h4 {
+    h2 {
         word-break: word-break;
         word-wrap: break-word;
         max-height: 350px;
diff --git a/modules/backend/assets/vendor/sweet-alert/sweet-alert.js b/modules/backend/assets/vendor/sweet-alert/sweet-alert.js
index 7fff82223..77505356c 100644
--- a/modules/backend/assets/vendor/sweet-alert/sweet-alert.js
+++ b/modules/backend/assets/vendor/sweet-alert/sweet-alert.js
@@ -12,12 +12,16 @@
         type: null,
         allowOutsideClick: false,
         showCancelButton: false,
+        showConfirmButton: true,
         closeOnConfirm: true,
         closeOnCancel: true,
         confirmButtonText: 'OK',
         confirmButtonClass: 'btn-primary',
         cancelButtonText: 'Cancel',
         cancelButtonClass: 'btn-default',
+        containerClass: '',
+        titleClass: '',
+        textClass: '',
         imageUrl: null,
         imageSize: null,
         timer: null
@@ -38,7 +42,7 @@
       return new RegExp(' ' + className + ' ').test(' ' + elem.className + ' ');
     },
     addClass = function(elem, className) {
-      if (!hasClass(elem, className)) {
+      if (className && !hasClass(elem, className)) {
         elem.className += ' ' + className;
       }
     },
@@ -177,7 +181,7 @@
    */
 
   window.sweetAlertInitialize = function() {
-    var sweetHTML = '<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <div class="icon custom"></div> <h4>Title</h4><p class="text-muted">Text</p><p><button class="cancel btn" tabIndex="2">Cancel</button> <button class="confirm btn" tabIndex="1">OK</button></p></div>',
+    var sweetHTML = '<div class="sweet-overlay" tabIndex="-1"></div><div class="sweet-alert" tabIndex="-1"><div class="icon error"><span class="x-mark"><span class="line left"></span><span class="line right"></span></span></div><div class="icon warning"> <span class="body"></span> <span class="dot"></span> </div> <div class="icon info"></div> <div class="icon success"> <span class="line tip"></span> <span class="line long"></span> <div class="placeholder"></div> <div class="fix"></div> </div> <div class="icon custom"></div> <h2>Title</h2><p class="lead text-muted">Text</p><p><button class="cancel btn" tabIndex="2">Cancel</button> <button class="confirm btn" tabIndex="1">OK</button></p></div>',
         sweetWrap = document.createElement('div');
 
     sweetWrap.innerHTML = sweetHTML;
@@ -227,6 +231,7 @@
         params.type               = arguments[0].type || defaultParams.type;
         params.allowOutsideClick  = arguments[0].allowOutsideClick || defaultParams.allowOutsideClick;
         params.showCancelButton   = arguments[0].showCancelButton !== undefined ? arguments[0].showCancelButton : defaultParams.showCancelButton;
+        params.showConfirmButton  = arguments[0].showConfirmButton !== undefined ? arguments[0].showConfirmButton : defaultParams.showConfirmButton;
         params.closeOnConfirm     = arguments[0].closeOnConfirm !== undefined ? arguments[0].closeOnConfirm : defaultParams.closeOnConfirm;
         params.closeOnCancel      = arguments[0].closeOnCancel !== undefined ? arguments[0].closeOnCancel : defaultParams.closeOnCancel;
         params.timer              = arguments[0].timer || defaultParams.timer;
@@ -234,9 +239,12 @@
         // Show "Confirm" instead of "OK" if cancel button is visible
         params.confirmButtonText  = (defaultParams.showCancelButton) ? 'Confirm' : defaultParams.confirmButtonText;
         params.confirmButtonText  = arguments[0].confirmButtonText || defaultParams.confirmButtonText;
-        params.confirmButtonClass = arguments[0].confirmButtonClass || defaultParams.confirmButtonClass;
+        params.confirmButtonClass = arguments[0].confirmButtonClass || (arguments[0].type ? 'btn-' + arguments[0].type : null) || defaultParams.confirmButtonClass;
         params.cancelButtonText   = arguments[0].cancelButtonText || defaultParams.cancelButtonText;
         params.cancelButtonClass  = arguments[0].cancelButtonClass || defaultParams.cancelButtonClass;
+        params.containerClass     = arguments[0].containerClass || defaultParams.containerClass;
+        params.titleClass         = arguments[0].titleClass || defaultParams.titleClass;
+        params.textClass          = arguments[0].textClass || defaultParams.textClass;
         params.imageUrl           = arguments[0].imageUrl || defaultParams.imageUrl;
         params.imageSize          = arguments[0].imageSize || defaultParams.imageSize;
         params.doneFunction       = arguments[1] || null;
@@ -449,6 +457,13 @@
     extend(defaultParams, userParams);
   };
 
+  /**
+   * Closes the current modal
+   */
+  window.swal.close = function() {
+    closeModal();
+  }
+
   /*
    * Set type, text and actions on modal
    */
@@ -456,7 +471,7 @@
   function setParameters(params) {
     var modal = getModal();
 
-    var $title = modal.querySelector('h4'),
+    var $title = modal.querySelector('h2'),
         $text = modal.querySelector('p'),
         $cancelBtn = modal.querySelector('button.cancel'),
         $confirmBtn = modal.querySelector('button.confirm');
@@ -543,6 +558,15 @@
     } else {
       hide($cancelBtn);
     }
+    
+    // Confirm button
+    modal.setAttribute('data-has-confirm-button', params.showConfirmButton);
+    if (params.showConfirmButton) {
+      $confirmBtn.style.display = 'inline-block';
+    } else {
+      hide($confirmBtn);
+    }
+    
 
     // Edit text on cancel and confirm buttons
     if (params.cancelButtonText) {
@@ -555,12 +579,21 @@
     // Reset confirm buttons to default class (Ugly fix)
     $confirmBtn.className = 'confirm btn'
 
+    // Attach selected class to the sweet alert modal
+    addClass(modal, params.containerClass);
+
     // Set confirm button to selected class
     addClass($confirmBtn, params.confirmButtonClass);
 
     // Set cancel button to selected class
     addClass($cancelBtn, params.cancelButtonClass);
 
+    // Set title to selected class
+    addClass($title, params.titleClass);
+
+    // Set text to selected class
+    addClass($text, params.textClass);
+
     // Allow outside click?
     modal.setAttribute('data-allow-ouside-click', params.allowOutsideClick);
 
@@ -700,14 +733,14 @@
       sweetAlertInitialize();
     } else {
       if (document.addEventListener) {
-        document.addEventListener('DOMContentLoaded', function factorial() {
-          document.removeEventListener('DOMContentLoaded', arguments.callee, false);
+        document.addEventListener('DOMContentLoaded', function handler() {
+          document.removeEventListener('DOMContentLoaded', handler, false);
           sweetAlertInitialize();
         }, false);
       } else if (document.attachEvent) {
-        document.attachEvent('onreadystatechange', function() {
+        document.attachEvent('onreadystatechange', function handler() {
           if (document.readyState === 'complete') {
-            document.detachEvent('onreadystatechange', arguments.callee);
+            document.detachEvent('onreadystatechange', handler);
             sweetAlertInitialize();
           }
         });
diff --git a/modules/backend/assets/vendor/sweet-alert/sweet-alert.less b/modules/backend/assets/vendor/sweet-alert/sweet-alert.less
index 9bb86ccf5..7dc68eefb 100644
--- a/modules/backend/assets/vendor/sweet-alert/sweet-alert.less
+++ b/modules/backend/assets/vendor/sweet-alert/sweet-alert.less
@@ -37,11 +37,6 @@
   display: none;
   z-index: @zindex-modal + 8000;
 
-  h4 {
-    margin: 30px 0;
-    word-wrap: break-word;
-  }
-
   @media all and (max-width: @screen-xs-max) {
     width: auto;
     margin-left: 0;
diff --git a/modules/system/assets/js/lang/lang.el.js b/modules/system/assets/js/lang/lang.el.js
index 0d0f2d30a..ff151fe24 100644
--- a/modules/system/assets/js/lang/lang.el.js
+++ b/modules/system/assets/js/lang/lang.el.js
@@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
 $.oc.langMessages['el'] = $.extend(
     $.oc.langMessages['el'] || {},
-    {"markdowneditor":{"formatting":"\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7","quote":"\u03a0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7","code":"\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2","header1":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1","header2":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2","header3":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3","header4":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4","header5":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5","header6":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6","bold":"\u0388\u03bd\u03c4\u03bf\u03bd\u03b1","italic":"\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac","unorderedlist":"\u039c\u03b7 \u03c4\u03b1\u03be\u03b9\u03bd\u03bf\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1","orderedlist":"\u03a4\u03b1\u03be\u03b9\u03bd\u03bf\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1","video":"\u0392\u03af\u03bd\u03c4\u03b5\u03bf","image":"\u0395\u03b9\u03ba\u03cc\u03bd\u03b1","link":"\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2","horizontalrule":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1\u03c2 \u0393\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2","fullscreen":"\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7","preview":"\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7"},"mediamanager":{"insert_link":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03a3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5 \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","insert_image":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","insert_video":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","insert_audio":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u0389\u03c7\u03bf\u03c5 \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","invalid_file_empty_insert":"\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03b5\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5\u03c2 \u03c3\u03b5 \u03b1\u03c5\u03c4\u03cc.","invalid_file_single_insert":"\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03bc\u03bf\u03bd\u03b1\u03b4\u03b9\u03ba\u03cc \u03b1\u03c1\u03c7\u03b5\u03af\u03bf.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel"}}
+    {"markdowneditor":{"formatting":"\u039c\u03bf\u03c1\u03c6\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7","quote":"\u03a0\u03b1\u03c1\u03ac\u03b8\u03b5\u03c3\u03b7","code":"\u039a\u03ce\u03b4\u03b9\u03ba\u03b1\u03c2","header1":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 1","header2":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 2","header3":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 3","header4":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 4","header5":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 5","header6":"\u039a\u03b5\u03c6\u03b1\u03bb\u03af\u03b4\u03b1 6","bold":"\u0388\u03bd\u03c4\u03bf\u03bd\u03b1","italic":"\u0399\u03c4\u03b1\u03bb\u03b9\u03ba\u03ac","unorderedlist":"\u039c\u03b7 \u03c4\u03b1\u03be\u03b9\u03bd\u03bf\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1","orderedlist":"\u03a4\u03b1\u03be\u03b9\u03bd\u03bf\u03bc\u03b7\u03bc\u03ad\u03bd\u03b7 \u03bb\u03af\u03c3\u03c4\u03b1","video":"\u0392\u03af\u03bd\u03c4\u03b5\u03bf","image":"\u0395\u03b9\u03ba\u03cc\u03bd\u03b1","link":"\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03bc\u03bf\u03c2","horizontalrule":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u039f\u03c1\u03b9\u03b6\u03cc\u03bd\u03c4\u03b9\u03b1\u03c2 \u0393\u03c1\u03b1\u03bc\u03bc\u03ae\u03c2","fullscreen":"\u03a0\u03bb\u03ae\u03c1\u03b7\u03c2 \u03bf\u03b8\u03cc\u03bd\u03b7","preview":"\u03a0\u03c1\u03bf\u03b5\u03c0\u03b9\u03c3\u03ba\u03cc\u03c0\u03b7\u03c3\u03b7"},"mediamanager":{"insert_link":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u03a3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5 \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","insert_image":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u0395\u03b9\u03ba\u03cc\u03bd\u03b1\u03c2 \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","insert_video":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u0392\u03af\u03bd\u03c4\u03b5\u03bf \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","insert_audio":"\u0395\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae \u0389\u03c7\u03bf\u03c5 \u03b1\u03c0\u03cc \u03c4\u03b1 \u039c\u03ad\u03c3\u03b1","invalid_file_empty_insert":"\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03b5\u03b9\u03c3\u03ac\u03b3\u03b5\u03c4\u03b5 \u03c3\u03c5\u03bd\u03b4\u03ad\u03c3\u03bc\u03bf\u03c5\u03c2 \u03c3\u03b5 \u03b1\u03c5\u03c4\u03cc.","invalid_file_single_insert":"\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03bc\u03bf\u03bd\u03b1\u03b4\u03b9\u03ba\u03cc \u03b1\u03c1\u03c7\u03b5\u03af\u03bf.","invalid_image_empty_insert":"\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03b9\u03ba\u03cc\u03bd\u03b1 \u03ae \u03c4\u03b9\u03c2 \u03b5\u03b9\u03ba\u03cc\u03bd\u03b5\u03c2 \u03b3\u03b9\u03b1 \u03b5\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03b7.","invalid_video_empty_insert":"\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b2\u03af\u03bd\u03c4\u03b5\u03bf \u03b3\u03b9\u03b1 \u03b5\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae.","invalid_audio_empty_insert":"\u03a0\u03b1\u03c1\u03b1\u03ba\u03b1\u03bb\u03bf\u03cd\u03bc\u03b5 \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ae\u03c7\u03bf\u03c5 \u03b3\u03b9\u03b1 \u03b5\u03b9\u03c3\u03b1\u03b3\u03c9\u03b3\u03ae."},"alert":{"confirm_button_text":"\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9","cancel_button_text":"\u0386\u03ba\u03c5\u03c1\u03bf"}}
 );
\ No newline at end of file

From 2619de0ae7aa5b2d5d342bc989b2f1bc34bd8922 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 2 Sep 2015 17:28:22 +1000
Subject: [PATCH 015/103] Fixes bug in valueFrom when relation is null

---
 modules/backend/widgets/Lists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index cc885e953..4fb6d9949 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -767,7 +767,7 @@ class Lists extends WidgetBase
                 $value = implode(', ', $record->{$columnName}->lists($column->valueFrom));
             }
             elseif ($this->isColumnRelated($column) || $this->isColumnPivot($column)) {
-                $value = $record->{$columnName}->{$column->valueFrom};
+                $value = $record->{$columnName} ? $record->{$columnName}->{$column->valueFrom} : null;
             }
             else {
                 $value = null;

From 6511f0404e7cd48449e1fd8345fc51a3ac6105c7 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 2 Sep 2015 17:30:03 +1000
Subject: [PATCH 016/103] Document row classes and add status column example

---
 modules/system/assets/ui/docs/icon.md |  6 +++
 modules/system/assets/ui/docs/list.md | 75 +++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/modules/system/assets/ui/docs/icon.md b/modules/system/assets/ui/docs/icon.md
index 4c5d9b441..ade8f7845 100644
--- a/modules/system/assets/ui/docs/icon.md
+++ b/modules/system/assets/ui/docs/icon.md
@@ -10,6 +10,12 @@ Place Font Autumn icons just about anywhere with the `<i>` tag.
         <i class="icon-camera-retro"></i> icon-camera-retro
     </div>
 
+You can also inject an icon to an existing element using the `oc-` prefix.
+
+    <div style="font-size: 24px;">
+        <span class="oc-icon-flag-checkered">You win!</span>
+    </div>
+
 > **Note**: Icon classes are echoed via CSS :before.
 
 ### With buttons
diff --git a/modules/system/assets/ui/docs/list.md b/modules/system/assets/ui/docs/list.md
index 22bc10a52..1285c48f6 100644
--- a/modules/system/assets/ui/docs/list.md
+++ b/modules/system/assets/ui/docs/list.md
@@ -171,4 +171,79 @@ Lists are responsive by default and will collapse at a breakpoint of `980px`. Th
                 </tr>
             </tfoot>
         </table>
+    </div>
+
+### Row classes
+
+The following classes are available to use on the table row elements.
+
+    <div class="control-list list-unresponsive">
+        <table class="table data">
+            <thead>
+                <tr>
+                    <th class="sort-desc"><a href="/">Class</a></th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr><td>Normal text</td></tr>
+                <tr class="hidden"><td>.hidden</td></tr>
+                <tr class="strike"><td>.strike</td></tr>
+                <tr class="frozen"><td>.frozen</td></tr>
+                <tr class="processing"><td>.processing</td></tr>
+                <tr class="negative"><td>.negative</td></tr>
+                <tr class="positive"><td>.positive</td></tr>
+                <tr class="disabled"><td>.disabled / .deleted</td></tr>
+                <tr class="new"><td>.new / .important</td></tr>
+                <tr class="safe"><td>.safe / .special</td></tr>
+            </tbody>
+        </table>
+    </div>
+
+### Status column
+
+It might be fun to include a status column!
+
+    <div class="control-list list-unresponsive">
+        <table class="table data">
+            <thead>
+                <tr>
+                    <th style="width: 150px"><span>Status</span></th>
+                    <th class="active sort-asc"><a href="/">Title</a></th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>
+                        <span class="oc-icon-circle text-muted">
+                            Draft
+                        </span>
+                    </td>
+                    <td>Welcome to October</td>
+                </tr>
+                <tr>
+                    <td>
+                        <span class="oc-icon-circle text-info">
+                            Pending
+                        </span>
+                    </td>
+                    <td>What a wonderful day</td>
+                </tr>
+                <tr>
+                    <td>
+                        <span class="oc-icon-circle text-success">
+                            Pending
+                        </span>
+                    </td>
+                    <td>The sun is shining</td>
+                </tr>
+                <tr>
+                    <td>
+                        <span class="oc-icon-circle text-danger">
+                            Cancelled
+                        </span>
+                    </td>
+                    <td>The weather is sweet here</td>
+                </tr>
+            </tbody>
+        </table>
     </div>
\ No newline at end of file

From beb253a5c0ddff757ae1ac6f5ace9bdad6d8b2f7 Mon Sep 17 00:00:00 2001
From: Vojta Svoboda <vojtasvoboda.cz@gmail.com>
Date: Wed, 2 Sep 2015 22:43:33 +0200
Subject: [PATCH 017/103] Fix evaluate zero value as null

---
 modules/backend/widgets/Lists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 4fb6d9949..52fb3458e 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -804,7 +804,7 @@ class Lists extends WidgetBase
         /*
          * Apply default value.
          */
-        if (empty($value)) {
+        if (is_null($value)) {
             $value = $column->defaults;
         }
 

From ddf8ff09ff499dc65ee7e48e2bbf663dee7a2213 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 3 Sep 2015 07:15:52 +1000
Subject: [PATCH 018/103] Fixes #1416 to include empty strings

---
 modules/backend/widgets/Lists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 52fb3458e..f500abeb7 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -804,7 +804,7 @@ class Lists extends WidgetBase
         /*
          * Apply default value.
          */
-        if (is_null($value)) {
+        if ($value === '' || $value === null) {
             $value = $column->defaults;
         }
 

From 98e1d0fe4d6c442516b56a8756109d4b11325859 Mon Sep 17 00:00:00 2001
From: flynsarmy <flynsarmy@gmail.com>
Date: Mon, 7 Sep 2015 14:17:09 +1000
Subject: [PATCH 019/103] Add getPublicActions controller method

---
 modules/backend/classes/Controller.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 0575ce6dd..81c57c859 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -553,6 +553,14 @@ class Controller extends Extendable
         return false;
     }
 
+    /**
+     * Returns the controllers public actions.
+     */
+    public function getPublicActions()
+    {
+        return $this->publicActions;
+    }
+
     /**
      * Returns a unique ID for the controller and route. Useful in creating HTML markup.
      */

From e2fafa35520ec6efc9739241eb8e5597cd57504f Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 9 Sep 2015 08:26:20 +1000
Subject: [PATCH 020/103] Revert eac25c69de5d31736de727c4d9ef76d964f34f20
 Toolbar no longer sets height 100%, tests in Chrome 45 fine

---
 modules/backend/assets/css/october.css                 | 4 ++--
 modules/backend/assets/less/controls/sidenav-tree.less | 1 -
 modules/backend/assets/less/layout/mainmenu.less       | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index c905ac475..61a8c574a 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -385,7 +385,7 @@
 .control-treeview ol > li.drop-target.has-subitems > div:before{background-position:0px -102px}
 }
 .sidenav-tree{width:280px;background:#34495e}
-.sidenav-tree .control-toolbar{height:auto;padding:20px 0 20px 20px}
+.sidenav-tree .control-toolbar{padding:20px 0 20px 20px}
 .sidenav-tree .control-toolbar input.form-control{border:none}
 .sidenav-tree ul{padding:0;margin:0;list-style:none}
 .sidenav-tree div.scrollbar-thumb{background:#2b3e50 !important}
@@ -619,7 +619,7 @@ body.slim-container .layout.layout-container,body.slim-container .layout .layout
 .layout.responsive-sidebar > .layout-cell:last-child .layout-absolute{position:static}
 }
 body.mainmenu-open{overflow:hidden}
-nav#layout-mainmenu.navbar{background-color:#111111;height:auto;padding:0 0 0 20px;line-height:0;white-space:nowrap}
+nav#layout-mainmenu.navbar{background-color:#111111;padding:0 0 0 20px;line-height:0;white-space:nowrap}
 nav#layout-mainmenu.navbar a{text-decoration:none}
 nav#layout-mainmenu.navbar a:focus{background:transparent}
 nav#layout-mainmenu.navbar ul{margin:0;padding:0;list-style:none;float:left;font-weight:600;white-space:nowrap;overflow:hidden}
diff --git a/modules/backend/assets/less/controls/sidenav-tree.less b/modules/backend/assets/less/controls/sidenav-tree.less
index 8c5a528ad..52fc0600a 100644
--- a/modules/backend/assets/less/controls/sidenav-tree.less
+++ b/modules/backend/assets/less/controls/sidenav-tree.less
@@ -3,7 +3,6 @@
     background: @color-sidebarnav-bg;
 
     .control-toolbar {
-        height: auto;
         padding: 20px 0 20px 20px;
 
         input.form-control {
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index a687cd28d..689ca95be 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -8,7 +8,6 @@ body.mainmenu-open {
 
 nav#layout-mainmenu.navbar {
     background-color: @color-mainmenu;
-    height: auto;
     padding: 0 0 0 20px;
     line-height: 0;
     white-space: nowrap;

From ac18f86937cee66f697dc1673785ae13ca5c7899 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 9 Sep 2015 08:32:17 +1000
Subject: [PATCH 021/103] Fixes an issue where admins updating self see access
 denied Only when the user has no permission to edit other admins Refs #831

---
 .../backend/controllers/users/myaccount.htm   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/modules/backend/controllers/users/myaccount.htm b/modules/backend/controllers/users/myaccount.htm
index fefdde1a4..54b561d7c 100644
--- a/modules/backend/controllers/users/myaccount.htm
+++ b/modules/backend/controllers/users/myaccount.htm
@@ -28,15 +28,17 @@
                         class="btn btn-primary">
                         <?= e(trans('backend::lang.form.save')) ?>
                     </button>
-                    <button
-                        type="button"
-                        data-request="onSave"
-                        data-request-data="close:1"
-                        data-hotkey="ctrl+enter, cmd+enter"
-                        data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
-                        class="btn btn-default">
-                        <?= e(trans('backend::lang.form.save_and_close')) ?>
-                    </button>
+                    <?php if ($this->user->hasAccess('backend.manage_users')): ?>
+                        <button
+                            type="button"
+                            data-request="onSave"
+                            data-request-data="close:1"
+                            data-hotkey="ctrl+enter, cmd+enter"
+                            data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+                            class="btn btn-default">
+                            <?= e(trans('backend::lang.form.save_and_close')) ?>
+                        </button>
+                    <?php endif ?>
                 </div>
             </div>
 

From 50812adcaf31e284785de5abd5252ad6777b30a1 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 9 Sep 2015 19:28:10 +1000
Subject: [PATCH 022/103] No flush abstract classes. No treat as test either.

---
 tests/PluginTestCase.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/PluginTestCase.php b/tests/PluginTestCase.php
index baaa85dd9..5f45e4c2a 100644
--- a/tests/PluginTestCase.php
+++ b/tests/PluginTestCase.php
@@ -4,7 +4,7 @@ use System\Classes\UpdateManager;
 use System\Classes\PluginManager;
 use October\Rain\Database\Model as ActiveRecord;
 
-class PluginTestCase extends Illuminate\Foundation\Testing\TestCase
+abstract class PluginTestCase extends Illuminate\Foundation\Testing\TestCase
 {
     /**
      * @var array Cache for storing which plugins have been loaded
@@ -160,10 +160,18 @@ class PluginTestCase extends Illuminate\Foundation\Testing\TestCase
     protected function flushModelEventListeners()
     {
         foreach (get_declared_classes() as $class) {
+            if ($class == 'October\Rain\Database\Pivot') {
+                continue;
+            }
 
-            if (!is_subclass_of($class, 'October\Rain\Database\Model')) continue;
-            if (is_subclass_of($class, 'October\Rain\Database\Pivot')) continue;
-            if ($class == 'October\Rain\Database\Pivot') continue;
+            $reflectClass = new ReflectionClass($class);
+            if (
+                !$reflectClass->isInstantiable() ||
+                !$reflectClass->isSubclassOf('October\Rain\Database\Model') ||
+                $reflectClass->isSubclassOf('October\Rain\Database\Pivot')
+            ) {
+                continue;
+            }
 
             $class::flushEventListeners();
         }

From cd1edcb055ba1758d8bb93829aa3d1367709d462 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 9 Sep 2015 19:28:47 +1000
Subject: [PATCH 023/103] Add new suite for database testing

---
 .../plugins/database/tester/Plugin.php        | 17 +++++++
 .../plugins/database/tester/models/Author.php | 28 ++++++++++
 .../plugins/database/tester/models/Post.php   | 33 ++++++++++++
 .../database/tester/models/SluggablePost.php  | 30 +++++++++++
 .../tester/updates/create_authors_table.php   | 26 ++++++++++
 .../tester/updates/create_posts_table.php     | 30 +++++++++++
 .../database/tester/updates/version.yaml      |  5 ++
 .../plugins/database/BelongsToModelTest.php   | 49 ++++++++++++++++++
 tests/unit/plugins/database/ModelTest.php     | 34 +++++++++++++
 .../plugins/database/SluggableModelTest.php   | 51 +++++++++++++++++++
 .../unit/system/classes/PluginManagerTest.php | 14 +++--
 11 files changed, 313 insertions(+), 4 deletions(-)
 create mode 100644 tests/fixtures/plugins/database/tester/Plugin.php
 create mode 100644 tests/fixtures/plugins/database/tester/models/Author.php
 create mode 100644 tests/fixtures/plugins/database/tester/models/Post.php
 create mode 100644 tests/fixtures/plugins/database/tester/models/SluggablePost.php
 create mode 100644 tests/fixtures/plugins/database/tester/updates/create_authors_table.php
 create mode 100644 tests/fixtures/plugins/database/tester/updates/create_posts_table.php
 create mode 100644 tests/fixtures/plugins/database/tester/updates/version.yaml
 create mode 100644 tests/unit/plugins/database/BelongsToModelTest.php
 create mode 100644 tests/unit/plugins/database/ModelTest.php
 create mode 100644 tests/unit/plugins/database/SluggableModelTest.php

diff --git a/tests/fixtures/plugins/database/tester/Plugin.php b/tests/fixtures/plugins/database/tester/Plugin.php
new file mode 100644
index 000000000..4cad4adf7
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/Plugin.php
@@ -0,0 +1,17 @@
+<?php namespace Database\Tester;
+
+use System\Classes\PluginBase;
+
+class Plugin extends PluginBase
+{
+
+    public function pluginDetails()
+    {
+        return [
+            'name' => 'Database Tester Plugin',
+            'description' => 'Plugin for loading tests that involve the database.',
+            'author' => 'Alexey Bobkov, Samuel Georges'
+        ];
+    }
+
+}
\ No newline at end of file
diff --git a/tests/fixtures/plugins/database/tester/models/Author.php b/tests/fixtures/plugins/database/tester/models/Author.php
new file mode 100644
index 000000000..b89d5c34e
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/models/Author.php
@@ -0,0 +1,28 @@
+<?php namespace Database\Tester\Models;
+
+use Model;
+
+/**
+ * Author Model
+ */
+class Author extends Model
+{
+
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'database_tester_authors';
+
+    /**
+     * @var array Guarded fields
+     */
+    protected $guarded = [];
+
+    /**
+     * @var array Relations
+     */
+    public $hasMany = [
+        'posts' => 'Database\Tester\Models\Post',
+    ];
+
+}
\ No newline at end of file
diff --git a/tests/fixtures/plugins/database/tester/models/Post.php b/tests/fixtures/plugins/database/tester/models/Post.php
new file mode 100644
index 000000000..5cdedc7f8
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/models/Post.php
@@ -0,0 +1,33 @@
+<?php namespace Database\Tester\Models;
+
+use Model;
+
+/**
+ * Post Model
+ */
+class Post extends Model
+{
+
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'database_tester_posts';
+
+    /**
+     * @var array Guarded fields
+     */
+    protected $guarded = ['*'];
+
+    /**
+     * @var array Fillable fields
+     */
+    protected $fillable = [];
+
+    /**
+     * @var array Relations
+     */
+    public $belongsTo = [
+        'author' => 'Database\Tester\Models\Author',
+    ];
+
+}
\ No newline at end of file
diff --git a/tests/fixtures/plugins/database/tester/models/SluggablePost.php b/tests/fixtures/plugins/database/tester/models/SluggablePost.php
new file mode 100644
index 000000000..86ed609d6
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/models/SluggablePost.php
@@ -0,0 +1,30 @@
+<?php namespace Database\Tester\Models;
+
+use Model;
+
+/**
+ * Post Model
+ */
+class SluggablePost extends Model
+{
+
+    use \October\Rain\Database\Traits\Sluggable;
+
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'database_tester_posts';
+
+    /**
+     * @var array Guarded fields
+     */
+    protected $guarded = [];
+
+    /**
+     * @var array List of attributes to automatically generate unique URL names (slugs) for.
+     */
+    protected $slugs = [
+        'slug' => 'title'
+    ];
+
+}
\ No newline at end of file
diff --git a/tests/fixtures/plugins/database/tester/updates/create_authors_table.php b/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
new file mode 100644
index 000000000..ccc15e383
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/updates/create_authors_table.php
@@ -0,0 +1,26 @@
+<?php namespace Database\Tester\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class CreateAuthorsTable extends Migration
+{
+
+    public function up()
+    {
+        Schema::create('database_tester_authors', function($table)
+        {
+            $table->engine = 'InnoDB';
+            $table->increments('id');
+            $table->string('name')->nullable();
+            $table->string('email')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('database_tester_authors');
+    }
+
+}
diff --git a/tests/fixtures/plugins/database/tester/updates/create_posts_table.php b/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
new file mode 100644
index 000000000..37dcd6ca7
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
@@ -0,0 +1,30 @@
+<?php namespace Database\Tester\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class CreatePostsTable extends Migration
+{
+
+    public function up()
+    {
+        Schema::create('database_tester_posts', function($table)
+        {
+            $table->engine = 'InnoDB';
+            $table->increments('id');
+            $table->string('title')->nullable();
+            $table->string('slug')->nullable()->index();
+            $table->text('description')->nullable();
+            $table->boolean('is_published')->default(false);
+            $table->timestamp('published_at')->nullable();
+            $table->integer('author_id')->unsigned()->index()->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('database_tester_posts');
+    }
+
+}
diff --git a/tests/fixtures/plugins/database/tester/updates/version.yaml b/tests/fixtures/plugins/database/tester/updates/version.yaml
new file mode 100644
index 000000000..519509f0c
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/updates/version.yaml
@@ -0,0 +1,5 @@
+1.0.1: First version of Tester
+1.0.2:
+    - Create tables
+    - create_posts_table.php
+    - create_authors_table.php
diff --git a/tests/unit/plugins/database/BelongsToModelTest.php b/tests/unit/plugins/database/BelongsToModelTest.php
new file mode 100644
index 000000000..06886e7c5
--- /dev/null
+++ b/tests/unit/plugins/database/BelongsToModelTest.php
@@ -0,0 +1,49 @@
+<?php
+
+use Database\Tester\Models\Post;
+use Database\Tester\Models\Author;
+
+class BelongsToModelTest extends PluginTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Post.php';
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Author.php';
+
+        $this->runPluginRefreshCommand('Database.Tester');
+    }
+
+    public function testSetRelationValueBelongsTo()
+    {
+        Model::unguard();
+        $post = Post::create(['title' => "First post", 'description' => "Yay!!"]);
+        $author1 = Author::create(['name' => 'Stevie', 'email' => 'stevie@email.tld']);
+        $author2 = Author::create(['name' => 'Louie', 'email' => 'louie@email.tld']);
+        $author3 = Author::make(['name' => 'Charlie', 'email' => 'charlie@email.tld']);
+        Model::reguard();
+
+        // Set by Model object
+        $post->author = $author1;
+        $this->assertEquals($author1->id, $post->author_id);
+        $this->assertEquals('Stevie', $post->author->name);
+
+        // Set by primary key
+        $post->author = $author2->id;
+        $this->assertEquals($author2->id, $post->author_id);
+        $this->assertEquals('Louie', $post->author->name);
+
+        // Nullify
+        $post->author = null;
+        $this->assertNull($post->author_id);
+        $this->assertNull($post->author);
+
+        // Deferred
+        $post->author = $author3;
+        $this->assertEquals('Charlie', $post->author->name);
+        $this->assertNull($post->author_id);
+        $author3->save();
+        $this->assertEquals($author3->id, $post->author_id);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/plugins/database/ModelTest.php b/tests/unit/plugins/database/ModelTest.php
new file mode 100644
index 000000000..4dd6bc8fc
--- /dev/null
+++ b/tests/unit/plugins/database/ModelTest.php
@@ -0,0 +1,34 @@
+<?php
+
+use Database\Tester\Models\Post;
+
+class ModelTest extends PluginTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Post.php';
+
+        $this->runPluginRefreshCommand('Database.Tester');
+    }
+
+    public function testCreateFirstPost()
+    {
+        Post::truncate();
+        $post = new Post;
+        $post->title = "First post";
+        $post->description = "Yay!!";
+        $post->save();
+        $this->assertEquals(1, $post->id);
+    }
+
+    /**
+     * @expectedException        \Illuminate\Database\Eloquent\MassAssignmentException
+     * @expectedExceptionMessage title
+     */
+    public function testGuardedAttribute()
+    {
+        Post::create(['title' => 'Hi!', 'slug' => 'authenticity']);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/plugins/database/SluggableModelTest.php b/tests/unit/plugins/database/SluggableModelTest.php
new file mode 100644
index 000000000..0518ae75f
--- /dev/null
+++ b/tests/unit/plugins/database/SluggableModelTest.php
@@ -0,0 +1,51 @@
+<?php
+
+use Database\Tester\Models\SluggablePost;
+
+class SluggableModelTest extends PluginTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/SluggablePost.php';
+
+        $this->runPluginRefreshCommand('Database.Tester');
+    }
+
+    public function testFillPost()
+    {
+        $post = SluggablePost::create(['title' => 'Hello World!']);
+        $this->assertEquals('hello-world', $post->slug);
+    }
+
+    public function testSetAttributeOnPost()
+    {
+        $post = new SluggablePost;
+        $post->title = "Let's go, rock show!";
+        $post->save();
+
+        $this->assertEquals('lets-go-rock-show', $post->slug);
+    }
+
+    public function testSetSlugAttributeManually()
+    {
+        $post = new SluggablePost;
+        $post->title = 'We parked in a comfortable spot';
+        $post->slug = 'war-is-pain';
+        $post->save();
+
+        $this->assertEquals('war-is-pain', $post->slug);
+    }
+
+    public function testDuplicateSlug()
+    {
+        $post1 = SluggablePost::create(['title' => 'Pace yourself']);
+        $post2 = SluggablePost::create(['title' => 'Pace yourself']);
+        $post3 = SluggablePost::create(['title' => 'Pace yourself']);
+
+        $this->assertEquals('pace-yourself', $post1->slug);
+        $this->assertEquals('pace-yourself-2', $post2->slug);
+        $this->assertEquals('pace-yourself-3', $post3->slug);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/system/classes/PluginManagerTest.php b/tests/unit/system/classes/PluginManagerTest.php
index 4720e2ce0..c4f610f44 100644
--- a/tests/unit/system/classes/PluginManagerTest.php
+++ b/tests/unit/system/classes/PluginManagerTest.php
@@ -52,15 +52,17 @@ class PluginManagerTest extends TestCase
         $manager = PluginManager::instance();
         $result = self::callProtectedMethod($manager, 'loadPlugins');
 
-        $this->assertCount(4, $result);
+        $this->assertCount(5, $result);
         $this->assertArrayHasKey('October.NoUpdates', $result);
         $this->assertArrayHasKey('October.Sample', $result);
         $this->assertArrayHasKey('October.Tester', $result);
+        $this->assertArrayHasKey('Database.Tester', $result);
         $this->assertArrayHasKey('TestVendor.Test', $result);
 
         $this->assertInstanceOf('October\NoUpdates\Plugin', $result['October.NoUpdates']);
         $this->assertInstanceOf('October\Sample\Plugin', $result['October.Sample']);
         $this->assertInstanceOf('October\Tester\Plugin', $result['October.Tester']);
+        $this->assertInstanceOf('Database\Tester\Plugin', $result['Database.Tester']);
         $this->assertInstanceOf('TestVendor\Test\Plugin', $result['TestVendor.Test']);
     }
 
@@ -77,15 +79,17 @@ class PluginManagerTest extends TestCase
         $manager = PluginManager::instance();
         $result = $manager->getPlugins();
 
-        $this->assertCount(4, $result);
+        $this->assertCount(5, $result);
         $this->assertArrayHasKey('October.NoUpdates', $result);
         $this->assertArrayHasKey('October.Sample', $result);
         $this->assertArrayHasKey('October.Tester', $result);
+        $this->assertArrayHasKey('Database.Tester', $result);
         $this->assertArrayHasKey('TestVendor.Test', $result);
 
         $this->assertInstanceOf('October\NoUpdates\Plugin', $result['October.NoUpdates']);
         $this->assertInstanceOf('October\Sample\Plugin', $result['October.Sample']);
         $this->assertInstanceOf('October\Tester\Plugin', $result['October.Tester']);
+        $this->assertInstanceOf('Database\Tester\Plugin', $result['Database.Tester']);
         $this->assertInstanceOf('TestVendor\Test\Plugin', $result['TestVendor.Test']);
     }
 
@@ -111,10 +115,11 @@ class PluginManagerTest extends TestCase
         $manager = PluginManager::instance();
         $result = $manager->getPluginNamespaces();
 
-        $this->assertCount(4, $result);
+        $this->assertCount(5, $result);
         $this->assertArrayHasKey('\october\noupdates', $result);
         $this->assertArrayHasKey('\october\sample', $result);
         $this->assertArrayHasKey('\october\tester', $result);
+        $this->assertArrayHasKey('\database\tester', $result);
         $this->assertArrayHasKey('\testvendor\test', $result);
     }
     
@@ -124,8 +129,9 @@ class PluginManagerTest extends TestCase
         $vendors = $manager->getVendorAndPluginNames();
 
         $this->assertArrayHasKey('october', $vendors);
+        $this->assertArrayHasKey('database', $vendors);
         $this->assertArrayHasKey('testvendor', $vendors);
-        $this->assertCount(2, $vendors);
+        $this->assertCount(3, $vendors);
     }
 
     public function testPluginDetails()

From 3e58759f7b9f421aa1a6d4a0df26bf4ba701ed00 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 10 Sep 2015 20:41:51 +1000
Subject: [PATCH 024/103] * Build 293

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28204ea51..1945e4599 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* **Build 293** (2015-09-07)
+  - Corrected a flaw in the Behavior/Extension logic that previously made protected methods and properties accessible as if they were public.
+
 * **Build 292** (2015-08-28)
   - Added a new controller method `fireViewEvent()` for extending views and partials (see Plugins > Events docs).
   - Fixes a bug where the database falls asleep during an update.

From 9812e1f4eca080712b4e0e0d2c66897b98e12a8c Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 10 Sep 2015 20:42:24 +1000
Subject: [PATCH 025/103] Fix protection level on formExtendFields Improve
 styling on collapsible sections

---
 modules/backend/controllers/UserGroups.php |  2 +-
 modules/backend/controllers/Users.php      |  2 +-
 modules/cms/controllers/Themes.php         |  2 +-
 modules/system/assets/ui/less/form.less    | 13 +++++++++++--
 modules/system/assets/ui/storm.css         |  3 ++-
 modules/system/classes/UpdateManager.php   |  1 +
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/modules/backend/controllers/UserGroups.php b/modules/backend/controllers/UserGroups.php
index a9e48987c..118e627c0 100644
--- a/modules/backend/controllers/UserGroups.php
+++ b/modules/backend/controllers/UserGroups.php
@@ -33,7 +33,7 @@ class UserGroups extends Controller
     /**
      * Add available permission fields to the Group form.
      */
-    protected function formExtendFields($form)
+    public function formExtendFields($form)
     {
         /*
          * Add permissions tab
diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php
index 9f5ddbf77..b7cd8d5a7 100644
--- a/modules/backend/controllers/Users.php
+++ b/modules/backend/controllers/Users.php
@@ -88,7 +88,7 @@ class Users extends Controller
      * Add available permission fields to the User form.
      * Mark default groups as checked for new Users.
      */
-    protected function formExtendFields($form)
+    public function formExtendFields($form)
     {
         if ($form->getContext() == 'myaccount') {
             return;
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index 08ba468cd..64a6db77e 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -247,7 +247,7 @@ class Themes extends Controller
     /**
      * Add form fields defined in theme.yaml
      */
-    protected function formExtendFields($form)
+    public function formExtendFields($form)
     {
         $model = $form->model;
         $theme = $this->findThemeObject($model->theme);
diff --git a/modules/system/assets/ui/less/form.less b/modules/system/assets/ui/less/form.less
index 29f592bcc..27e8b9106 100644
--- a/modules/system/assets/ui/less/form.less
+++ b/modules/system/assets/ui/less/form.less
@@ -227,11 +227,14 @@
             display: inline-block;
             .icon-FontAutumn();
             vertical-align: baseline;
-            content: @caret-down;
+            content: @chevron-up;
 
-            margin: 0 8px;
+            font-size: 12px;
+            margin: 2px 8px 0;
             float: right;
             color: rgba(0,0,0,.4);
+            .transition(all 0.3s);
+            .scaleAxes(1, 1);
         }
 
         &:hover {
@@ -243,6 +246,12 @@
     }
 }
 
+.form-group.section-field.collapsed {
+    .field-section.is-collapsible > h4:before {
+        .scaleAxes(1, -1);
+    }
+}
+
 .field-textarea {
     resize: vertical;
     &.size-tiny { min-height: @size-tiny; }
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index 1ca12f548..2df51c390 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -2236,9 +2236,10 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .field-section > h4{color:rgba(0,0,0,0.6)}
 .field-section > p:first-child,.field-section > h4:first-child{margin:0}
 .field-section.is-collapsible{cursor:pointer}
-.field-section.is-collapsible > h4:before{display:inline-block;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;vertical-align:baseline;content:"\f0d7";margin:0 8px;float:right;color:rgba(0,0,0,0.4)}
+.field-section.is-collapsible > h4:before{display:inline-block;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;vertical-align:baseline;content:"\f077";font-size:12px;margin:2px 8px 0;float:right;color:rgba(0,0,0,0.4);-webkit-transition:all 0.3s;transition:all 0.3s;-webkit-transform:scale(1,1);-moz-transform:scale(1,1);-ms-transform:scale(1,1);-o-transform:scale(1,1);transform:scale(1,1)}
 .field-section.is-collapsible:hover{border-bottom:1px solid #c7c7c7}
 .field-section.is-collapsible:hover > h4:before{color:inherit}
+.form-group.section-field.collapsed .field-section.is-collapsible > h4:before{-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}
 .field-textarea{resize:vertical}
 .field-textarea.size-tiny{min-height:50px}
 .field-textarea.size-small{min-height:100px}
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 887b46387..99b631bff 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -837,6 +837,7 @@ class UpdateManager
     protected function applyHttpAttributes($http, $postData)
     {
         $postData['url'] = base64_encode(URL::to('/'));
+        $postData['server'] = base64_encode(serialize(['php' => PHP_VERSION]));
         if (Config::get('cms.edgeUpdates', false)) {
             $postData['edge'] = 1;
         }

From cf7585f79bb337e1b2ad9d49754cb17093e94dc4 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 10 Sep 2015 20:51:02 +1000
Subject: [PATCH 026/103] Fixes formwidget logic leaking out of context For
 example: a formwidget with no tabs can exist inside a set of preview content
 tabs

---
 modules/backend/widgets/form/assets/js/october.form.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/backend/widgets/form/assets/js/october.form.js b/modules/backend/widgets/form/assets/js/october.form.js
index 6d1bc2e14..336067f5f 100644
--- a/modules/backend/widgets/form/assets/js/october.form.js
+++ b/modules/backend/widgets/form/assets/js/october.form.js
@@ -137,6 +137,8 @@
      * called multiple times in a single cycle due to input.trigger.
      */
     FormWidget.prototype.toggleEmptyTabs = function() {
+        var self = this,
+            form = this.$el
 
         if (this.toggleEmptyTabsTimer !== undefined) {
             window.clearTimeout(this.toggleEmptyTabsTimer)
@@ -147,7 +149,7 @@
             var tabControl = $('[data-control=tab]', this.$el),
                 tabContainer = $('.nav-tabs', tabControl)
 
-            if (!tabControl.length)
+            if (!tabControl.length || !$.contains(form.get(0), tabControl.get(0)))
                 return
 
             /*

From e8b4bf9d72cbbfc3458977d4fb6dccea88b6d812 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 12 Sep 2015 07:53:33 +1000
Subject: [PATCH 027/103] If the pivot model fails for some reason, abort the
 sync Refs #1408

---
 .../backend/behaviors/RelationController.php  | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 2ff9331fa..9b23b589d 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -1112,24 +1112,29 @@ class RelationController extends ControllerBehavior
         $this->beforeAjax();
 
         /*
-         * Add the checked IDs to the pivot table
+         * If the pivot model fails for some reason, abort the sync
          */
-        $foreignIds = (array) $this->foreignId;
-        $this->relationObject->sync($foreignIds, false);
+        Db::transaction(function () {
+            /*
+             * Add the checked IDs to the pivot table
+             */
+            $foreignIds = (array) $this->foreignId;
+            $this->relationObject->sync($foreignIds, false);
 
-        /*
-         * Save data to models
-         */
-        $foreignKeyName = $this->relationModel->getQualifiedKeyName();
-        $hyrdatedModels = $this->relationObject->whereIn($foreignKeyName, $foreignIds)->get();
-        $saveData = $this->pivotWidget->getSaveData();
+            /*
+             * Save data to models
+             */
+            $foreignKeyName = $this->relationModel->getQualifiedKeyName();
+            $hyrdatedModels = $this->relationObject->whereIn($foreignKeyName, $foreignIds)->get();
+            $saveData = $this->pivotWidget->getSaveData();
 
-        foreach ($hyrdatedModels as $hydratedModel) {
-            $modelsToSave = $this->prepareModelsToSave($hydratedModel, $saveData);
-            foreach ($modelsToSave as $modelToSave) {
-                $modelToSave->save();
+            foreach ($hyrdatedModels as $hydratedModel) {
+                $modelsToSave = $this->prepareModelsToSave($hydratedModel, $saveData);
+                foreach ($modelsToSave as $modelToSave) {
+                    $modelToSave->save();
+                }
             }
-        }
+        });
 
         return ['#'.$this->relationGetId('view') => $this->relationRenderView()];
     }

From 1c8d021a358fc6ee17da422ccd99fe570ce7912f Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 12 Sep 2015 08:45:58 +1000
Subject: [PATCH 028/103] Adds the ability to remove navigation items Included
 tests Refs #1413

---
 modules/backend/classes/NavigationManager.php | 23 +++++++
 .../backend/classes/NavigationManagerTest.php | 69 ++++++++++++++++++-
 2 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php
index 764b1f83d..907ec2b01 100644
--- a/modules/backend/classes/NavigationManager.php
+++ b/modules/backend/classes/NavigationManager.php
@@ -246,6 +246,15 @@ class NavigationManager
         }
     }
 
+    /**
+     * Removes a single main menu item
+     */
+    public function removeMainMenuItem($owner, $code)
+    {
+        $itemKey = $this->makeItemKey($owner, $code);
+        unset($this->items[$itemKey]);
+    }
+
     /**
      * Dynamically add an array of side menu items
      * @param string $owner
@@ -287,6 +296,20 @@ class NavigationManager
         $this->items[$itemKey]->sideMenu[$sideCode] = $item;
     }
 
+    /**
+     * Removes a single main menu item
+     */
+    public function removeSideMenuItem($owner, $code, $sideCode)
+    {
+        $itemKey = $this->makeItemKey($owner, $code);
+        if (!isset($this->items[$itemKey])) {
+            return false;
+        }
+
+        $mainItem = $this->items[$itemKey];
+        unset($mainItem->sideMenu[$sideCode]);
+    }
+
     /**
      * Returns a list of the main menu items.
      * @return array
diff --git a/tests/unit/backend/classes/NavigationManagerTest.php b/tests/unit/backend/classes/NavigationManagerTest.php
index 416972f3d..04ca2f183 100644
--- a/tests/unit/backend/classes/NavigationManagerTest.php
+++ b/tests/unit/backend/classes/NavigationManagerTest.php
@@ -79,6 +79,51 @@ class NavigationManagerTest extends TestCase
         $this->assertEquals(200, $items['categories']->order);
     }
 
+    public function testAddMainMenuItems()
+    {
+        $manager = NavigationManager::instance();
+        $manager->addMainMenuItems('October.Tester', [
+            'print' => [
+                'label' => 'Print',
+                'icon' => 'icon-print',
+                'url' => 'javascript:window.print()'
+            ]
+        ]);
+
+        $items = $manager->listMainMenuItems();
+
+        $this->assertInternalType('array', $items);
+        $this->assertArrayHasKey('OCTOBER.TESTER.PRINT', $items);
+
+        $item = $items['OCTOBER.TESTER.PRINT'];
+        $this->assertEquals('print', $item->code);
+        $this->assertEquals('Print', $item->label);
+        $this->assertEquals('icon-print', $item->icon);
+        $this->assertEquals('javascript:window.print()', $item->url);
+        $this->assertEquals(500, $item->order);
+        $this->assertEquals('October.Tester', $item->owner);
+    }
+
+    public function testRemoveMainMenuItem()
+    {
+        $manager = NavigationManager::instance();
+        $manager->addMainMenuItems('October.Tester', [
+            'close' => [
+                'label' => 'Close',
+                'icon' => 'icon-times',
+                'url' => 'javascript:window.close()'
+            ]
+        ]);
+
+        $items = $manager->listMainMenuItems();
+        $this->assertArrayHasKey('OCTOBER.TESTER.CLOSE', $items);
+
+        $manager->removeMainMenuItem('October.Tester', 'close');
+
+        $items = $manager->listMainMenuItems();
+        $this->assertArrayNotHasKey('OCTOBER.TESTER.CLOSE', $items);
+    }
+
     public function testAddSideMenuItems()
     {
         $manager = NavigationManager::instance();
@@ -116,4 +161,26 @@ class NavigationManagerTest extends TestCase
         $this->assertContains('october.tester.access_foo', $items['foo']->permissions);
         $this->assertContains('october.tester.access_bar', $items['foo']->permissions);
     }
-}
\ No newline at end of file
+
+    public function testRemoveSideMenuItem()
+    {
+        $manager = NavigationManager::instance();
+        $manager->addSideMenuItems('October.Tester', 'blog', [
+            'bar' => [
+                'label' => 'Bar',
+                'icon' => 'icon-bars',
+                'url' => 'http://yahoo.com'
+            ]
+        ]);
+
+        $manager->setContext('October.Tester', 'blog');
+
+        $items = $manager->listSideMenuItems();
+        $this->assertArrayHasKey('bar', $items);
+
+        $manager->removeSideMenuItem('October.Tester', 'blog', 'bar');
+
+        $items = $manager->listSideMenuItems();
+        $this->assertArrayNotHasKey('bar', $items);
+    }
+}

From 293a04722e31b413b8e41b235ab012cb9f63c3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Talha=20Zekeriya=20Durmu=C5=9F?= <drtzack@gmail.com>
Date: Mon, 7 Sep 2015 01:08:20 +0300
Subject: [PATCH 029/103] Turkish Language Update

Update lang.php

Updated forgotten record
---
 modules/backend/lang/tr/lang.php | 47 ++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/modules/backend/lang/tr/lang.php b/modules/backend/lang/tr/lang.php
index 35e226109..6d5aa5484 100644
--- a/modules/backend/lang/tr/lang.php
+++ b/modules/backend/lang/tr/lang.php
@@ -18,6 +18,9 @@ return [
             'label' => "Giriş engellendi",
             'help' => "Bu sayfayı görüntülemek için gerekli izinlere sahip değilsiniz.",
             'cms_link' => "Ana sayfaya dön"
+        ],
+        'invalid_token' => [
+            'label' => 'Geçersiz güvenlik anahtarı'
         ]
     ],
     'partial' => [
@@ -86,6 +89,7 @@ return [
         'password' => "Parola",
         'password_confirmation' => "Parola (Tekrar)",
         'permissions' => 'İzinler',
+        'account' => 'Hesap',
         'superuser' => "Süper Kullanıcı",
         'superuser_comment' => "Kullanıcıya her alanda yetki vermek için burayı işaretleyin.",
         'send_invite' => 'Email ile davet gönder',
@@ -98,15 +102,16 @@ return [
         'group' => [
             'name' => 'Grup',
             'name_field' => 'Adı',
+            'description_field' => 'Açıklama',
+            'is_new_user_default_field' => 'Yeni kullanıcılar bu gruba dahil edilsin mi?',
+            'code_field' => 'Grup kodu',
+            'code_comment' => 'Grup kodunu yazın',
             'menu_label' => 'Gruplar',
             'list_title' => 'Grupları Yönet',
             'new' => 'Yeni Yönetici Grubu',
             'delete_confirm' => 'Bu yönetici grubunu silmek istiyor musunuz?',
             'return' => 'Grup listesine dön',
-            'description_field' => 'Adı',
-            'is_new_user_default_field' => 'Yeni kullanıcılar bu gruba dahil edilsin mi?',
-            'code_field' => 'Grup kodu',
-            'code_comment' => 'Grup kodunu yazın'
+            'users_count' => 'Users'
         ],
         'preferences' => [
             'not_authenticated' => 'Ayarları görüntülemek veya düzenlemek için yetkili bir kullanıcı yok.'
@@ -129,13 +134,23 @@ return [
         'setup_title' => 'Liste Ayarları',
         'setup_help' => 'Listede görmek istediğiniz sütunları seçmek için onay kutularını kullanın. Sütunları yukarı veya aşağı sürükleyerek konumlarını değiştirebilirsiniz.',
         'records_per_page' => 'Sayfa başına kayıt sayısı',
-        'records_per_page_help' => 'Sayfa başına görüntülenecek kayıt sayısını seçin. Tek sayfada yüksek miktarda kayıt görüntülemek sistem performansını azaltabilir.'
+        'records_per_page_help' => 'Sayfa başına görüntülenecek kayıt sayısını seçin. Tek sayfada yüksek miktarda kayıt görüntülemek sistem performansını azaltabilir.',
+        'delete_selected' => 'Seçili olanı sil',
+        'delete_selected_empty' => 'Silinecek seçili kayıt bulunamadı.',
+        'delete_selected_confirm' => 'Seçili kayıtları silmek istediğize emin misiniz?',
+        'delete_selected_success' => 'Seçili kayıtlar başarıyla silindi.'
     ],
     'fileupload' => [
         'attachment' => 'Dosya Eki',
         'help' => 'Bu ek için bir başlık ve tanım girin.',
         'title_label' => 'Başlık',
-        'description_label' => 'Tanım'
+        'description_label' => 'Tanım',
+        'default_prompt' => '%s e tıkla ya da bir dosya sürükleyin',
+        'attachment_url' => 'Ek URLsi',
+        'upload_file' => 'Dosya yükle',
+        'upload_error' => 'Dosya yükleme hatası',
+        'remove_confirm' => 'Emin misiniz?',
+        'remove_file' => 'Dosyayı sil'
     ],
     'form' => [
         'create_title' => ":name Oluştur",
@@ -172,11 +187,13 @@ return [
         'close' => 'Kapat',
         'confirm' => 'Onayla',
         'reload' => 'Yenile',
+        'complete' => 'Tamamla',
         'ok' => 'Tamam',
         'or' => 'veya',
         'confirm_tab_close' => 'Bu sekmeyi kapatmak istediğinize emin misiniz? Kaydedilmemiş değişiklikleri kaybedeceksiniz.',
         'behavior_not_ready' => 'Form oluşturulamadı, controller da initForm() metodunu kontrol edin.',
         'preview_no_files_message' => 'Dosyalar yüklenmedi',
+        'preview_no_record_message' => 'Seçili kayıt yok.',
         'select' => 'Seç',
         'select_all' => 'tümü',
         'select_none' => 'hiçbiri',
@@ -196,6 +213,8 @@ return [
         'add' => "Ekle",
         'add_selected' => 'Seçilenleri ekle',
         'add_a_new' => 'Yeni bir :name ekle',
+        'link_selected' => 'Seçileni bağla',
+        'link_a_new' => 'Yeni bir :name bağla',
         'cancel' => 'İptal',
         'close' => "Kapat",
         'add_name' => ":name Ekle",
@@ -209,7 +228,16 @@ return [
         'remove_name' => ":name Kaldır",
         'delete' => "Sil",
         'delete_name' => ":name Sil",
-        'delete_confirm' => 'Emin misiniz?'
+        'delete_confirm' => 'Emin misiniz?',
+        'link' => 'Bağla',
+        'link_name' => ':name bağla',
+        'unlink' => 'Bağlamayı kaldır',
+        'unlink_name' => ':name bağlamasını kaldır',
+        'unlink_confirm' => 'Emin misiniz?'
+    ],
+    'reorder' => [
+        'default_title' => 'Kayıtları yeniden sırala',
+        'no_records' => 'Sıralamak için bir kayıt bulunamadı.',
     ],
     'model' => [
         'name' => "Model",
@@ -235,6 +263,7 @@ return [
         'code_folding' => 'Kod katlama (Alt satıra inme)',
         'word_wrap' => 'Uzun kelimeleri yeni satırda göster',
         'highlight_active_line' => 'Aktif satırı vurgula',
+        'auto_closing' => 'Etiketleri ve özel karakterleri otomatik kapat',
         'show_invisibles' => 'Gizli karakterleri göster',
         'show_gutter' => 'Satır numarasını göster',
         'theme' => 'Renk şeması',
@@ -287,6 +316,6 @@ return [
         'email' => 'Email'
     ],
     'filter' => [
-      'all' => 'tümü'
+        'all' => 'tümü'
     ]
-];
\ No newline at end of file
+];

From 17a2585a151d14f7a0a70ef62f177b31685c07db Mon Sep 17 00:00:00 2001
From: Vojta Svoboda <vojtasvoboda.cz@gmail.com>
Date: Tue, 15 Sep 2015 14:30:18 +0200
Subject: [PATCH 030/103] Add cs_CZ locale

---
 modules/backend/lang/cs/lang.php              | 322 +++++++++++++++++
 modules/backend/models/BackendPreferences.php |   1 +
 modules/cms/lang/cs/lang.php                  | 300 ++++++++++++++++
 modules/system/assets/js/lang/lang.cs.js      |   9 +
 modules/system/lang/cs/client.php             |  57 ++++
 modules/system/lang/cs/lang.php               | 323 ++++++++++++++++++
 modules/system/lang/cs/validation.php         |  99 ++++++
 7 files changed, 1111 insertions(+)
 create mode 100644 modules/backend/lang/cs/lang.php
 create mode 100644 modules/cms/lang/cs/lang.php
 create mode 100644 modules/system/assets/js/lang/lang.cs.js
 create mode 100644 modules/system/lang/cs/client.php
 create mode 100644 modules/system/lang/cs/lang.php
 create mode 100644 modules/system/lang/cs/validation.php

diff --git a/modules/backend/lang/cs/lang.php b/modules/backend/lang/cs/lang.php
new file mode 100644
index 000000000..488a3773e
--- /dev/null
+++ b/modules/backend/lang/cs/lang.php
@@ -0,0 +1,322 @@
+<?php
+
+return [
+    'auth' => [
+        'title' => 'Administrace'
+    ],
+    'field' => [
+        'invalid_type' => 'Byl použitý špatný typ :type.',
+        'options_method_not_exists' => "Modelová třída :model musí implementovat metodu :method(), která vrací volby pro formulářové pole ':field'"
+    ],
+    'widget' => [
+        'not_registered' => "Třída widgetu se jménem ':name' není zaregistrovaná.",
+        'not_bound' => "Widget s názvem třídy ':name' není navázaná na kontroler."
+    ],
+    'page' => [
+        'untitled' => 'Bez názvu',
+        'access_denied' => [
+            'label' => 'Přístup odmítnut',
+            'help' => 'Nemáte potřebná oprávnění k prohlížení této stránky.',
+            'cms_link' => 'Zpět do administrace'
+        ],
+        'invalid_token' => [
+            'label' => 'Neplatný bezpečností token'
+        ]
+    ],
+    'partial' => [
+        'not_found_name' => "Dílčí šablona ':name' nebyla nalezena."
+    ],
+    'account' => [
+        'sign_out' => 'Odhlásit',
+        'login' => 'Přihlásit se',
+        'reset' => 'Resetovat',
+        'restore' => 'Obnovit',
+        'login_placeholder' => 'login',
+        'password_placeholder' => 'heslo',
+        'forgot_password' => 'Zapomněli jste heslo?',
+        'enter_email' => 'Zadejte váš e-mail',
+        'enter_login' => 'Zadejte váš login',
+        'email_placeholder' => 'e-mail',
+        'enter_new_password' => 'Zadejte nové heslo',
+        'password_reset' => 'Obnova hesla',
+        'restore_success' => 'E-mail byl zaslán na vaší e-mailovou adresu s heslem a instrukcemi k obnově.',
+        'restore_error' => "Uživatel s přihlašovacím jménem ':login' nebyl nalezen",
+        'reset_success' => 'Vaše heslo bylo úspěšně obnoveno. Nyní se můžete přihlásit.',
+        'reset_error' => 'Data pro obnovu hesla nejsou správná. Prosím zkuste to znovu!',
+        'reset_fail' => 'Obnova hesla selhala!',
+        'apply' => 'Použít',
+        'cancel' => 'Zrušit',
+        'delete' => 'Smazat',
+        'ok' => 'OK'
+    ],
+    'dashboard' => [
+        'menu_label' => 'Plocha',
+        'widget_label' => 'Widget',
+        'widget_width' => 'Šířka',
+        'full_width' => 'plná šířka',
+        'add_widget' => 'Přidat widget',
+        'widget_inspector_title' => 'Nastavení widgetu',
+        'widget_inspector_description' => 'Zde si upravte všechna nastavení widgetu',
+        'widget_columns_label' => 'Šířka :columns',
+        'widget_columns_description' => 'Šířka widgetu, zadejte číslo mezi 1 a 10.',
+        'widget_columns_error' => 'Zadejte prosím šířku widgetu jako číslo mezi 1 a 10.',
+        'columns' => '{1} sloupec|[2,Inf] sloupce',
+        'widget_new_row_label' => 'Vždy na novém řádku',
+        'widget_new_row_description' => 'Vloží widget do nového řádku.',
+        'widget_title_label' => 'Název widgetu',
+        'widget_title_error' => 'Musíte zadat název widgetu',
+        'status' => [
+            'widget_title_default' => 'Status systému',
+            'online' => 'online',
+            'maintenance' => 'v údržbě',
+            'update_available' => '{0} dostupných aktualizací!|{1} dostupná aktualizace!|[2,Inf] dostupných aktualizací!'
+        ]
+    ],
+    'user' => [
+        'name' => 'Administrátor',
+        'menu_label' => 'Administrátoři',
+        'menu_description' => 'Správa uživatelů administrace, jejich skupin a opravnění.',
+        'list_title' => 'Správa administrátorů',
+        'new' => 'Nový administrátor',
+        'login' => 'Přihlašovací jméno',
+        'first_name' => 'Křestní jméno',
+        'last_name' => 'Příjmení',
+        'full_name' => 'Celé jméno',
+        'email' => 'E-mail',
+        'groups' => 'Skupiny',
+        'groups_comment' => 'Vyberte do jakých skupin uživatel patří.',
+        'avatar' => 'Avatar',
+        'password' => 'Heslo',
+        'password_confirmation' => 'Potvrzení hesla',
+        'permissions' => 'Oprávnění',
+        'account' => 'Účet',
+        'superuser' => 'Super uživatel',
+        'superuser_comment' => 'Má neomezený přístup do všech stránek administrace.',
+        'send_invite' => 'Zaslat pozvánku e-mailem',
+        'send_invite_comment' => 'Odešle uvítací e-mail s údaji pro přihlášení.',
+        'delete_confirm' => 'Opravdu chcete smazat tohoto administrátora?',
+        'return' => 'Návrat na seznam administrátorů',
+        'allow' => 'Povolit',
+        'inherit' => 'Podědit',
+        'deny' => 'Odmítnout',
+        'group' => [
+            'name' => 'Skupina',
+            'name_field' => 'Jméno',
+            'description_field' => 'Popis',
+            'is_new_user_default_field' => 'Zařadit nové administrátory automaticky do této skupiny.',
+            'code_field' => 'Kód',
+            'code_comment' => 'Zadejte unikátní kód pro přístup přes API.',
+            'menu_label' => 'Skupiny',
+            'list_title' => 'Správa skupin',
+            'new' => 'Nová skupina',
+            'delete_confirm' => 'Opravdu chcete smazat tuto skupinu administrátorů?',
+            'return' => 'Návrat na seznam skupin',
+            'users_count' => 'Uživatelů'
+        ],
+        'preferences' => [
+            'not_authenticated' => 'Nebyl nalezen žádný přihlášený uživatel pro načtení, nebo uložení nastavení.'
+        ]
+    ],
+    'list' => [
+        'default_title' => 'Seznam',
+        'search_prompt' => 'Hledat...',
+        'no_records' => 'Žádné záznamy v tomto pohledu.',
+        'missing_model' => 'List behavior used in :class does not have a model defined.',
+        'missing_column' => 'There are no column definitions for :columns.',
+        'missing_columns' => 'List used in :class has no list columns defined.',
+        'missing_definition' => "List behavior does not contain a column for ':field'.",
+        'behavior_not_ready' => 'List behavior has not been initialized, check that you have called makeLists() in your controller.',
+        'invalid_column_datetime' => "Column value ':column' is not a DateTime object, are you missing a \$dates reference in the Model?",
+        'pagination' => 'Zobrazuji záznamy: :from-:to z :total',
+        'prev_page' => 'Předchozí stránka',
+        'next_page' => 'Další stránka',
+        'loading' => 'Načítám...',
+        'setup_title' => 'Nastavení výpisu',
+        'setup_help' => 'Pomocí checkboxů si vyberte, které sloupce chcete ve výpisu vidět. Pozici změníte chytnutím a posunem nahorů, nebo dolů.',
+        'records_per_page' => 'Záznamů na stránku',
+        'records_per_page_help' => 'Vyberte kolik chcete vidět záznamů na jedné stránce. Vysoký počet záznamů může negativně ovlivnit rychlost stránek.',
+        'delete_selected' => 'Smazat vybrané',
+        'delete_selected_empty' => 'Nebyl vybrán žádný záznam ke smazání.',
+        'delete_selected_confirm' => 'Smazat vybrané záznamy?',
+        'delete_selected_success' => 'Vybrané záznamy byly úspěšně smazány.'
+    ],
+    'fileupload' => [
+        'attachment' => 'Příloha',
+        'help' => 'Přidat název a popisek k příloze.',
+        'title_label' => 'Název',
+        'description_label' => 'Popis',
+        'default_prompt' => 'Click the %s or drag a file here to upload',
+        'attachment_url' => 'URL přílohy',
+        'upload_file' => 'Nahrát soubor',
+        'upload_error' => 'Chyba nahrávání',
+        'remove_confirm' => 'Jste si jistí?',
+        'remove_file' => 'Odstranit soubor'
+    ],
+    'form' => [
+        'create_title' => 'Nový :name',
+        'update_title' => 'Upravit :name',
+        'preview_title' => 'Náhled :name',
+        'create_success' => ':name byl úspěšně vytvořen',
+        'update_success' => ':name byl úspěšně upraven',
+        'delete_success' => ':name byl úspěšně smazán',
+        'missing_id' => 'Musíte uvést ID záznamu.',
+        'missing_model' => 'Form behavior used in :class does not have a model defined.',
+        'missing_definition' => "Form behavior does not contain a field for ':field'.",
+        'not_found' => 'Form record with an ID of :id could not be found.',
+        'action_confirm' => 'Jste si jistí?',
+        'create' => 'Vytvořit',
+        'create_and_close' => 'Vytvořit a zavřít',
+        'creating' => 'Vytváření...',
+        'creating_name' => 'Vytváření :name...',
+        'save' => 'Uložit',
+        'save_and_close' => 'Uložit a zavřít',
+        'saving' => 'Ukládání...',
+        'saving_name' => 'Ukládání :name...',
+        'delete' => 'Smazat',
+        'deleting' => 'Mazání...',
+        'deleting_name' => 'Mazání :name...',
+        'reset_default' => 'Obnovit výchozí',
+        'resetting' => 'Obnovování',
+        'resetting_name' => 'Obnovování :name',
+        'undefined_tab' => 'Ostatní',
+        'field_off' => 'Off',
+        'field_on' => 'On',
+        'add' => 'Přidat',
+        'apply' => 'Použít',
+        'cancel' => 'Zrušit',
+        'close' => 'Zavřít',
+        'confirm' => 'Potvrdit',
+        'reload' => 'Znovu načíst',
+        'complete' => 'Kompletní',
+        'ok' => 'OK',
+        'or' => 'nebo',
+        'confirm_tab_close' => 'Opravdu chcete zavřít záložku? Neuložené změny budou ztraceny.',
+        'behavior_not_ready' => 'Chování formuláře není inicializováno, zkontrolujte jestli voláte metodu initForm() ve vašem kontroléru.',
+        'preview_no_files_message' => 'Žádný soubor nebyl nahrán.',
+        'preview_no_record_message' => 'Žádný záznam není vybraný.',
+        'select' => 'Vybrat',
+        'select_all' => 'vše',
+        'select_none' => 'nic',
+        'select_placeholder' => 'prosím vyberte',
+        'insert_row' => 'Vložit řádek',
+        'delete_row' => 'Smazat řádek',
+        'concurrency_file_changed_title' => 'Soubor byl změněn',
+        'concurrency_file_changed_description' => 'Soubor který upravujete byl na disku změněn jiným uživatelem. Můžete buď obnovit soubor a ztratit svoje změny, nebo přepsat soubor na disku.'
+    ],
+    'relation' => [
+        'missing_config' => "Relation behavior does not have any configuration for ':config'.",
+        'missing_definition' => "Relation behavior does not contain a definition for ':field'.",
+        'missing_model' => 'Relation behavior used in :class does not have a model defined.',
+        'invalid_action_single' => 'This action cannot be performed on a singular relationship.',
+        'invalid_action_multi' => 'This action cannot be performed on a multiple relationship.',
+        'help' => 'Pro přidání klikněte na položku',
+        'related_data' => 'Related :name data',
+        'add' => 'Přidat',
+        'add_selected' => 'Přidat vybrané',
+        'add_a_new' => 'Přidat nový :name',
+        'link_selected' => 'Link selected',
+        'link_a_new' => 'Link a new :name',
+        'cancel' => 'Zrušit',
+        'close' => 'Zavřít',
+        'add_name' => 'Přidat :name',
+        'create' => 'Vytvořit',
+        'create_name' => 'Vytvořit :name',
+        'update' => 'Upravit',
+        'update_name' => 'Upravit :name',
+        'preview' => 'Náhled',
+        'preview_name' => 'Náhled :name',
+        'remove' => 'Odstranit',
+        'remove_name' => 'Odstranit :name',
+        'delete' => 'Smazat',
+        'delete_name' => 'Smazat :name',
+        'delete_confirm' => 'Jste si jistí?',
+        'link' => 'Link',
+        'link_name' => 'Link :name',
+        'unlink' => 'Unlink',
+        'unlink_name' => 'Unlink :name',
+        'unlink_confirm' => 'Jste si jistí?'
+    ],
+    'reorder' => [
+        'default_title' => 'Seřadit záznamy',
+        'no_records' => 'Nenašli jsme žádné záznamy k seřazení.',
+    ],
+    'model' => [
+        'name' => 'Model',
+        'not_found' => "Model ':class' s ID :id nebyl nalezen",
+        'missing_id' => 'Není specifikované ID pro hledání záznamu v modelu.',
+        'missing_relation' => "Model ':class' neobsahuje definici pro ':relation'.",
+        'missing_method' => "Model ':class' nemá implementovanou metodu ':method'.",
+        'invalid_class' => "Model :model použitý ve třídě :class není validní, musí dědit ze třídy Model.",
+        'mass_assignment_failed' => "Mass assignment failed for Model attribute ':attribute'."
+    ],
+    'warnings' => [
+        'tips' => 'Tipy pro konfiguraci systému',
+        'tips_description' => 'Některé problémy s nastavením systému si vyžadují vaší pozornost.',
+        'permissions'  => 'Složka :name nebo její podsložky nejsou pro PHP zapisovatelné. Nastavte prosím odpovídající oprávnění webového serveru pro tuto složku.',
+        'extension' => 'PHP rozšíření :name není nainstalované. Nainstalujte prosím knihovnu a aktivujte rozšíření.'
+    ],
+    'editor' => [
+        'menu_label' => 'Nastavení editoru kódu',
+        'menu_description' => 'Nastavení editoru kódu, velikosti písma a barevného schématu.',
+        'font_size' => 'Velikost písma',
+        'tab_size' => 'Počet znaků odsazení',
+        'use_hard_tabs' => 'Odsazení tabulátory',
+        'code_folding' => 'Skládání kódu',
+        'word_wrap' => 'Zalamování řádek',
+        'highlight_active_line' => 'Zvýraznění aktivního řádku',
+        'auto_closing' => 'Automatické doplňování tagů a speciálních znaků',
+        'show_invisibles' => 'Zobrazit neviditelné znaky',
+        'show_gutter' => 'Zobrazit číslování řádků',
+        'theme' => 'Barevné schéma'
+    ],
+    'tooltips' => [
+        'preview_website' => 'Náhled stránek'
+    ],
+    'mysettings' => [
+        'menu_label' => 'Moje nastavení',
+        'menu_description' => 'Nastavení vašeho administrátorského účtu'
+    ],
+    'myaccount' => [
+        'menu_label' => 'Můj účet',
+        'menu_description' => 'Nastavte si svoje jméno, e-mailovou adresu a heslo.',
+        'menu_keywords' => 'bezpečnost login'
+    ],
+    'branding' => [
+        'menu_label' => 'Nastavení administrace',
+        'menu_description' => 'Nastavte si název, logo a barvy použité v administraci.',
+        'brand' => 'Značka',
+        'logo' => 'Logo',
+        'logo_description' => 'Nahrajte vlastní logo, které bude použité v administraci.',
+        'app_name' => 'Jméno aplikace',
+        'app_name_description' => 'Toto jméno se zobrazí v titulní liště stránek.',
+        'app_tagline' => 'Motto aplikace',
+        'app_tagline_description' => 'Toto motto se zobrazí na přihlašovací stránce administrace.',
+        'colors' => 'Barvy',
+        'primary_light' => 'Primární (světlá)',
+        'primary_dark' => 'Primární (tmavá)',
+        'secondary_light' => 'Sekundární (světlá)',
+        'secondary_dark' => 'Sekundární (tmavá)',
+        'styles' => 'Styly',
+        'custom_stylesheet' => 'Vlastní kaskádové styly'
+    ],
+    'backend_preferences' => [
+        'menu_label' => 'Nastavení administrace',
+        'menu_description' => 'Nastavte si svůj účet, jako třeba jazyk.',
+        'locale' => 'Jazyk',
+        'locale_comment' => 'Vyberte si jazyk administrace, který chcete používat.'
+    ],
+    'access_log' => [
+        'hint' => 'Tento záznam zobrazuje seznam úspěšných přihlášení do administrace. Záznamy jsou uchovávány :days dní.',
+        'menu_label' => 'Log přístupů',
+        'menu_description' => 'Zobrazit seznam úspěšných přihlášení do administrace.',
+        'created_at' => 'Datum & čas',
+        'login' => 'Login',
+        'ip_address' => 'IP adresa',
+        'first_name' => 'Jméno',
+        'last_name' => 'Příjmení',
+        'email' => 'E-mail'
+    ],
+    'filter' => [
+        'all' => 'vše'
+    ]
+];
diff --git a/modules/backend/models/BackendPreferences.php b/modules/backend/models/BackendPreferences.php
index ead2502ff..0f4282adf 100644
--- a/modules/backend/models/BackendPreferences.php
+++ b/modules/backend/models/BackendPreferences.php
@@ -36,6 +36,7 @@ class BackendPreferences extends Model
     public function getLocaleOptions()
     {
         $locales = Config::get('app.localeOptions', [
+            'cs' => [Lang::get('system::lang.locale.cs'), 'flag-cz'],
             'en' => [Lang::get('system::lang.locale.en'), 'flag-gb'],
             'de' => [Lang::get('system::lang.locale.de'), 'flag-de'],
             'es' => [Lang::get('system::lang.locale.es'), 'flag-es'],
diff --git a/modules/cms/lang/cs/lang.php b/modules/cms/lang/cs/lang.php
new file mode 100644
index 000000000..057ed3712
--- /dev/null
+++ b/modules/cms/lang/cs/lang.php
@@ -0,0 +1,300 @@
+<?php
+
+return [
+    'cms_object' => [
+        'invalid_file' => 'Invalid file name: :name. File names can contain only alphanumeric symbols, underscores, dashes and dots. Some examples of correct file names: page.htm, page, subdirectory/page',
+        'invalid_property' => "Parametr ':name' není možno nastavit",
+        'file_already_exists' => "Soubor ':name' již existuje.",
+        'error_saving' => "Chyba ukládání souboru ':name'. Zkontrolujte práva k zápisu.",
+        'error_creating_directory' => 'Chyba vytváření složky :name. Zkontrolujte práva k zápisu.',
+        'invalid_file_extension'=>'Chybná přípona souboru: :invalid. Povolené přípony jsou: :allowed.',
+        'error_deleting' => "Chyba mazání souboru s šablonou ':name'. Zkontrolujte práva k zápisu.",
+        'delete_success' => 'Šablony úspěšně smazány: :count.',
+        'file_name_required' => 'Je nutno vyplnit Název souboru.'
+    ],
+    'theme' => [
+        'not_found_name' => "Téma ':name' nebylo nalezeno.",
+        'active' => [
+            'not_set' => 'Aktivní téma nebylo nastaveno.',
+            'not_found' => 'Aktivní téma nebylo nalezeno.'
+        ],
+        'edit' => [
+            'not_set' => 'Editované téma nebylo uloženo.',
+            'not_found' => 'Editované téma nebylo nalezeno.',
+            'not_match' => "Objekt který chcete právě zobrazit nepatří do téma, které nyní editujete. Prosím obnovte stránku."
+        ],
+        'settings_menu' => 'Témata vzhledu',
+        'settings_menu_description' => 'Náhledy instalovaných témat a výběr aktivního téma.',
+        'default_tab' => 'Parametry',
+        'name_label' => 'Název',
+        'name_create_placeholder' => 'Název nového téma',
+        'author_label' => 'Autor',
+        'author_placeholder' => 'Jméno osoby, nebo firmy',
+        'description_label' => 'Popisek',
+        'description_placeholder' => 'Popište svoje téma',
+        'homepage_label' => 'Domovská stránka',
+        'homepage_placeholder' => 'URL domovské stránky',
+        'code_label' => 'Kód',
+        'code_placeholder' => 'Unikátní kód téma pro distribuci aktualizační sítí',
+        'dir_name_label' => 'Název složky',
+        'dir_name_create_label' => 'Název cílové složky pro uložení téma',
+        'theme_label' => 'Téma',
+        'theme_title' => 'Téma',
+        'activate_button' => 'Aktivovat',
+        'active_button' => 'Aktivní',
+        'customize_theme' => 'Přizpůsobení téma',
+        'customize_button' => 'Přizpůsobit',
+        'duplicate_button' => 'Duplikovat',
+        'duplicate_title' => 'Duplikovat téma',
+        'duplicate_theme_success' => 'Duplikace téma byla úspěšná!',
+        'manage_button' => 'Správa téma',
+        'manage_title' => 'Správa témat',
+        'edit_properties_title' => 'Téma',
+        'edit_properties_button' => 'Nastavit',
+        'save_properties' => 'Uložit nastavení',
+        'import_button' => 'Importovat',
+        'import_title' => 'Importovat téma',
+        'import_theme_success' => 'Téma úspěšně importováno!',
+        'import_uploaded_file' => 'Soubor s tématem',
+        'import_overwrite_label' => 'Přepsat existující soubory',
+        'import_overwrite_comment' => 'Odškrtněte tento box pokud chcete importovat pouze nové soubory.',
+        'import_folders_label' => 'Složky',
+        'import_folders_comment' => 'Vyberte prosím složky, které chcete importovat',
+        'export_button' => 'Exportovat',
+        'export_title' => 'Exportovat téma',
+        'export_folders_label' => 'Složky',
+        'export_folders_comment' => 'Vyberte prosím složky, které chcete exportovat',
+        'delete_button' => 'Smazat',
+        'delete_confirm' => 'Jste si jistí, že chcete smazat toto téma? Tuto akci nelze vrátit zpět!',
+        'delete_active_theme_failed' => 'Nelze smazat aktivní téma. Nejdříve aktivujte jiné téma.',
+        'delete_theme_success' => 'Téma úspěšně smazáno!',
+        'create_title' => 'Vytvořit téma',
+        'create_button' => 'Vytvořit',
+        'create_new_blank_theme' => 'Vytvořit nové čisté téma',
+        'create_theme_success' => 'Téma úspěšně vytvořeno!',
+        'create_theme_required_name' => 'Napište jméno pro nové téma.',
+        'new_directory_name_label' => 'Složka téma',
+        'new_directory_name_comment' => 'Zadejte název nové složky pro duplikaci téma.',
+        'dir_name_invalid' => 'Název může obsahovat pouze čísla, písmena a následující symboly: _-',
+        'dir_name_taken' => 'Tato složka s tématem již existuje.',
+        'find_more_themes' => 'Vyhledat více témat',
+        'saving' => 'Ukládám téma...',
+        'return' => 'Zpět na seznam témat',
+    ],
+    'maintenance' => [
+        'settings_menu' => 'Režim údržby',
+        'settings_menu_description' => 'Nastavte stránku režimu údržby a její nastavení.',
+        'is_enabled' => 'Aktivovat režim údržby',
+        'is_enabled_comment' => 'Pokud je režim údržby aktivní, uživatelé uvidí stránku vybranou níže.'
+    ],
+    'page' => [
+        'not_found_name' => "Stránka ':name' nebyla nalezena",
+        'not_found' => [
+            'label' => 'Stránka nenalezena',
+            'help' => 'Požadovaná stránka nebyla nalezena.'
+        ],
+        'custom_error' => [
+            'label' => 'Chyba stránky',
+            'help' => "Omlouváme se, ale požadovaná stránka nelze zobrazit z důvodu nějaké chyby."
+        ],
+        'menu_label' => 'Stránky',
+        'unsaved_label' => 'Neuložené stránky',
+        'no_list_records' => 'Žádné stránky',
+        'new' => 'Nová stránka',
+        'invalid_url' => 'Špatný formát URL. URL musí začínat lomítkem a může obsahovat pouze číslice, písmena a následující znaky: ._-[]:?|/+*^$',
+        'delete_confirm_multiple' => 'Opravdu chcete odstranit vybrané stránky?',
+        'delete_confirm_single' => 'Opravdu chcete odstranit tuto stránku?',
+        'no_layout' => '-- žádný layout --'
+    ],
+    'layout' => [
+        'not_found_name' => "Layout ':name' nebyl nalezen",
+        'menu_label' => 'Layouty',
+        'unsaved_label' => 'Neuložený layout(y)',
+        'no_list_records' => 'Žádné layouty nebyly nalezeny',
+        'new' => 'Nový layout',
+        'delete_confirm_multiple' => 'Opravdu chcete odstranit vybrané layouty?',
+        'delete_confirm_single' => 'Opravdu chcete odstranit tento layout?'
+    ],
+    'partial' => [
+        'not_found_name' => "Dílčí šablona ':name' nebyla nalezena.",
+        'invalid_name' => 'Chybný název dílčí šablony: :name.',
+        'menu_label' => 'Dílčí šablony',
+        'unsaved_label' => 'Neuložené dílčí šablony',
+        'no_list_records' => 'Žádné dílčí šablony',
+        'delete_confirm_multiple' => 'Opravdu chcete smazat tyto dílčí šablony?',
+        'delete_confirm_single' => 'Opravdu chcete smazat tuto dílčí šablonu?',
+        'new' => 'Nová šablona'
+    ],
+    'content' => [
+        'not_found_name' => "Obsahový soubor ':name' nebyl nalezen.",
+        'menu_label' => 'Obsahy',
+        'unsaved_label' => 'Neuložený obsah',
+        'no_list_records' => 'Žádné obsahové soubory',
+        'delete_confirm_multiple' => 'Opravdu chcete smazat tyto obsahové soubory nebo složky?',
+        'delete_confirm_single' => 'Opravdu chcete smazat tento obsahový soubor?',
+        'new' => 'Žádný obsahový soubor'
+    ],
+    'ajax_handler' => [
+        'invalid_name' => 'Invalid AJAX handler name: :name.',
+        'not_found' => "AJAX handler ':name' was not found."
+    ],
+    'cms' => [
+        'menu_label' => 'CMS'
+    ],
+    'sidebar' => [
+        'add' => 'Přidat',
+        'search' => 'Hledat...'
+    ],
+    'editor' => [
+        'settings' => 'Nastavení',
+        'title' => 'Název souboru',
+        'new_title' => 'Nový název souboru',
+        'url' => 'URL',
+        'filename' => 'Název souboru',
+        'layout' => 'Layout',
+        'description' => 'Popisek',
+        'preview' => 'Náhled',
+        'meta' => 'Meta údaje',
+        'meta_title' => 'Meta Title',
+        'meta_description' => 'Meta Description',
+        'markup' => 'Markup',
+        'code' => 'PHP kód',
+        'content' => 'Obsah',
+        'hidden' => 'Skrytý',
+        'hidden_comment' => 'Skryté stránky jsou dostupné pouze přihlášeným administrátorům pro náhled.',
+        'enter_fullscreen' => 'Zapnout režim celé obrazovky',
+        'exit_fullscreen' => 'Opustit režim celé obrazovky'
+    ],
+    'asset' => [
+        'menu_label' => 'Soubory',
+        'unsaved_label' => 'Neuložené soubory',
+        'drop_down_add_title' => 'Přidat...',
+        'drop_down_operation_title' => 'Akce...',
+        'upload_files' => 'Nahrát soubor(y)',
+        'create_file' => 'Vytvořit soubor',
+        'create_directory' => 'Vytvořit složku',
+        'directory_popup_title' => 'Vytvoření nové složky',
+        'directory_name' => 'Název složky',
+        'rename' => 'Přejmenovat',
+        'delete' => 'Smazat',
+        'move' => 'Přesunout',
+        'select' => 'Vybrat',
+        'new' => 'Nový soubor',
+        'rename_popup_title' => 'Přejmenovat',
+        'rename_new_name' => 'Nový název',
+        'invalid_path' => 'Cesta může obsahovat pouze číslice, písmena, mezery nebo následující znaky: ._-/',
+        'error_deleting_file' => 'Chyba mazání souboru :name.',
+        'error_deleting_dir_not_empty' => 'Chyba mazání složky :name. Složka není prázdná.',
+        'error_deleting_dir' => 'Chyba mazání souboru :name.',
+        'invalid_name' => 'Název může obsahovat pouze číslice, písmena, mezery a následující soubory: ._-',
+        'original_not_found' => 'Původní soubor nebo složka neexistují',
+        'already_exists' => 'Soubor nebo složka s tímto názvem již existují',
+        'error_renaming' => 'Chyba přejmenovávání souboru nebo složky',
+        'name_cant_be_empty' => 'Název nemůže být prázdný',
+        'too_large' => 'Nahrávaný soubor je příliš veliký. Maximální povolená velikost je :max_size',
+        'type_not_allowed' => 'Je možno nahrávat pouze tyto typy souborů: :allowed_types',
+        'file_not_valid' => 'Soubor není validní',
+        'error_uploading_file' => "Chyba nahrávání souboru ':name': :error",
+        'move_please_select' => 'prosím vyberte',
+        'move_destination' => 'Cílová složka',
+        'move_popup_title' => 'Přesunutí souborů',
+        'move_button' => 'Přesunout',
+        'selected_files_not_found' => 'Vybrané soubory nebyly nalezeny',
+        'select_destination_dir' => 'Vyberte cílovou složku',
+        'destination_not_found' => 'Cílová složka nebyla nalezena',
+        'error_moving_file' => 'Chyba přesunu souboru :file',
+        'error_moving_directory' => 'Chyba přesunu složky :dir',
+        'error_deleting_directory' => 'Chyba přesunu původní složky :dir',
+        'path' => 'Cesta'
+    ],
+    'component' => [
+        'menu_label' => 'Komponenty',
+        'unnamed' => 'Bez jména',
+        'no_description' => 'Popis nevyplněn',
+        'alias' => 'Alias',
+        'alias_description' => 'Unikátní název komponenty pro použití ve stránkách, nebo kodéch layoutu.',
+        'validation_message' => 'Alias komponenty je povinný a může obsahovat pouze písmena, čísla a podtržítka. Alias by měl začínat písmenem.',
+        'invalid_request' => 'Šablona nemohla být uložena, protože jedna z komponent nemá správně vyplněná data.',
+        'no_records' => 'Žádná komponenta',
+        'not_found' => "Komponenta ':name' nebyla nalezena.",
+        'method_not_found' => "Komponenta ':name' nemá metodu ':method'."
+    ],
+    'template' => [
+        'invalid_type' => 'Neznámý typ šablony.',
+        'not_found' => 'Požadovaná šablona nebyla nalezena.',
+        'saved'=> 'Šablona byla úspěšně uložena.'
+    ],
+    'permissions' => [
+        'name' => 'Cms',
+        'manage_content' => 'Správa obsahu',
+        'manage_assets' => 'Správa souborů',
+        'manage_pages' => 'Správa stránek',
+        'manage_layouts' => 'Správa layoutů',
+        'manage_partials' => 'Správa dílčích šablon',
+        'manage_themes' => 'Správa témat',
+        'manage_media' => 'Správa médií'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Klikněte na tlačítko %s pro hledání souboru'
+    ],
+    'media' => [
+        'invalid_path' => "Chybně zadaná cesta: ':path'.",
+        'menu_label' => 'Media',
+        'upload' => 'Nahrát',
+        'move' => 'Přesunout',
+        'delete' => 'Smazat',
+        'add_folder' => 'Přidat složku',
+        'search' => 'Vyhledat',
+        'display' => 'Zobrazit',
+        'filter_everything' => 'Vše',
+        'filter_images' => 'Obrázky',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Dokumenty',
+        'library' => 'Knihovna',
+        'folder_size_items' => 'soubor(ů)',
+        'size' => 'Velikost',
+        'title' => 'Název',
+        'last_modified' => 'Naposledy upraveno',
+        'public_url' => 'Veřejná URL',
+        'click_here' => 'Klikněte zde',
+        'thumbnail_error' => 'Chyba generování náhledu.',
+        'return_to_parent' => 'Zpět do nadřazené složky',
+        'return_to_parent_label' => 'Go up ..',
+        'nothing_selected' => 'Nic nevybráno.',
+        'multiple_selected' => 'Vybráno více položek.',
+        'uploading_file_num' => 'Nahrávám :number soubor(y)...',
+        'uploading_complete' => 'Nahrávání kompletní',
+        'order_by' => 'Seřadit dle',
+        'folder' => 'Složka',
+        'no_files_found' => 'No files found by your request.',
+        'delete_empty' => 'Vyberte položky ke smazání.',
+        'delete_confirm' => 'Opravu chcete smazat vybrané položky?',
+        'error_renaming_file' => 'Přejmenování se nezdařilo.',
+        'new_folder_title' => 'Nová složka',
+        'folder_name' => 'Název složky',
+        'error_creating_folder' => 'Chyba vytváření složky',
+        'folder_or_file_exist' => 'A folder or file with the specified name already exists.',
+        'move_empty' => 'Vyberte položky k přesunutí.',
+        'move_popup_title' => 'Přesun souborů nebo složek',
+        'move_destination' => 'Cílová složka',
+        'please_select_move_dest' => 'Prosím vyberte cílovou složku.',
+        'move_dest_src_match' => 'Prosím vyberte jinou cílovou složku.',
+        'empty_library' => 'Knihovna médií je prázdná. Nahrajte prosím soubory, nebo vytvořte složky.',
+        'insert' => 'Vložit',
+        'crop_and_insert' => 'Oříznout & vložit',
+        'select_single_image' => 'Prosím vyberte pouze jeden obrázek.',
+        'selection_not_image' => 'Vybraná položka není obrázek.',
+        'restore' => 'Zpět všechny změny',
+        'resize' => 'Změnit velikost...',
+        'selection_mode_normal' => 'Normální',
+        'selection_mode_fixed_ratio' => 'Pevný poměr stran',
+        'selection_mode_fixed_size' => 'Pevná velikost',
+        'height' => 'Výška',
+        'width' => 'Šířka',
+        'selection_mode' => 'Selection mode',
+        'resize_image' => 'Změna rozměrů obrázku',
+        'image_size' => 'Velikost obrázku:',
+        'selected_size' => 'Vybrané:'
+    ]
+];
diff --git a/modules/system/assets/js/lang/lang.cs.js b/modules/system/assets/js/lang/lang.cs.js
new file mode 100644
index 000000000..cebee4c12
--- /dev/null
+++ b/modules/system/assets/js/lang/lang.cs.js
@@ -0,0 +1,9 @@
+/*
+ * This file has been compiled from: /modules/system/lang/cs/client.php
+ */
+if ($.oc === undefined) $.oc = {}
+if ($.oc.langMessages === undefined) $.oc.langMessages = {}
+$.oc.langMessages['cs'] = $.extend(
+    $.oc.langMessages['cs'] || {},
+    {"markdowneditor":{"formatting":"Form\u00e1tov\u00e1n\u00ed","quote":"Citace","code":"K\u00f3d","header1":"Nadpis 1","header2":"Nadpis 2","header3":"Nadpis 3","header4":"Nadpis 4","header5":"Nadpis 5","header6":"Nadpis 6","bold":"Tu\u010dn\u011b","italic":"Kurz\u00edvou","unorderedlist":"Ne\u010d\u00edslovan\u00fd seznam","orderedlist":"\u010c\u00edslovan\u00fd seznam","video":"Video","image":"Obr\u00e1zek","link":"Odkaz","horizontalrule":"Vlo\u017eit horizont\u00e1ln\u00ed linku","fullscreen":"Cel\u00e1 obrazovka","preview":"N\u00e1hled"},"mediamanager":{"insert_link":"Vlo\u017eit odkaz","insert_image":"Vlo\u017eit obr\u00e1zek","insert_video":"Vlo\u017eit video","insert_audio":"Vlo\u017eit zvuk","invalid_file_empty_insert":"Pros\u00edm vyberte soubor, na kter\u00fd se vlo\u017e\u00ed odkaz.","invalid_file_single_insert":"Vyberte jeden soubor.","invalid_image_empty_insert":"Vyberte soubor(y) pro vlo\u017een\u00ed.","invalid_video_empty_insert":"Vyberte video soubor pro vlo\u017een\u00ed.","invalid_audio_empty_insert":"Vyberte audio soubor pro vlo\u017een\u00ed."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Zru\u0161it"}}
+);
\ No newline at end of file
diff --git a/modules/system/lang/cs/client.php b/modules/system/lang/cs/client.php
new file mode 100644
index 000000000..c6a276222
--- /dev/null
+++ b/modules/system/lang/cs/client.php
@@ -0,0 +1,57 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Client-side Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | These are messages made available to the client browser via JavaScript.
+    | To compile this file run: php artisan october:util compile lang
+    |
+    */
+
+    'markdowneditor' => [
+        'formatting' => 'Formátování',
+        'quote' => 'Citace',
+        'code' => 'Kód',
+        'header1' => 'Nadpis 1',
+        'header2' => 'Nadpis 2',
+        'header3' => 'Nadpis 3',
+        'header4' => 'Nadpis 4',
+        'header5' => 'Nadpis 5',
+        'header6' => 'Nadpis 6',
+        'bold' => 'Tučně',
+        'italic' => 'Kurzívou',
+        'unorderedlist' => 'Nečíslovaný seznam',
+        'orderedlist' => 'Číslovaný seznam',
+        'video' => 'Video',
+        'image' => 'Obrázek',
+        'link' => 'Odkaz',
+        'horizontalrule' => 'Vložit horizontální linku',
+        'fullscreen' => 'Celá obrazovka',
+        'preview' => 'Náhled',
+    ],
+
+    'mediamanager' => [
+        'insert_link' => "Vložit odkaz",
+        'insert_image' => "Vložit obrázek",
+        'insert_video' => "Vložit video",
+        'insert_audio' => "Vložit zvuk",
+        'invalid_file_empty_insert' => "Prosím vyberte soubor, na který se vloží odkaz.",
+        'invalid_file_single_insert' => "Vyberte jeden soubor.",
+        'invalid_image_empty_insert' => "Vyberte soubor(y) pro vložení.",
+        'invalid_video_empty_insert' => "Vyberte video soubor pro vložení.",
+        'invalid_audio_empty_insert' => "Vyberte audio soubor pro vložení.",
+    ],
+
+    'alert' => [
+        'confirm_button_text' => 'OK',
+        'cancel_button_text' => 'Zrušit',
+    ],
+
+];
+
+
+
diff --git a/modules/system/lang/cs/lang.php b/modules/system/lang/cs/lang.php
new file mode 100644
index 000000000..dff4112c4
--- /dev/null
+++ b/modules/system/lang/cs/lang.php
@@ -0,0 +1,323 @@
+<?php
+
+return [
+    'app' => [
+        'name' => 'October CMS',
+        'tagline' => 'Getting back to basics'
+    ],
+    'locale' => [
+        'cs' => 'Czech',
+        'en' => 'English',
+        'de' => 'German',
+        'el' => 'Greek',
+        'es' => 'Spanish',
+        'es-ar' => 'Spanish (Argentina)',
+        'fa' => 'Persian',
+        'fr' => 'French',
+        'hu' => 'Hungarian',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => 'Japanese',
+        'lv' => 'Latvian',
+        'nb-no' => 'Norwegian (Bokmål)',
+        'nl' => 'Dutch',
+        'pl' => 'Polish',
+        'pt-br' => 'Portuguese (Brazil)',
+        'ro' => 'Romanian',
+        'ru' => 'Russian',
+        'sv' => 'Swedish',
+        'sk' => 'Slovak (Slovakia)',
+        'tr' => 'Turkish',
+        'zh-cn' => 'Chinese (China)',
+        'zh-tw' => 'Chinese (Taiwan)'
+    ],
+    'directory' => [
+        'create_fail' => 'Nelze vytvořit složku: :name'
+    ],
+    'file' => [
+        'create_fail' => 'Nelze vytvořit soubor: :name'
+    ],
+    'combiner' => [
+        'not_found' => "Slučující soubor ':name' nebyl nalezen."
+    ],
+    'system' => [
+        'name' => 'System',
+        'menu_label' => 'System',
+        'categories' => [
+            'cms' => 'CMS',
+            'misc' => 'Ostatní',
+            'logs' => 'Záznamy',
+            'mail' => 'E-mail',
+            'shop' => 'E-shop',
+            'team' => 'Tým',
+            'users' => 'Uživatelé',
+            'system' => 'System',
+            'social' => 'Sociální',
+            'events' => 'Události',
+            'customers' => 'Zákazníci',
+            'my_settings' => 'Moje nastavení'
+        ]
+    ],
+    'theme' => [
+        'label' => 'Téma',
+        'unnamed' => 'Téma bez názvu',
+        'name' => [
+            'label' => 'Název téma',
+            'help' => 'Název téma podle jeho unikátního názvu, například RainLab.Vanilla'
+        ],
+    ],
+    'themes' => [
+        'install' => 'Instalace témat',
+        'search' => 'vyhledejte téma k instalaci...',
+        'installed' => 'Instalované téma',
+        'no_themes' => 'Žádné téma instalované z tržiště.',
+        'recommended' => 'Doporučené',
+        'remove_confirm' => 'Opravdu chcete odstranit toto téma?'
+    ],
+    'plugin' => [
+        'label' => 'Pluginy',
+        'unnamed' => 'Plugin bez jména',
+        'name' => [
+            'label' => 'Název pluginu',
+            'help' => 'Pojmenujte plugin unikátním kódem, například RainLab.Blog'
+        ]
+    ],
+    'plugins' => [
+        'manage' => 'Správa pluginů',
+        'enable_or_disable' => 'Aktivovat, nebo deaktivovat',
+        'enable_or_disable_title' => 'Zapne, nebo vyplne pluginy',
+        'install' => 'Instalace pluginů',
+        'install_products' => 'Instalované produkty',
+        'search' => 'vyhledejte pluginy k instalaci...',
+        'installed' => 'Instalované pluginy',
+        'no_plugins' => 'Žádné instalované pluginy z tržiště.',
+        'recommended' => 'Doporučené',
+        'remove' => 'Odstranit',
+        'refresh' => 'Obnovit',
+        'disabled_label' => 'Neaktivní',
+        'disabled_help' => 'Neaktivní pluginy jsou kompletně ignorovány systémem.',
+        'frozen_label' => 'Zmrazit aktualizace',
+        'frozen_help' => 'Zmrazené pluginy se neaktualizují.',
+        'selected_amount' => 'Vybrané pluginy: :amount',
+        'remove_confirm' => 'Opravdu chcete odstranit tento plugin?',
+        'remove_success' => 'Plugin úspěšně odstraněn ze systému.',
+        'refresh_confirm' => 'Jste si jistí?',
+        'refresh_success' => 'Pluginy byly úspěšně obnoveny.',
+        'disable_confirm' => 'Jste si jistí?',
+        'disable_success' => 'Pluginy úspěšně deaktivovány.',
+        'enable_success' => 'Pluginy úspěšně aktivovány.',
+        'unknown_plugin' => 'Plugin odstraněn ze systému.'
+    ],
+    'project' => [
+        'name' => 'Projekt',
+        'owner_label' => 'Vlastník',
+        'attach' => 'Připojit projekt',
+        'detach' => 'Odpojit projekt',
+        'none' => 'Žádný',
+        'id' => [
+            'label' => 'Projekt ID',
+            'help' => 'Jak zjistím svoje Projektové ID',
+            'missing' => 'Zadejte vaše Projektové ID.'
+        ],
+        'detach_confirm' => 'Jste si jistí, že chcete odpojit váš projekt?',
+        'unbind_success' => 'Projekt byl úspěšně odpojen.'
+    ],
+    'settings' => [
+        'menu_label' => 'Nastavení',
+        'not_found' => 'Takové nastavení se nepovedlo najít.',
+        'missing_model' => 'Stránka s nastavením vyžaduje definovat Model.',
+        'update_success' => 'Nastavení pro :name byla úspěšně uložena.',
+        'return' => 'Zpět do systémového nastavení',
+        'search' => 'Hledat'
+    ],
+    'mail' => [
+        'log_file' => 'Log file',
+        'menu_label' => 'Nastavení e-mailů',
+        'menu_description' => 'Konfigurace posílání e-mailových zpráv.',
+        'general' => 'Obecné',
+        'method' => 'Metoda posílání zpráv',
+        'sender_name' => 'Jméno odesílatele',
+        'sender_email' => 'E-mail odesílatele',
+        'php_mail' => 'PHP mail',
+        'smtp' => 'SMTP',
+        'smtp_address' => 'SMTP adresa',
+        'smtp_authorization' => 'Vyžadována SMTP autorizace',
+        'smtp_authorization_comment' => 'Zaškrtněte pokud váš SMTP vyžaduje autorizaci.',
+        'smtp_username' => 'Uživatelské jméno',
+        'smtp_password' => 'Heslo',
+        'smtp_port' => 'SMTP port',
+        'smtp_ssl' => 'Vyžadováno SSL připojení',
+        'smtp_encryption' => 'SMTP šifrovací protokol',
+        'smtp_encryption_none' => 'Bez šifrování',
+        'smtp_encryption_tls' => 'TLS',
+        'smtp_encryption_ssl' => 'SSL',
+        'sendmail' => 'Sendmail',
+        'sendmail_path' => 'Sendmail cesta',
+        'sendmail_path_comment' => 'Zadejte prosím cestu k sendmail programu.',
+        'mailgun' => 'Mailgun',
+        'mailgun_domain' => 'Mailgun doména (domain)',
+        'mailgun_domain_comment' => 'Zadejte doménové jméno (domain name) pro Mailgun.',
+        'mailgun_secret' => 'Mailgun tajný klíč (secret)',
+        'mailgun_secret_comment' => 'Zadejte váš Mailgun API klíč.',
+        'mandrill' => 'Mandrill',
+        'mandrill_secret' => 'Mandrill tajný klíč (secret)',
+        'mandrill_secret_comment' => 'Zadejte váš Mandrill API klíč.',
+        'drivers_hint_header' => 'Ovladač není nainstalovaný',
+        'drivers_hint_content' => 'Tato metoda posílání e-mailů vyžaduje nainstalovaný plugin ":plugin" ještě před odesláním první zprávy.'
+    ],
+    'mail_templates' => [
+        'menu_label' => 'E-mailové šablony',
+        'menu_description' => 'Úprava e-mailových šablon, které se posílají uživatelům a administrátorům. Úprava e-mailových layoutů.',
+        'new_template' => 'Nová šablona',
+        'new_layout' => 'Nový layout',
+        'template' => 'Šablona',
+        'templates' => 'Šablony',
+        'menu_layouts_label' => 'E-mailové layouty',
+        'layout' => 'Layout',
+        'layouts' => 'Layouty',
+        'no_layout' => '-- žádný layout --',
+        'name' => 'Jméno',
+        'name_comment' => 'Unikátní název přes který se odkazujeme na šablonu',
+        'code' => 'Kód',
+        'code_comment' => 'Unikátní kód přes který se odkazujeme na šablonu',
+        'subject' => 'Předmět',
+        'subject_comment' => 'Předmět e-mailové zprávy',
+        'description' => 'Popis',
+        'content_html' => 'HTML',
+        'content_css' => 'CSS',
+        'content_text' => 'Čistý text',
+        'test_send' => 'Poslat testovací zprávu',
+        'test_success' => 'Testovací zpráva byla úspěšně odeslána.',
+        'return' => 'Zpět na seznam šablon',
+        'test_confirm' => 'Testovací zpráva bude zaslána na :email. Chcete pokračovat?',
+        'saving' => 'Ukládání šablony...',
+        'sending' => 'Posílání testovací zprávy...',
+    ],
+    'install' => [
+        'project_label' => 'Připojit k projektu',
+        'plugin_label' => 'Instalace pluginu',
+        'theme_label' => 'Instalace téma',
+        'missing_plugin_name' => 'Zadejte prosím jméno pluginu které chcete instalovat.',
+        'missing_theme_name' => 'Zadejte prosím jméno téma které chcete instalovat.',
+        'install_completing' => 'Dokončování instalace',
+        'install_success' => 'Plugin byl úspěšně nainstalován.'
+    ],
+    'updates' => [
+        'title' => 'Správa aktualizací',
+        'name' => 'Software update',
+        'menu_label' => 'Aktualizace',
+        'menu_description' => 'Aktualizace systému, správa a instalace pluginů a témat.',
+        'return_link' => 'Zpět na systémové aktualizace',
+        'check_label' => 'Kontrola aktualizací',
+        'retry_label' => 'Zkusit znovu',
+        'plugin_name' => 'Název',
+        'plugin_code' => 'Kód',
+        'plugin_description' => 'Popis',
+        'plugin_version' => 'Verze',
+        'plugin_author' => 'Autor',
+        'core_current_build' => 'Aktuální sestavení',
+        'core_build' => 'Sestavení :build',
+        'core_build_help' => 'Nejnovější sestavení je dostupné.',
+        'core_downloading' => 'Stahování aplikačních souborů',
+        'core_extracting' => 'Rozbalování aplikačních souborů',
+        'plugins' => 'Pluginy',
+        'themes' => 'Témata',
+        'disabled' => 'Neaktivní',
+        'plugin_downloading' => 'Stahování pluginu: :name',
+        'plugin_extracting' => 'Rozbalování pluginu: :name',
+        'plugin_version_none' => 'Nový plugin',
+        'plugin_current_version' => 'Stávající verze',
+        'theme_new_install' => 'Instalace nového téma.',
+        'theme_downloading' => 'Stahuji téma: :name',
+        'theme_extracting' => 'Rozbalování téma: :name',
+        'update_label' => 'Aktualizace',
+        'update_completing' => 'Dokončování aktualizace',
+        'update_loading' => 'Načítám dostupné aktualizace...',
+        'update_success' => 'Aktualizace systému proběhla úspěšně.',
+        'update_failed_label' => 'Aktualizace selhala',
+        'force_label' => 'Vynutit aktualizaci',
+        'found' => [
+            'label' => 'Nová aktualizace nalezeny!',
+            'help' => 'Klikněte na Instalovat aktualizace pro spuštění aktualizace.'
+        ],
+        'none' => [
+            'label' => 'Žádné aktualizace',
+            'help' => 'Nebyly nalezeny žádná aktualizace.'
+        ],
+        'important_action' => [
+            'empty' => 'Vyberte akci',
+            'confirm' => 'Potvrdit aktualizaci',
+            'skip' => 'Přeskočit tento plugin (pouze jednou)',
+            'ignore' => 'Přeskočit tento plugin (vždy)',
+        ],
+        'important_action_required' => 'Je vyžadována akce',
+        'important_view_guide' => 'Zobrazit aktualizační příručku',
+        'important_alert_text' => 'Některé aktualizace vyžadují vaší pozornost.',
+        'details_title' => 'Detaily pluginu',
+        'details_view_homepage' => 'Zobrazit domovskou stránku',
+        'details_readme' => 'Dokumentace',
+        'details_readme_missing' => 'Není uvedená žádná dokumentace.',
+        'details_upgrades' => 'Instalační příručka',
+        'details_upgrades_missing' => 'Nejsou uvedené žádné aktualizační instrukce.',
+        'details_current_version' => 'Stávající verze',
+        'details_author' => 'Autor',
+    ],
+    'server' => [
+        'connect_error' => 'Chyba připojení k serveru.',
+        'response_not_found' => 'Aktualizační server nebyl nalezen.',
+        'response_invalid' => 'Špatná odpověď ze serveru.',
+        'response_empty' => 'Prázdná odpověď ze serveru.',
+        'file_error' => 'Chyba stahování balíčku ze serveru.',
+        'file_corrupt' => 'Soubor stažený ze serveru je chybný.'
+    ],
+    'behavior' => [
+        'missing_property' => 'Třída :class musí definovat parametr $:property použitý v třídě chování :behavior.'
+    ],
+    'config' => [
+        'not_found' => 'Nepovedlo se najít konfigurační soubor :file, který je definován pro :location.',
+        'required' => "Konfigurace použitá v :location musí obsahovat hodnotu ':property'."
+    ],
+    'zip' => [
+        'extract_failed' => "Nepovedlo se rozbalit soubor ':file'."
+    ],
+    'event_log' => [
+        'hint' => 'Záznam potencionálních chyb v aplikaci, jako třeba vyjímky, nebo ladící informace.',
+        'menu_label' => 'Záznam událostí',
+        'menu_description' => 'Zobrazení záznamu události s časem a detaily.',
+        'empty_link' => 'Smazat záznam událostí',
+        'empty_loading' => 'Mazání záznamu událostí...',
+        'empty_success' => 'Záznam událostí úspěšně vymazán.',
+        'return_link' => 'Zpět na záznam událostí',
+        'id' => 'ID',
+        'id_label' => 'ID události',
+        'created_at' => 'Datum & Čas',
+        'message' => 'Zpráva',
+        'level' => 'Úroveň'
+    ],
+    'request_log' => [
+        'hint' => 'Tento záznam obsahuje požadavky na vaše stránky, které vyžadují pozornost, například stránky které nebylo možné najít, nebo vrací chybový kód 404.',
+        'menu_label' => 'Záznam požadavků',
+        'menu_description' => 'Záznam špatných požadavků, jako třeba nenalezené stránky (404).',
+        'empty_link' => 'Smazat záznam požadavků',
+        'empty_loading' => 'Mazání záznamu požadavků...',
+        'empty_success' => 'Záznam požadavků úspěšně vymazán.',
+        'return_link' => 'Zpět na záznam událostí',
+        'id' => 'ID',
+        'id_label' => 'Log ID',
+        'count' => 'Počítadlo',
+        'referer' => 'Odkaz',
+        'url' => 'URL',
+        'status_code' => 'Status'
+    ],
+    'permissions' => [
+        'name' => 'Systém',
+        'manage_system_settings' => 'Správa systémového nastavení',
+        'manage_software_updates' => 'Správa aktualizací',
+        'access_logs' => 'Zobrazit záznam přístupů',
+        'manage_mail_templates' => 'Správa e-mailových šablon',
+        'manage_mail_settings' => 'Správa posílání e-mailů',
+        'manage_other_administrators' => 'Správa ostatních administrátorů',
+        'view_the_dashboard' => 'Zobrazit plochu',
+        'manage_branding' => 'Nastavení administrace'
+    ]
+];
diff --git a/modules/system/lang/cs/validation.php b/modules/system/lang/cs/validation.php
new file mode 100644
index 000000000..4932fe669
--- /dev/null
+++ b/modules/system/lang/cs/validation.php
@@ -0,0 +1,99 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | such as the size rules. Feel free to tweak each of these messages.
+    |
+    */
+
+    "accepted"         => "The :attribute must be accepted.",
+    "active_url"       => ":attribute není validní URL.",
+    "after"            => ":attribute musí být datum po :date.",
+    "alpha"            => ":attribute musí obsahovat pouze písmena.",
+    "alpha_dash"       => ":attribute musí obsahovat pouze písmena, čísla, nebo pomlčky.",
+    "alpha_num"        => ":attribute může obsahovat pouze písmena nebo čísla.",
+    "array"            => ":attribute musí být pole.",
+    "before"           => ":attribute musí být datum před :date.",
+    "between"          => [
+        "numeric" => ":attribute musí být mezi :min - :max.",
+        "file"    => ":attribute musí být mezi :min - :max kilobytama.",
+        "string"  => ":attribute musí být mezi :min - :max znaky.",
+        "array"   => ":attribute musí být mezi :min - :max položkami.",
+    ],
+    "confirmed"        => ":attribute potvrzení nesouhlasí.",
+    "date"             => ":attribute není validní datum.",
+    "date_format"      => ":attribute neodpovídá formátu :format.",
+    "different"        => ":attribute a :other musí být rozdílné.",
+    "digits"           => ":attribute musí být :digits číslic.",
+    "digits_between"   => ":attribute musí mít mezi :min a :max číslicemi.",
+    "email"            => ":attribute má nesprávný formát.",
+    "exists"           => "Vybraný atribut :attribute již existuje.",
+    "image"            => ":attribute musí být obrázek.",
+    "in"               => "Vybraný atribut :attribute není správný.",
+    "integer"          => ":attribute musí být číslo.",
+    "ip"               => ":attribute musí být validní IP adresa.",
+    "max"              => [
+        "numeric" => ":attribute nesmí být delší než :max.",
+        "file"    => ":attribute nesmí být větší než :max kilobytes.",
+        "string"  => ":attribute nesmí být větší než :max characters.",
+        "array"   => ":attribute nesmí mít více než :max položek.",
+    ],
+    "mimes"            => ":attribute musí být soubor následujícího typu: :values.",
+    "extensions"       => ":attribute musí mít některou z následujících přípon: :values.",
+    "min"              => [
+        "numeric" => ":attribute musí být alespoň číslo :min.",
+        "file"    => ":attribute musí mít alespoň :min kilobytů.",
+        "string"  => ":attribute musí mít alespoň :min znaků.",
+        "array"   => ":attribute musí mít alespoň :min položek.",
+    ],
+    "not_in"           => "selected :attribute je nesprávný.",
+    "numeric"          => ":attribute musí být číslo.",
+    "regex"            => ":attribute formát není správný.",
+    "required"         => ":attribute pole je povinné.",
+    "required_if"      => ":attribute pole je povinné pokud :other je :value.",
+    "required_with"    => ":attribute pole je povinné pokud :values je uvedeno.",
+    "required_without" => ":attribute pole je povinné pokud :values není uvedeno.",
+    "same"             => ":attribute a :other musí souhlasit.",
+    "size"             => [
+        "numeric" => ":attribute musí mít velikost :size.",
+        "file"    => ":attribute musí mít :size kilobytů.",
+        "string"  => ":attribute musí mít :size znaků.",
+        "array"   => ":attribute musí obsahovat :size položek.",
+    ],
+    "unique"           => ":attribute je již použitý.",
+    "url"              => ":attribute formát není správný.",
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+];

From bf961a9a5ac77ae808a157a1406c3a0f169294a8 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 16 Sep 2015 05:53:36 +1000
Subject: [PATCH 031/103] Write tests for deferred binding

---
 CHANGELOG.md                                  |   3 +
 .../plugins/database/BelongsToModelTest.php   |  45 +++++++-
 .../plugins/database/DeferredBindingTest.php  | 109 ++++++++++++++++++
 3 files changed, 155 insertions(+), 2 deletions(-)
 create mode 100644 tests/unit/plugins/database/DeferredBindingTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1945e4599..b81797e0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* **Build 297** (2015-09-16)
+  - Fixed a bug in deferred binding that allowed repeat bindings and ignored add/delete pairs.
+
 * **Build 293** (2015-09-07)
   - Corrected a flaw in the Behavior/Extension logic that previously made protected methods and properties accessible as if they were public.
 
diff --git a/tests/unit/plugins/database/BelongsToModelTest.php b/tests/unit/plugins/database/BelongsToModelTest.php
index 06886e7c5..fb7d95ed8 100644
--- a/tests/unit/plugins/database/BelongsToModelTest.php
+++ b/tests/unit/plugins/database/BelongsToModelTest.php
@@ -15,7 +15,7 @@ class BelongsToModelTest extends PluginTestCase
         $this->runPluginRefreshCommand('Database.Tester');
     }
 
-    public function testSetRelationValueBelongsTo()
+    public function testSetRelationValue()
     {
         Model::unguard();
         $post = Post::create(['title' => "First post", 'description' => "Yay!!"]);
@@ -39,11 +39,52 @@ class BelongsToModelTest extends PluginTestCase
         $this->assertNull($post->author_id);
         $this->assertNull($post->author);
 
-        // Deferred
+        // Deferred in memory
         $post->author = $author3;
         $this->assertEquals('Charlie', $post->author->name);
         $this->assertNull($post->author_id);
         $author3->save();
         $this->assertEquals($author3->id, $post->author_id);
     }
+
+    public function testDeferredBinding()
+    {
+        $sessionKey = uniqid('session_key', true);
+
+        Model::unguard();
+        $post = Post::make(['title' => "First post"]);
+        $author = Author::create(['name' => 'Stevie']);
+        Model::reguard();
+
+        // Deferred add
+        $post->author()->add($author, $sessionKey);
+        $this->assertNull($post->author_id);
+        $this->assertNull($post->author);
+
+        $this->assertEquals(0, $post->author()->count());
+        $this->assertEquals(1, $post->author()->withDeferred($sessionKey)->count());
+
+        // Commit deferred
+        $post->save(null, $sessionKey);
+        $this->assertEquals(1, $post->author()->count());
+        $this->assertEquals($author->id, $post->author_id);
+        $this->assertEquals('Stevie', $post->author->name);
+
+        // New session
+        $sessionKey = uniqid('session_key', true);
+
+        // Deferred remove
+        $post->author()->remove($author, $sessionKey);
+        $this->assertEquals(1, $post->author()->count());
+        $this->assertEquals(0, $post->author()->withDeferred($sessionKey)->count());
+        $this->assertEquals($author->id, $post->author_id);
+        $this->assertEquals('Stevie', $post->author->name);
+
+        // Commit deferred
+        $post->save(null, $sessionKey);
+        $this->assertEquals(0, $post->author()->count());
+        $this->assertNull($post->author_id);
+        $this->assertNull($post->author);
+    }
+
 }
\ No newline at end of file
diff --git a/tests/unit/plugins/database/DeferredBindingTest.php b/tests/unit/plugins/database/DeferredBindingTest.php
new file mode 100644
index 000000000..b79acbd67
--- /dev/null
+++ b/tests/unit/plugins/database/DeferredBindingTest.php
@@ -0,0 +1,109 @@
+<?php
+
+use Database\Tester\Models\Post;
+use Database\Tester\Models\Author;
+use October\Rain\Database\Models\DeferredBinding;
+
+class DeferredBindingTest extends PluginTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Post.php';
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Author.php';
+
+        $this->runPluginRefreshCommand('Database.Tester');
+    }
+
+    public function testNegatedBinding()
+    {
+        $sessionKey = uniqid('session_key', true);
+        DeferredBinding::truncate();
+
+        Model::unguard();
+        $author = Author::make(['name' => 'Stevie']);
+        $post = Post::create(['title' => "First post"]);
+        $post2 = Post::create(['title' => "Second post"]);
+        Model::reguard();
+
+        $author->posts()->add($post, $sessionKey);
+        $this->assertEquals(1, DeferredBinding::count());
+
+        // Skip repeat bindings
+        $author->posts()->add($post, $sessionKey);
+        $this->assertEquals(1, DeferredBinding::count());
+
+        // Remove add-delete pairs
+        $author->posts()->remove($post, $sessionKey);
+        $this->assertEquals(0, DeferredBinding::count());
+
+        // Multi ball
+        $sessionKey = uniqid('session_key', true);
+        $author->posts()->add($post, $sessionKey);
+        $author->posts()->add($post, $sessionKey);
+        $author->posts()->add($post, $sessionKey);
+        $author->posts()->add($post, $sessionKey);
+        $author->posts()->add($post2, $sessionKey);
+        $author->posts()->add($post2, $sessionKey);
+        $author->posts()->add($post2, $sessionKey);
+        $author->posts()->add($post2, $sessionKey);
+        $author->posts()->add($post2, $sessionKey);
+        $this->assertEquals(2, DeferredBinding::count());
+
+        // Clean up add-delete pairs
+        $author->posts()->remove($post, $sessionKey);
+        $author->posts()->remove($post2, $sessionKey);
+        $this->assertEquals(0, DeferredBinding::count());
+
+        // Double negative
+        $author->posts()->remove($post, $sessionKey);
+        $author->posts()->remove($post2, $sessionKey);
+        $this->assertEquals(2, DeferredBinding::count());
+
+        // Skip repeat bindings
+        $author->posts()->remove($post, $sessionKey);
+        $author->posts()->remove($post2, $sessionKey);
+        $this->assertEquals(2, DeferredBinding::count());
+
+        // Clean up add-delete pairs again
+        $author->posts()->add($post, $sessionKey);
+        $author->posts()->add($post2, $sessionKey);
+        $this->assertEquals(0, DeferredBinding::count());
+    }
+
+    public function testCancelBinding()
+    {
+        $sessionKey = uniqid('session_key', true);
+        DeferredBinding::truncate();
+
+        Model::unguard();
+        $author = Author::make(['name' => 'Stevie']);
+        $post = Post::create(['title' => "First post"]);
+        Model::reguard();
+
+        $author->posts()->add($post, $sessionKey);
+        $this->assertEquals(1, DeferredBinding::count());
+
+        $author->cancelDeferred($sessionKey);
+        $this->assertEquals(0, DeferredBinding::count());
+    }
+
+    public function testCommitBinding()
+    {
+        $sessionKey = uniqid('session_key', true);
+        DeferredBinding::truncate();
+
+        Model::unguard();
+        $author = Author::make(['name' => 'Stevie']);
+        $post = Post::create(['title' => "First post"]);
+        Model::reguard();
+
+        $author->posts()->add($post, $sessionKey);
+        $this->assertEquals(1, DeferredBinding::count());
+
+        $author->commitDeferred($sessionKey);
+        $this->assertEquals(0, DeferredBinding::count());
+    }
+
+}
\ No newline at end of file

From 6db2018f288a2fd7c4736c5004de809608539f95 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 16 Sep 2015 06:03:57 +1000
Subject: [PATCH 032/103] Add icon sizes - Refs #1434

---
 modules/system/assets/css/styles.css    |  5 ++++
 modules/system/assets/ui/docs/icon.md   | 36 ++++++++++++++++---------
 modules/system/assets/ui/less/icon.less | 17 +++++++++++-
 modules/system/assets/ui/storm.css      |  5 ++++
 4 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/modules/system/assets/css/styles.css b/modules/system/assets/css/styles.css
index c5338dc00..dc44329f1 100644
--- a/modules/system/assets/css/styles.css
+++ b/modules/system/assets/css/styles.css
@@ -1004,6 +1004,11 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
 [class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em}
 [class^="oc-icon-"]:before,[class*=" oc-icon-"]:before{display:inline-block;margin-right:8px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;vertical-align:baseline}
 [class^="oc-icon-"].empty:before,[class*=" oc-icon-"].empty:before{margin-right:0}
+.icon-lg{font-size:1.33333333em;line-height:0.75em;vertical-align:-15%}
+.icon-2x{font-size:2em}
+.icon-3x{font-size:3em}
+.icon-4x{font-size:4em}
+.icon-5x{font-size:5em}
 @font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Light.eot');src:url('../../../backend/assets/font/OpenSans-Light.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Light.svg#open_sanslight') format('svg'),url('../../../backend/assets/font/OpenSans-Light.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Light.ttf') format('truetype');font-style:normal;font-weight:300}
 @font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Regular.eot');src:url('../../../backend/assets/font/OpenSans-Regular.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Regular.svg#open_sansregular') format('svg'),url('../../../backend/assets/font/OpenSans-Regular.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Regular.ttf') format('truetype');font-style:normal;font-weight:400}
 @font-face{font-family:'Open Sans';src:url('../../../backend/assets/font/OpenSans-Semibold.eot');src:url('../../../backend/assets/font/OpenSans-Semibold.eot?#iefix') format('embedded-opentype'),url('../../../backend/assets/font/OpenSans-Semibold.svg#open_sanssemibold') format('svg'),url('../../../backend/assets/font/OpenSans-Semibold.woff') format('woff'),url('../../../backend/assets/font/OpenSans-Semibold.ttf') format('truetype');font-style:normal;font-weight:600}
diff --git a/modules/system/assets/ui/docs/icon.md b/modules/system/assets/ui/docs/icon.md
index ade8f7845..4354d05fa 100644
--- a/modules/system/assets/ui/docs/icon.md
+++ b/modules/system/assets/ui/docs/icon.md
@@ -18,25 +18,37 @@ You can also inject an icon to an existing element using the `oc-` prefix.
 
 > **Note**: Icon classes are echoed via CSS :before.
 
+### Icon sizes
+
+To increase icon sizes relative to their container, use the `icon-lg` (33% increase), `icon-2x`, `icon-3x`, `icon-4x`, or `icon-5x` classes.
+
+    <i class="fa icon-camera-retro icon-5x"></i> icon-5x
+    <i class="fa icon-camera-retro icon-4x"></i> icon-4x
+    <i class="fa icon-camera-retro icon-3x"></i> icon-3x
+    <i class="fa icon-camera-retro icon-2x"></i> icon-2x
+    <i class="fa icon-camera-retro icon-lg"></i> icon-lg
+
+> If your icons are getting chopped off on top and bottom, make sure you have sufficient line-height.
+
 ### With buttons
 
-    <a class="btn btn-default" href="#">
-        <i class="icon-refresh"></i> Refresh
+    <a class="btn btn-default oc-icon-refresh" href="#">
+        Refresh
     </a>
-    <a class="btn btn-success" href="#">
-        <i class="icon-shopping-cart icon-large"></i> Checkout
+    <a class="btn btn-success oc-icon-shopping" href="#">
+        Checkout
     </a>
-    <a class="btn btn-primary" href="#">
-        <i class="icon-comment"></i> Comment
+    <a class="btn btn-primary oc-icon-comment" href="#">
+        Comment
     </a>
-    <a class="btn btn-danger" href="#">
-        <i class="icon-trash icon-large"></i> Delete
+    <a class="btn btn-danger oc-icon-trash" href="#">
+        Delete
     </a>
-    <a class="btn btn-default" href="#">
-        <i class="icon-cog"></i> Settings
+    <a class="btn btn-default oc-icon-cog" href="#">
+        Settings
     </a>
-    <a class="btn btn-info" href="#">
-        <i class="icon-info"></i> More Info
+    <a class="btn btn-info oc-icon-info" href="#">
+        More Info
     </a>
 
 ## Available icons
diff --git a/modules/system/assets/ui/less/icon.less b/modules/system/assets/ui/less/icon.less
index 7c52403f1..2f13d0fac 100644
--- a/modules/system/assets/ui/less/icon.less
+++ b/modules/system/assets/ui/less/icon.less
@@ -66,4 +66,19 @@
     &.empty:before {
         margin-right: 0;
     }
-}
\ No newline at end of file
+}
+
+//
+// Icon Sizes
+//
+
+// Makes the font 33% larger relative to the icon container
+.icon-lg {
+  font-size: (4em / 3);
+  line-height: (3em / 4);
+  vertical-align: -15%;
+}
+.icon-2x { font-size: 2em; }
+.icon-3x { font-size: 3em; }
+.icon-4x { font-size: 4em; }
+.icon-5x { font-size: 5em; }
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index 2df51c390..cbdd98422 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -1127,6 +1127,11 @@ button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-ap
 [class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em}
 [class^="oc-icon-"]:before,[class*=" oc-icon-"]:before{display:inline-block;margin-right:8px;font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;vertical-align:baseline}
 [class^="oc-icon-"].empty:before,[class*=" oc-icon-"].empty:before{margin-right:0}
+.icon-lg{font-size:1.33333333em;line-height:0.75em;vertical-align:-15%}
+.icon-2x{font-size:2em}
+.icon-3x{font-size:3em}
+.icon-4x{font-size:4em}
+.icon-5x{font-size:5em}
 .caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}
 .dropdown{position:relative}
 .dropdown-toggle:focus{outline:0}

From 6b916cb554a11069f6855a3cb1b09422d612a8d3 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 17 Sep 2015 05:15:12 +1000
Subject: [PATCH 033/103] Adds a timetense list column, inspired by FB Also
 added |time_since and |time_tense Twig filters

---
 CHANGELOG.md                                |  1 +
 modules/backend/controllers/auth/signin.htm |  8 +--
 modules/backend/widgets/Lists.php           | 21 ++++--
 modules/system/ServiceProvider.php          |  2 +
 modules/system/helpers/DateTime.php         | 80 +++++++++++++++++++++
 5 files changed, 104 insertions(+), 8 deletions(-)
 create mode 100644 modules/system/helpers/DateTime.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b81797e0a..3fd8d3a00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 * **Build 297** (2015-09-16)
+  - Added `timetense` list column type (see Backend > Lists docs), along with `|time_since` and `|time_tense` Twig filters.
   - Fixed a bug in deferred binding that allowed repeat bindings and ignored add/delete pairs.
 
 * **Build 293** (2015-09-07)
diff --git a/modules/backend/controllers/auth/signin.htm b/modules/backend/controllers/auth/signin.htm
index 4271bcdf0..19ca02928 100644
--- a/modules/backend/controllers/auth/signin.htm
+++ b/modules/backend/controllers/auth/signin.htm
@@ -26,10 +26,10 @@
                 autocomplete="off"
                 maxlength="255" />
 
-                <!-- Submit Login -->
-                <button type="submit" class="btn btn-primary login-button">
-                    <?= e(trans('backend::lang.account.login')) ?>
-                </button>
+            <!-- Submit Login -->
+            <button type="submit" class="btn btn-primary login-button">
+                <?= e(trans('backend::lang.account.login')) ?>
+            </button>
         </div>
 
         <p class="oc-icon-lock pull-right forgot-password">
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index f500abeb7..16fc21033 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -11,6 +11,7 @@ use DbDongle;
 use Carbon\Carbon;
 use October\Rain\Html\Helper as HtmlHelper;
 use October\Rain\Router\Helper as RouterHelper;
+use System\Helpers\DateTime as DateTimeHelper;
 use Backend\Classes\ListColumn;
 use Backend\Classes\WidgetBase;
 use ApplicationException;
@@ -946,7 +947,21 @@ class Lists extends WidgetBase
 
         $value = $this->validateDateTimeValue($value, $column);
 
-        return $value->diffForHumans();
+        return DateTimeHelper::timeSince($value);
+    }
+
+    /**
+     * Process as time as current tense (Today at 0:00)
+     */
+    protected function evalTimetenseTypeValue($record, $column, $value)
+    {
+        if ($value === null) {
+            return null;
+        }
+
+        $value = $this->validateDateTimeValue($value, $column);
+
+        return DateTimeHelper::timeTense($value);
     }
 
     /**
@@ -954,9 +969,7 @@ class Lists extends WidgetBase
      */
     protected function validateDateTimeValue($value, $column)
     {
-        if ($value instanceof DateTime) {
-            $value = Carbon::instance($value);
-        }
+        $value = DateTimeHelper::instance()->makeCarbon($value, false);
 
         if (!$value instanceof Carbon) {
             throw new ApplicationException(Lang::get(
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index 601db58f1..c0eb14170 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -178,6 +178,8 @@ class ServiceProvider extends ModuleServiceProvider
                 'trans'          => ['Lang', 'get'],
                 'transchoice'    => ['Lang', 'choice'],
                 'md'             => ['Markdown', 'parse'],
+                'time_since'     => ['System\Helpers\DateTime', 'timeSince'],
+                'time_tense'     => ['System\Helpers\DateTime', 'timeTense'],
             ]);
         });
     }
diff --git a/modules/system/helpers/DateTime.php b/modules/system/helpers/DateTime.php
new file mode 100644
index 000000000..26930e867
--- /dev/null
+++ b/modules/system/helpers/DateTime.php
@@ -0,0 +1,80 @@
+<?php namespace System\Helpers;
+
+use Lang;
+use Carbon\Carbon;
+use Exception;
+use DateTime as PhpDateTime;
+
+class DateTime
+{
+    use \October\Rain\Support\Traits\Singleton;
+
+    /**
+     * Returns a human readable time difference from the value to the
+     * current time. Eg: **10 minutes ago**
+     *
+     * @return string
+     */
+    public static function timeSince($datetime)
+    {
+        return self::instance()
+            ->makeCarbon($datetime)
+            ->diffForHumans()
+        ;
+    }
+
+    /**
+     * Returns 24-hour time and the day using the grammatical tense
+     * of the current time. Eg: Today at 12:49, Yesterday at 4:00
+     * or 18 Sep 2015 at 14:33.
+     *
+     * @return string
+     */
+    public static function timeTense($datetime)
+    {
+        $datetime = self::instance()->makeCarbon($datetime);
+        $yesterday = $datetime->subDays(1);
+        $tomorrow = $datetime->addDays(1);
+        $time = $datetime->format('H:i');
+        $date = $datetime->format('j M Y');
+
+        if ($datetime->isToday()) {
+            $date = 'Today';
+        }
+        elseif ($datetime->isYesterday()) {
+            $date = 'Yesterday';
+        }
+        elseif ($datetime->isTomorrow()) {
+            $date = 'Tomorrow';
+        }
+
+        return $date.' at '.$time;
+    }
+
+    /**
+     * Converts mixed inputs to a Carbon object.
+     *
+     * @return Carbon\Carbon
+     */
+    public function makeCarbon($value, $throwException = true)
+    {
+        if ($value instanceof Carbon) {
+            // Do nothing
+        }
+        elseif ($value instanceof PhpDateTime) {
+            $value = Carbon::instance($value);
+        }
+        elseif (is_numeric($value)) {
+            $value = Carbon::createFromTimestamp($value);
+        }
+        elseif (preg_match('/^(\d{4})-(\d{2})-(\d{2})$/', $value)) {
+            $value = Carbon::createFromFormat('Y-m-d', $value)->startOfDay();
+        }
+
+        if (!$value instanceof Carbon && $throwException) {
+            throw new Exception('Invalid date value supplied to DateTime helper.');
+        }
+
+        return $value;
+    }
+}

From 143f22850a6f8408e14ca0c0e09608b4502cf749 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 18 Sep 2015 05:08:18 +1000
Subject: [PATCH 034/103] Add alias for AjaxException as per docs

---
 modules/system/aliases.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index ab12ebb4a..93920f893 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -55,6 +55,7 @@ return [
     'Backend'         => 'Backend\Facades\Backend',
     'BackendMenu'     => 'Backend\Facades\BackendMenu',
     'BackendAuth'     => 'Backend\Facades\BackendAuth',
+    'AjaxException'        => 'October\Rain\Exception\AjaxException',
     'SystemException'      => 'October\Rain\Exception\SystemException',
     'ApplicationException' => 'October\Rain\Exception\ApplicationException',
     'ValidationException'  => 'October\Rain\Exception\ValidationException',

From 528f6b1eca9ac411c81bb6d622a0962869d2ae82 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 18 Sep 2015 05:08:47 +1000
Subject: [PATCH 035/103] Improve icon docs

---
 modules/system/assets/ui/docs/icon.md | 34 +++++++++++++--------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/modules/system/assets/ui/docs/icon.md b/modules/system/assets/ui/docs/icon.md
index 4354d05fa..f2e679667 100644
--- a/modules/system/assets/ui/docs/icon.md
+++ b/modules/system/assets/ui/docs/icon.md
@@ -1,22 +1,22 @@
-Provides icons of various descriptions
+# Icon library
 
-## Usage
+October provides an icon library with icons of various descriptions, based on the popular [Font Awesome collection](http://fortawesome.github.io/Font-Awesome/).
 
-### Inline icon
+### Inline icons
 
-Place Font Autumn icons just about anywhere with the `<i>` tag.
+Place icons just about anywhere with the `<i>` tag or to an existing element using the `oc-` prefix.
 
-    <div style="font-size: 24px;">
-        <i class="icon-camera-retro"></i> icon-camera-retro
-    </div>
+```html
+<i class="icon-camera-retro"></i> icon-camera-retro
 
-You can also inject an icon to an existing element using the `oc-` prefix.
+<span class="oc-icon-flag-checkered">oc-icon-flag-checkered</span>
+```
 
-    <div style="font-size: 24px;">
-        <span class="oc-icon-flag-checkered">You win!</span>
-    </div>
-
-> **Note**: Icon classes are echoed via CSS :before.
+<div class="frame" style="font-size: 22px;">
+    <i class="icon-camera-retro"></i> icon-camera-retro
+    <br />
+    <span class="oc-icon-flag-checkered">oc-icon-flag-checkered</span>
+</div>
 
 ### Icon sizes
 
@@ -28,9 +28,9 @@ To increase icon sizes relative to their container, use the `icon-lg` (33% incre
     <i class="fa icon-camera-retro icon-2x"></i> icon-2x
     <i class="fa icon-camera-retro icon-lg"></i> icon-lg
 
-> If your icons are getting chopped off on top and bottom, make sure you have sufficient line-height.
+### Icon buttons
 
-### With buttons
+Feel free to use them alongside your buttons.
 
     <a class="btn btn-default oc-icon-refresh" href="#">
         Refresh
@@ -940,7 +940,6 @@ To increase icon sizes relative to their container, use the `icon-lg` (33% incre
     float: left;
 }
 .category-icons > ul > li {
-    cursor: pointer;
     line-height: 42px;
     height: 42px;
     padding: 0;
@@ -962,9 +961,8 @@ To increase icon sizes relative to their container, use the `icon-lg` (33% incre
 }
 .category-icons > ul > li:hover [class^="icon-"]:before,
 .category-icons > ul > li:hover [class*=" icon-"]:before {
-    font-size: 24px;
+    font-size: 28px;
     vertical-align: middle;
-    line-height: 20px;
 }
 </style>
 

From b5611c3ed19b070e9ab90686cf9029397f010a1c Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 19 Sep 2015 05:32:05 +1000
Subject: [PATCH 036/103] Add cache table

---
 .../migrations/2015_10_01_000016_Db_Cache.php | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 modules/system/database/migrations/2015_10_01_000016_Db_Cache.php

diff --git a/modules/system/database/migrations/2015_10_01_000016_Db_Cache.php b/modules/system/database/migrations/2015_10_01_000016_Db_Cache.php
new file mode 100644
index 000000000..2737d6c5b
--- /dev/null
+++ b/modules/system/database/migrations/2015_10_01_000016_Db_Cache.php
@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DbCache extends Migration
+{
+    public function up()
+    {
+        Schema::create('cache', function (Blueprint $table) {
+            $table->string('key')->unique();
+            $table->text('value');
+            $table->integer('expiration');
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('cache');
+    }
+}

From d9090b3210d1988a3995b109b0ec509674d7d984 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 19 Sep 2015 05:32:49 +1000
Subject: [PATCH 037/103] Write tests for Tree traits

---
 .../database/tester/models/Category.php       | 27 ++++++
 .../updates/create_categories_table.php       | 49 ++++++++++
 .../database/tester/updates/version.yaml      |  1 +
 .../plugins/database/NestedTreeModelTest.php  | 75 +++++++++++++++
 .../plugins/database/SimpleTreeModelTest.php  | 94 +++++++++++++++++++
 5 files changed, 246 insertions(+)
 create mode 100644 tests/fixtures/plugins/database/tester/models/Category.php
 create mode 100644 tests/fixtures/plugins/database/tester/updates/create_categories_table.php
 create mode 100644 tests/unit/plugins/database/NestedTreeModelTest.php
 create mode 100644 tests/unit/plugins/database/SimpleTreeModelTest.php

diff --git a/tests/fixtures/plugins/database/tester/models/Category.php b/tests/fixtures/plugins/database/tester/models/Category.php
new file mode 100644
index 000000000..583f1f27b
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/models/Category.php
@@ -0,0 +1,27 @@
+<?php namespace Database\Tester\Models;
+
+use Model;
+
+class Category extends Model
+{
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'database_tester_categories';
+}
+
+
+class CategorySimple extends Category
+{
+    use \October\Rain\Database\Traits\SimpleTree;
+}
+
+class CategoryNested extends Category
+{
+    use \October\Rain\Database\Traits\NestedTree;
+
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'database_tester_categories_nested';
+}
\ No newline at end of file
diff --git a/tests/fixtures/plugins/database/tester/updates/create_categories_table.php b/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
new file mode 100644
index 000000000..9c3373244
--- /dev/null
+++ b/tests/fixtures/plugins/database/tester/updates/create_categories_table.php
@@ -0,0 +1,49 @@
+<?php namespace Database\Tester\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class CreateCategoriesTable extends Migration
+{
+
+    public function up()
+    {
+        Schema::create('database_tester_categories', function($table)
+        {
+            $table->engine = 'InnoDB';
+            $table->increments('id');
+            $table->integer('parent_id')->nullable();
+            $table->string('name')->nullable();
+            $table->string('slug')->nullable()->index()->unique();
+            $table->string('description')->nullable();
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->string('language', 3)->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+        });
+
+        Schema::create('database_tester_categories_nested', function($table)
+        {
+            $table->engine = 'InnoDB';
+            $table->increments('id');
+            $table->integer('parent_id')->nullable();
+            $table->integer('nest_left')->nullable();
+            $table->integer('nest_right')->nullable();
+            $table->integer('nest_depth')->nullable();
+            $table->string('name')->nullable();
+            $table->string('slug')->nullable()->index()->unique();
+            $table->string('description')->nullable();
+            $table->integer('company_id')->unsigned()->nullable();
+            $table->string('language', 3)->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('database_tester_categories');
+        Schema::dropIfExists('database_tester_categories_nested');
+    }
+
+}
diff --git a/tests/fixtures/plugins/database/tester/updates/version.yaml b/tests/fixtures/plugins/database/tester/updates/version.yaml
index 519509f0c..2fc4b2813 100644
--- a/tests/fixtures/plugins/database/tester/updates/version.yaml
+++ b/tests/fixtures/plugins/database/tester/updates/version.yaml
@@ -3,3 +3,4 @@
     - Create tables
     - create_posts_table.php
     - create_authors_table.php
+    - create_categories_table.php
diff --git a/tests/unit/plugins/database/NestedTreeModelTest.php b/tests/unit/plugins/database/NestedTreeModelTest.php
new file mode 100644
index 000000000..11270de60
--- /dev/null
+++ b/tests/unit/plugins/database/NestedTreeModelTest.php
@@ -0,0 +1,75 @@
+<?php
+
+use Carbon\Carbon;
+use Database\Tester\Models\CategoryNested;
+
+class NestedTreeModelTest extends PluginTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Category.php';
+
+        $this->runPluginRefreshCommand('Database.Tester');
+        $this->seedSampleTree();
+    }
+
+    public function testGetAllRoot()
+    {
+        $items = CategoryNested::make()->getAllRoot();
+        $this->assertEquals(2, $items->count());
+    }
+
+    public function seedSampleTree()
+    {
+        Model::unguard();
+
+        $orange = CategoryNested::create([
+            'name' => 'Category Orange',
+            'description' => 'A root level test category',
+        ]);
+
+        $autumn = $orange->children()->create([
+            'name' => 'Autumn Leaves',
+            'description' => 'Disccusion about the season of falling leaves.'
+        ]);
+
+        $autumn->children()->create([
+            'name' => 'September',
+            'description' => 'The start of the fall season.'
+        ]);
+
+        $october = $autumn->children()->create([
+            'name' => 'October',
+            'description' => 'The middle of the fall season.'
+        ]);
+
+        $autumn->children()->create([
+            'name' => 'November',
+            'description' => 'The end of the fall season.'
+        ]);
+
+        $orange->children()->create([
+            'name' => 'Summer Breeze',
+            'description' => 'Disccusion about the wind at the ocean.'
+        ]);
+
+        $green = CategoryNested::create([
+            'name' => 'Category Green',
+            'description' => 'A root level test category',
+        ]);
+
+        $green->children()->create([
+            'name' => 'Winter Snow',
+            'description' => 'Disccusion about the frosty snow flakes.'
+        ]);
+
+        $green->children()->create([
+            'name' => 'Spring Trees',
+            'description' => 'Disccusion about the blooming gardens.'
+        ]);
+
+        Model::reguard();
+    }
+}
diff --git a/tests/unit/plugins/database/SimpleTreeModelTest.php b/tests/unit/plugins/database/SimpleTreeModelTest.php
new file mode 100644
index 000000000..f49964032
--- /dev/null
+++ b/tests/unit/plugins/database/SimpleTreeModelTest.php
@@ -0,0 +1,94 @@
+<?php
+
+use Carbon\Carbon;
+use Database\Tester\Models\CategorySimple;
+
+class SimpleTreeModelTest extends PluginTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Category.php';
+
+        $this->runPluginRefreshCommand('Database.Tester');
+        $this->seedSampleTree();
+    }
+
+    public function testGetChildren()
+    {
+        // Not eager loaded
+        $item = CategorySimple::first();
+        $this->assertEquals(6, $item->getChildren()->count());
+
+        // Eager loaded
+        $item = CategorySimple::make()->getAllRoot()->first();
+        $this->assertEquals(6, $item->getChildren()->count());
+    }
+
+    public function testGetAllRoot()
+    {
+        $items = CategorySimple::make()->getAllRoot();
+        $this->assertEquals(3, $items->count());
+    }
+
+    public function testGetChildCount()
+    {
+        // Not eager loaded
+        $item = CategorySimple::first();
+        $this->assertEquals(9, $item->getChildCount());
+
+        // Eager loaded
+        $item = CategorySimple::make()->getAllRoot()->first();
+        $this->assertEquals(9, $item->getChildCount());
+    }
+
+    public function testGetAllChildren()
+    {
+        // Not eager loaded
+        $item = CategorySimple::first();
+        $this->assertEquals(9, $item->getAllChildren()->count());
+
+        // Eager loaded
+        $item = CategorySimple::make()->getAllRoot()->first();
+        $this->assertEquals(9, $item->getAllChildren()->count());
+    }
+
+    public function seedSampleTree()
+    {
+        Model::unguard();
+
+        $webdev = CategorySimple::create([
+            'name' => 'Web development'
+        ]);
+
+        $webdev->children()->create(['name' => 'HTML5']);
+        $webdev->children()->create(['name' => 'CSS3']);
+        $webdev->children()->create(['name' => 'jQuery']);
+        $webdev->children()->create(['name' => 'Bootstrap']);
+        $webdev->children()->create(['name' => 'Laravel']);
+        $october = $webdev->children()->create(['name' => 'OctoberCMS']);
+        $october->children()->create(['name' => 'September']);
+        $october->children()->create(['name' => 'October']);
+        $october->children()->create(['name' => 'November']);
+
+        $mobdev = CategorySimple::create([
+            'name' => 'Mobile development'
+        ]);
+
+        $mobdev->children()->create(['name' => 'iOS']);
+        $mobdev->children()->create(['name' => 'iPhone']);
+        $mobdev->children()->create(['name' => 'iPad']);
+        $mobdev->children()->create(['name' => 'Android']);
+
+        $design = CategorySimple::create([
+            'name' => 'Graphic design'
+        ]);
+
+        $design->children()->create(['name' => 'Photoshop']);
+        $design->children()->create(['name' => 'Illustrator']);
+        $design->children()->create(['name' => 'Fireworks']);
+
+        Model::reguard();
+    }
+}

From 3f7aa9f9f7cbe47611e74fda85578b6f0383a9ae Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 19 Sep 2015 05:36:58 +1000
Subject: [PATCH 038/103] Write tests for revisionable trait

---
 .../2015_10_01_000017_Db_System_Revisions.php |  30 ++++
 modules/system/models/Revision.php            |  17 +++
 .../plugins/database/tester/models/Author.php |   3 -
 .../plugins/database/tester/models/Post.php   |  72 ++++++++-
 .../database/tester/models/SluggablePost.php  |  30 ----
 .../tester/updates/create_posts_table.php     |   1 +
 .../database/RevisionableModelTest.php        | 141 ++++++++++++++++++
 .../plugins/database/SluggableModelTest.php   |   2 +-
 8 files changed, 259 insertions(+), 37 deletions(-)
 create mode 100644 modules/system/database/migrations/2015_10_01_000017_Db_System_Revisions.php
 create mode 100644 modules/system/models/Revision.php
 delete mode 100644 tests/fixtures/plugins/database/tester/models/SluggablePost.php
 create mode 100644 tests/unit/plugins/database/RevisionableModelTest.php

diff --git a/modules/system/database/migrations/2015_10_01_000017_Db_System_Revisions.php b/modules/system/database/migrations/2015_10_01_000017_Db_System_Revisions.php
new file mode 100644
index 000000000..b98fd1219
--- /dev/null
+++ b/modules/system/database/migrations/2015_10_01_000017_Db_System_Revisions.php
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DbSystemRevisions extends Migration
+{
+
+    public function up()
+    {
+        Schema::create('system_revisions', function (Blueprint $table) {
+            $table->engine = 'InnoDB';
+            $table->increments('id');
+            $table->integer('user_id')->unsigned()->nullable()->index();
+            $table->string('field')->nullable()->index();
+            $table->string('cast')->nullable();
+            $table->text('old_value')->nullable();
+            $table->text('new_value')->nullable();
+            $table->string('revisionable_type');
+            $table->integer('revisionable_id');
+            $table->timestamps();
+            $table->index(['revisionable_id', 'revisionable_type']);
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('system_revisions');
+    }
+}
diff --git a/modules/system/models/Revision.php b/modules/system/models/Revision.php
new file mode 100644
index 000000000..ede558a72
--- /dev/null
+++ b/modules/system/models/Revision.php
@@ -0,0 +1,17 @@
+<?php namespace System\Models;
+
+use October\Rain\Database\Models\Revision as RevisionBase;
+
+/**
+ * Revision history model
+ *
+ * @package october\system
+ * @author Alexey Bobkov, Samuel Georges
+ */
+class Revision extends RevisionBase
+{
+    /**
+     * @var string The database table used by the model.
+     */
+    public $table = 'system_revisions';
+}
diff --git a/tests/fixtures/plugins/database/tester/models/Author.php b/tests/fixtures/plugins/database/tester/models/Author.php
index b89d5c34e..d323bcd03 100644
--- a/tests/fixtures/plugins/database/tester/models/Author.php
+++ b/tests/fixtures/plugins/database/tester/models/Author.php
@@ -2,9 +2,6 @@
 
 use Model;
 
-/**
- * Author Model
- */
 class Author extends Model
 {
 
diff --git a/tests/fixtures/plugins/database/tester/models/Post.php b/tests/fixtures/plugins/database/tester/models/Post.php
index 5cdedc7f8..3dc11afa5 100644
--- a/tests/fixtures/plugins/database/tester/models/Post.php
+++ b/tests/fixtures/plugins/database/tester/models/Post.php
@@ -2,9 +2,6 @@
 
 use Model;
 
-/**
- * Post Model
- */
 class Post extends Model
 {
 
@@ -30,4 +27,73 @@ class Post extends Model
         'author' => 'Database\Tester\Models\Author',
     ];
 
+}
+
+class SluggablePost extends Post
+{
+
+    use \October\Rain\Database\Traits\Sluggable;
+
+    /**
+     * @var array Guarded fields
+     */
+    protected $guarded = [];
+
+    /**
+     * @var array List of attributes to automatically generate unique URL names (slugs) for.
+     */
+    protected $slugs = [
+        'slug' => 'title'
+    ];
+
+}
+
+class RevisionablePost extends Post
+{
+
+    use \October\Rain\Database\Traits\Revisionable;
+    use \October\Rain\Database\Traits\SoftDeleting;
+
+    /**
+     * @var array Guarded fields
+     */
+    protected $guarded = [];
+
+    /**
+     * @var array Dates
+     */
+    protected $dates = ['published_at', 'deleted_at'];
+
+    /**
+     * @var array Monitor these attributes for changes.
+     */
+    protected $revisionable = [
+        'title',
+        'slug',
+        'description',
+        'is_published',
+        'published_at',
+        'deleted_at'
+    ];
+
+    /**
+     * @var int Maximum number of revision records to keep.
+     */
+    public $revisionableLimit = 8;
+
+    /**
+     * @var array Relations
+     */
+    public $morphMany = [
+        'revision_history' => ['System\Models\Revision', 'name' => 'revisionable']
+    ];
+
+    /**
+     * The user who made the revision.
+     */
+    public function getRevisionableUser()
+    {
+        return 7;
+    }
+
 }
\ No newline at end of file
diff --git a/tests/fixtures/plugins/database/tester/models/SluggablePost.php b/tests/fixtures/plugins/database/tester/models/SluggablePost.php
deleted file mode 100644
index 86ed609d6..000000000
--- a/tests/fixtures/plugins/database/tester/models/SluggablePost.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php namespace Database\Tester\Models;
-
-use Model;
-
-/**
- * Post Model
- */
-class SluggablePost extends Model
-{
-
-    use \October\Rain\Database\Traits\Sluggable;
-
-    /**
-     * @var string The database table used by the model.
-     */
-    public $table = 'database_tester_posts';
-
-    /**
-     * @var array Guarded fields
-     */
-    protected $guarded = [];
-
-    /**
-     * @var array List of attributes to automatically generate unique URL names (slugs) for.
-     */
-    protected $slugs = [
-        'slug' => 'title'
-    ];
-
-}
\ No newline at end of file
diff --git a/tests/fixtures/plugins/database/tester/updates/create_posts_table.php b/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
index 37dcd6ca7..38bc65a73 100644
--- a/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
+++ b/tests/fixtures/plugins/database/tester/updates/create_posts_table.php
@@ -18,6 +18,7 @@ class CreatePostsTable extends Migration
             $table->boolean('is_published')->default(false);
             $table->timestamp('published_at')->nullable();
             $table->integer('author_id')->unsigned()->index()->nullable();
+            $table->softDeletes();
             $table->timestamps();
         });
     }
diff --git a/tests/unit/plugins/database/RevisionableModelTest.php b/tests/unit/plugins/database/RevisionableModelTest.php
new file mode 100644
index 000000000..792c325d0
--- /dev/null
+++ b/tests/unit/plugins/database/RevisionableModelTest.php
@@ -0,0 +1,141 @@
+<?php
+
+use Carbon\Carbon;
+use Database\Tester\Models\RevisionablePost;
+
+class RevisionableModelTest extends PluginTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Post.php';
+
+        $this->runPluginRefreshCommand('Database.Tester');
+    }
+
+    public function testUpdateNothing()
+    {
+        $post = RevisionablePost::create(['title' => 'Hello World!']);
+        $this->assertEquals('Hello World!', $post->title);
+        $this->assertEquals(0, $post->revision_history()->count());
+
+        $post->revisionsEnabled = false;
+        $post->title = 'Helloooooooooooo!';
+        $post->save();
+        $this->assertEquals(0, $post->revision_history()->count());
+    }
+
+    public function testUpdateSingleField()
+    {
+        $post = RevisionablePost::create(['title' => 'Hello World!']);
+        $this->assertEquals('Hello World!', $post->title);
+        $this->assertEquals(0, $post->revision_history()->count());
+
+        $post->title = 'Helloooooooooooo!';
+        $post->save();
+        $this->assertEquals(1, $post->revision_history()->count());
+
+        $item = $post->revision_history()->first();
+
+        $this->assertEquals('title', $item->field);
+        $this->assertEquals('Hello World!', $item->old_value);
+        $this->assertEquals('Helloooooooooooo!', $item->new_value);
+        $this->assertEquals(7, $item->user_id);
+    }
+
+    public function testUpdateMultipleFields()
+    {
+        $post = RevisionablePost::create([
+            'title' => 'Hello World!',
+            'slug' => 'hello-world',
+            'description' => 'Good day, Commander',
+            'is_published' => true,
+            'published_at' => new DateTime
+        ]);
+
+        $this->assertEquals(0, $post->revision_history()->count());
+
+        $post->title = "Gday mate";
+        $post->slug = "gday-mate";
+        $post->description = 'Wazzaaaaaaaaaaaaap';
+        $post->is_published = false;
+        $post->published_at = Carbon::now()->addDays(1);
+        $post->save();
+
+        $history = $post->revision_history;
+
+        $this->assertEquals(5, $history->count());
+        $this->assertEquals([
+            'title',
+            'slug',
+            'description',
+            'is_published',
+            'published_at'
+        ], $history->lists('field'));
+    }
+
+    public function testExceedingRevisionLimit()
+    {
+        $post = RevisionablePost::create([
+            'title' => 'Hello World!',
+            'slug' => 'hello-world',
+            'description' => 'Good day, Commander',
+            'is_published' => true,
+            'published_at' => new DateTime
+        ]);
+
+        $this->assertEquals(0, $post->revision_history()->count());
+
+        $post->title = "Gday mate";
+        $post->slug = "gday-mate";
+        $post->description = 'Wazzaaaaaaaaaaaaap';
+        $post->is_published = false;
+        $post->published_at = Carbon::now()->addDays(1);
+        $post->save();
+
+        $post->title = 'The Boss';
+        $post->slug = 'the-boss';
+        $post->description = 'Paid the cost to be the boss';
+        $post->is_published = true;
+        $post->published_at = Carbon::now()->addDays(10);
+        $post->save();
+
+        // Count 10 changes above, limit is 8
+        $this->assertEquals(8, $post->revision_history()->count());
+    }
+
+    public function testSoftDeletes()
+    {
+        $post = RevisionablePost::create(['title' => 'Hello World!']);
+        $this->assertEquals('Hello World!', $post->title);
+        $this->assertEquals(0, $post->revision_history()->count());
+
+        $post->title = 'Helloooooooooooo!';
+        $post->save();
+        $this->assertEquals(1, $post->revision_history()->count());
+
+        $post->delete();
+        $this->assertEquals(2, $post->revision_history()->count());
+    }
+
+    public function testRevisionDateCast()
+    {
+        $post = RevisionablePost::create([
+            'title' => 'Hello World!',
+            'published_at' => Carbon::now()
+        ]);
+        $this->assertEquals(0, $post->revision_history()->count());
+
+        $post->published_at = Carbon::now()->addDays(1);
+        $post->save();
+
+        $this->assertEquals(1, $post->revision_history()->count());
+
+        $item = $post->revision_history()->first();
+        $this->assertEquals('published_at', $item->field);
+        $this->assertEquals('date', $item->cast);
+        $this->assertInstanceOf('Carbon\Carbon', $item->old_value);
+        $this->assertInstanceOf('Carbon\Carbon', $item->new_value);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/plugins/database/SluggableModelTest.php b/tests/unit/plugins/database/SluggableModelTest.php
index 0518ae75f..c15b18f05 100644
--- a/tests/unit/plugins/database/SluggableModelTest.php
+++ b/tests/unit/plugins/database/SluggableModelTest.php
@@ -8,7 +8,7 @@ class SluggableModelTest extends PluginTestCase
     {
         parent::setUp();
 
-        include_once base_path().'/tests/fixtures/plugins/database/tester/models/SluggablePost.php';
+        include_once base_path().'/tests/fixtures/plugins/database/tester/models/Post.php';
 
         $this->runPluginRefreshCommand('Database.Tester');
     }

From b83abdb1568e0cf74459fe06df9cfc3172ed7bf6 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 19 Sep 2015 05:38:32 +1000
Subject: [PATCH 039/103] * Build 297

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fd8d3a00..cfce1f2b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-* **Build 297** (2015-09-16)
+* **Build 297** (2015-09-19)
+  - Introduced new `Revisionable` trait for storing model history (see Database > Traits docs).
   - Added `timetense` list column type (see Backend > Lists docs), along with `|time_since` and `|time_tense` Twig filters.
   - Fixed a bug in deferred binding that allowed repeat bindings and ignored add/delete pairs.
 

From 9fee6346df126b95a9247912ebc0856471957b61 Mon Sep 17 00:00:00 2001
From: Vladimir Kattsov <kattsoff@gmail.com>
Date: Thu, 17 Sep 2015 12:22:25 +0300
Subject: [PATCH 040/103] Update MediaManager.php

Transform extension like JPG and etc to lower case
---
 modules/cms/widgets/MediaManager.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php
index ec51c76c1..8107cbe82 100644
--- a/modules/cms/widgets/MediaManager.php
+++ b/modules/cms/widgets/MediaManager.php
@@ -963,11 +963,14 @@ class MediaManager extends WidgetBase
 
             $fileName = $uploadedFile->getClientOriginalName();
 
+            // Transform extension like JPG and etc to lower case
+            $extension = strtolower($uploadedFile->getClientOriginalExtension());
+            $fileName = File::name($fileName).'.'.$extension;
+
             /*
-             * File name contains non-latin characters, attempt to slug the value
-             */
+            * File name contains non-latin characters, attempt to slug the value
+            */
             if (!$this->validateFileName($fileName)) {
-                $extension = $uploadedFile->getClientOriginalExtension();
                 $fileNameSlug = Str::slug(File::name($fileName), '-');
                 $fileName = $fileNameSlug.'.'.$extension;
             }

From ab4abb9bc5c42f09028e25206cd6d575fa3b1f31 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 19 Sep 2015 06:17:31 +1000
Subject: [PATCH 041/103] Minor

---
 modules/cms/widgets/MediaManager.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/cms/widgets/MediaManager.php b/modules/cms/widgets/MediaManager.php
index 8107cbe82..2114c47e5 100644
--- a/modules/cms/widgets/MediaManager.php
+++ b/modules/cms/widgets/MediaManager.php
@@ -963,7 +963,9 @@ class MediaManager extends WidgetBase
 
             $fileName = $uploadedFile->getClientOriginalName();
 
-            // Transform extension like JPG and etc to lower case
+            /*
+             * Convert uppcare case file extensions to lower case
+             */
             $extension = strtolower($uploadedFile->getClientOriginalExtension());
             $fileName = File::name($fileName).'.'.$extension;
 

From 2bfcec811ff099cf6c734b25d3db20de085f1dc5 Mon Sep 17 00:00:00 2001
From: jBOKA <jakobjfischer@googlemail.com>
Date: Sun, 20 Sep 2015 06:03:42 +0200
Subject: [PATCH 042/103] Updated AssetList widget to use correct folder
 permissions

---
 modules/cms/widgets/AssetList.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index d0fe1d15e..70f3b871c 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -293,7 +293,7 @@ class AssetList extends WidgetBase
             throw new ApplicationException(Lang::get('cms::lang.asset.already_exists'));
         }
 
-        if (!@mkdir($newFullPath)) {
+        if (!File::makeDirectory($newFullPath)) {
             throw new ApplicationException(Lang::get(
                 'cms::lang.cms_object.error_creating_directory',
                 ['name' => $newName]
@@ -422,7 +422,7 @@ class AssetList extends WidgetBase
         $assetsPath = $this->getAssetsPath();
 
         if (!file_exists($assetsPath) || !is_dir($assetsPath)) {
-            if (!@mkdir($assetsPath)) {
+            if (!File::makeDirectory($assetsPath)) {
                 throw new ApplicationException(Lang::get(
                     'cms::lang.cms_object.error_creating_directory',
                     ['name'=>$assetsPath]

From aa7b44d61464e71cfac96a7fd5e06b661f2d2074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Talha=20Zekeriya=20Durmu=C5=9F?= <drtzack@gmail.com>
Date: Sun, 20 Sep 2015 12:16:27 +0300
Subject: [PATCH 043/103] Turkish Language Update for System

---
 modules/system/lang/tr/lang.php | 75 ++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 6 deletions(-)

diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php
index b511c0241..3e168db7e 100644
--- a/modules/system/lang/tr/lang.php
+++ b/modules/system/lang/tr/lang.php
@@ -50,7 +50,24 @@ return [
             'my_settings' => 'Ayarlarım'
         ]
     ],
+    'theme' => [
+        'label' => 'Tema',
+        'unnamed' => 'İsimsiz tema',
+        'name' => [
+            'label' => 'Tema Adı',
+            'help' => 'Temaya benzersiz bir isim verin. Örn: RainLab.Vanilla'
+        ],
+    ],
+    'themes' => [
+        'install' => 'Temaları yükle',
+        'search' => 'tema ara...',
+        'installed' => 'Yüklü temalar',
+        'no_themes' => 'Mağazadan yüklenmiş bir tema bulunmamaktadır.',
+        'recommended' => 'Tavsiye edilen',
+        'remove_confirm' => 'Bu temayı silmek istediğinize emin misiniz?'
+    ],
     'plugin' => [
+        'label' => 'Eklenti',
         'unnamed' => 'İsimsiz eklenti',
         'name' => [
             'label' => 'Eklenti Adı',
@@ -61,10 +78,18 @@ return [
         'manage' => 'Eklentileri yönet',
         'enable_or_disable' => 'Aktifleştir veya Pasifleştir',
         'enable_or_disable_title' => 'Eklentileri Aktifleştir veya Pasifleştir',
+        'install' => 'Eklentileri yükle',
+        'install_products' => 'Ürünleri yükle',
+        'search' => 'eklenti ara...',
+        'installed' => 'Yüklü eklentiler',
+        'no_plugins' => 'Mağazadan yüklenmiş bir eklenti bulunmamaktadır.',
+        'recommended' => 'Tavsiye edilen',
         'remove' => 'Kaldır',
         'refresh' => 'Yenile',
         'disabled_label' => 'Pasif',
         'disabled_help' => 'Pasifleştirilmiş eklentiler, uygulama tarafından göz ardı edilir.',
+        'frozen_label' => 'Güncelleştirmeleri dondur',
+        'frozen_help' => 'Dondurulmuş eklentiler güncelleme işlemi sırasında görmezden gelinecek ve güncellenmeyecektir.',
         'selected_amount' => 'Seçilen eklentiler: :amount',
         'remove_confirm' => 'Emin misiniz?',
         'remove_success' => 'Eklentiler sistemden başarıyla kaldırıldı.',
@@ -106,7 +131,6 @@ return [
         'sender_name' => 'Gönderici Adı',
         'sender_email' => 'Gönderici Email',
         'php_mail' => 'PHP mail',
-        'sendmail' => 'Sendmail',
         'smtp' => 'SMTP',
         'smtp_address' => 'SMTP Adresi',
         'smtp_authorization' => 'SMTP yetkilendirmesi kullan',
@@ -115,6 +139,10 @@ return [
         'smtp_password' => 'Şifre',
         'smtp_port' => 'SMTP Port',
         'smtp_ssl' => 'SSL bağlantısı kullan',
+        'smtp_encryption' => 'SMTP şifreleme protokolü',
+        'smtp_encryption_none' => 'Şifreleme yok',
+        'smtp_encryption_tls' => 'TLS',
+        'smtp_encryption_ssl' => 'SSL',
         'sendmail' => 'Sendmail',
         'sendmail_path' => 'Sendmail Yolu',
         'sendmail_path_comment' => 'Sendmail programının yolunu belirtin.',
@@ -122,7 +150,12 @@ return [
         'mailgun_domain' => 'Mailgun Domain',
         'mailgun_domain_comment' => 'Mailgun domain belirtin.',
         'mailgun_secret' => 'Mailgun Gizli Anahtarı',
-        'mailgun_secret_comment' => 'Mailgun API anahtarını girin.'
+        'mailgun_secret_comment' => 'Mailgun API anahtarını girin.',
+        'mandrill' => 'Mandrill',
+        'mandrill_secret' => 'Mandrill Gizli Anahtarı',
+        'mandrill_secret_comment' => 'Mandrill API anahtarını girin.',
+        'drivers_hint_header' => 'Sürücüler yüklenmemiş',
+        'drivers_hint_content' => 'Bu eposta yöntemiyle eposta gönderebilmeniz için ":plugin" eklentisinin kurulmuş olması gerekir.'
     ],
     'mail_templates' => [
         'menu_label' => 'Mail şablonları',
@@ -134,6 +167,7 @@ return [
         'menu_layouts_label' => 'Mail Layoutları',
         'layout' => 'Layout',
         'layouts' => 'Layoutlar',
+        'no_layout' => '-- Şablon Yok --',
         'name' => 'İsim',
         'name_comment' => 'Bu şablona referans için benzersiz bir isim verin',
         'code' => 'Kod',
@@ -146,12 +180,17 @@ return [
         'content_text' => 'Düzyazı',
         'test_send' => 'Test mesajı gönder',
         'test_success' => 'Test mesajı başarılı şekilde gönderildi.',
-        'return' => 'Şablon listesine geri dön'
+        'return' => 'Şablon listesine geri dön',
+        'test_confirm' => 'Deneme mesajı :email eposta adresine gönderilecek. Devam etmek istiyor musunuz?',
+        'saving' => 'Şablon kaydediliyor...',
+        'sending' => 'Deneme mesajı gönderiliyor...',
     ],
     'install' => [
         'project_label' => 'Projeye bağla',
         'plugin_label' => 'Eklenti Yükle',
+        'theme_label' => 'Temayı yükle',
         'missing_plugin_name' => 'Yüklemek istediğiniz eklentinin adını giriniz.',
+        'missing_theme_name' => 'Lütfen yüklemek için bir tema ismi giriniz.',
         'install_completing' => 'Kurulumu tamamla',
         'install_success' => 'Eklenti kurulumu tamamlandı.'
     ],
@@ -160,9 +199,11 @@ return [
         'name' => 'Sistemi Güncelle',
         'menu_label' => 'Güncellemeler',
         'menu_description' => 'Sistemi güncelleyin, temaları ve eklentileri yönetin.',
+        'return_link' => 'Sistem güncellemelerine geri dön',
         'check_label' => 'Güncellemeleri kontrol et',
         'retry_label' => 'Tekrar dene',
         'plugin_name' => 'Adı',
+        'plugin_code' => 'Kod',
         'plugin_description' => 'Açıklama',
         'plugin_version' => 'Versiyon',
         'plugin_author' => 'Yazar',
@@ -172,9 +213,12 @@ return [
         'core_downloading' => 'Uygulama dosyaları indiriliyor',
         'core_extracting' => 'Uygulama dosyaları çıkarılıyor',
         'plugins' => 'Modüller',
+        'themes' => 'Temalar',
+        'disabled' => 'Devre dışı',
         'plugin_downloading' => 'Modül indiriliyor: :name',
         'plugin_extracting' => 'Modül dosyaları çıkarılıyor: :name',
         'plugin_version_none' => 'Yeni eklenti',
+        'plugin_current_version' => 'Mevcut sürüm',
         'theme_new_install' => 'Yeni tema kur.',
         'theme_downloading' => 'Tema indiriliyor: :name',
         'theme_extracting' => 'Tema paketten çıkarılıyor: :name',
@@ -191,7 +235,24 @@ return [
         'none' => [
             'label' => 'Güncelleme yok',
             'help' => 'Yeni güncelleme bulunamadı.'
-        ]
+        ],
+        'important_action' => [
+            'empty' => 'Eylem seçin',
+            'confirm' => 'Güncellemeyi onayla',
+            'skip' => 'Eklentiyi geç (tek seferlik)',
+            'ignore' => 'Eklentiyi geç (her zaman)',
+        ],
+        'important_action_required' => 'Eylem gerekli',
+        'important_view_guide' => 'Yükseltme kılavuzuna göz atın',
+        'important_alert_text' => 'Bazı eklentiler işlem gerektirebilir.',
+        'details_title' => 'Eklenti detayları',
+        'details_view_homepage' => 'Anasayfa',
+        'details_readme' => 'Kılavuz',
+        'details_readme_missing' => 'Herhangi bir kılavuz bulunamadı.',
+        'details_upgrades' => 'Yükseltme Kılavuzu',
+        'details_upgrades_missing' => 'Yükseltme talimatı bulunamadı.',
+        'details_current_version' => 'Mevcut sürüm',
+        'details_author' => 'Yazar',
     ],
     'server' => [
         'connect_error' => 'Sunucuyla bağlantı kurulamadı.',
@@ -244,9 +305,11 @@ return [
         'name' => 'Sistem',
         'manage_system_settings' => 'Sistem ayarlarını düzenleyebilsin',
         'manage_software_updates' => 'Sistem güncellemelerini yönetebilsin',
+        'access_logs' => 'Sistem günlüğünü görüntüle',
         'manage_mail_templates' => 'E-posta şablonları yönetebilsin',
         'manage_mail_settings' => 'E-posta ayarlarını yönetebilsin',
         'manage_other_administrators' => 'Diğer yöneticileri düzenleyebilsin',
-        'view_the_dashboard' => 'Panoyu görüntüleyebilsin'
+        'view_the_dashboard' => 'Panoyu görüntüleyebilsin',
+        'manage_branding' => 'Back-end i özelleştir'
     ]
-];
\ No newline at end of file
+];

From 4d2a14ae9453c75f578130d25ac4fda7c7c181d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Talha=20Zekeriya=20Durmu=C5=9F?= <drtzack@gmail.com>
Date: Sun, 20 Sep 2015 12:50:24 +0300
Subject: [PATCH 044/103] Update Turkish Language for CMS module

---
 modules/cms/lang/tr/lang.php | 126 +++++++++++++++++++++++++++++++++--
 1 file changed, 122 insertions(+), 4 deletions(-)

diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php
index d6d927657..e7226ce14 100644
--- a/modules/cms/lang/tr/lang.php
+++ b/modules/cms/lang/tr/lang.php
@@ -13,6 +13,7 @@ return [
         'file_name_required' => 'Dosya adı alanı gereklidir.'
     ],
     'theme' => [
+        'not_found_name' => "':name' isimli tema bulunamadı.",
         'active' => [
             'not_set' => "Aktif tema belirtilmedi.",
             'not_found' => 'Aktif tema bulunamadı.'
@@ -24,10 +25,61 @@ return [
         ],
         'settings_menu' => 'Temalar',
         'settings_menu_description' => 'Yüklü temalar listesini önizleyebilir, bir tema seçip aktifleştirebilirsiniz.',
-        'find_more_themes' => 'Medanis Tema Marketi\'nden başka tema alabilirsiniz.',
+        'default_tab' => 'Özellikler',
+        'name_label' => 'İsim',
+        'name_create_placeholder' => 'Yeni tema ismi',
+        'author_label' => 'Yazar',
+        'author_placeholder' => 'Kişi yada şirket ismi',
+        'description_label' => 'Açıklama',
+        'description_placeholder' => 'Tema açıklaması',
+        'homepage_label' => 'Anasayfa',
+        'homepage_placeholder' => 'Anasayfa Adresi(URL)',
+        'code_label' => 'Kod',
+        'code_placeholder' => 'Temanın dağıtımında kullanılmak üzere benzersiz bir kod.',
+        'dir_name_label' => 'Klasör ismi',
+        'dir_name_create_label' => 'Hedef tema dizini',
+        'theme_label' => 'Tema',
+        'theme_title' => 'Temalar',
         'activate_button' => 'Aktifleştir',
         'active_button' => 'Aktifleştir',
-        'customize_button' => 'Düzenle'
+        'customize_theme' => 'Temayı Özelleştir',
+        'customize_button' => 'Düzenle',
+        'duplicate_button' => 'Kopyala',
+        'duplicate_title' => 'Temayı kopyala',
+        'duplicate_theme_success' => 'Tema başarıyla kopyalandı!',
+        'manage_button' => 'Yönet',
+        'manage_title' => 'Temayı yönet',
+        'edit_properties_title' => 'Tema',
+        'edit_properties_button' => 'Özellikleri düzenle',
+        'save_properties' => 'Özellikleri kaydet',
+        'import_button' => 'İçe aktar',
+        'import_title' => 'Temayı içe aktar',
+        'import_theme_success' => 'Tema başarıyla içe aktarıldı!',
+        'import_uploaded_file' => 'Tema arşiv dosyası',
+        'import_overwrite_label' => 'Mevcut dosyaların üstüne yaz',
+        'import_overwrite_comment' => 'Sadece yeni dosyaları almak için bu kutucuğu boşaltın',
+        'import_folders_label' => 'Klasörler',
+        'import_folders_comment' => 'Lütfen içe aktarmak istediğiniz tema klasörlerini seçiniz.',
+        'export_button' => 'Dışa aktar',
+        'export_title' => 'Temayı dışa aktar',
+        'export_folders_label' => 'Klasörler',
+        'export_folders_comment' => 'Lütfen dışa aktarmak istediğiniz tema klasörlerini seçiniz',
+        'delete_button' => 'Sil',
+        'delete_confirm' => 'Bu temayı silmek istediniğize emin misiniz? Bu işlem geri alınamaz!',
+        'delete_active_theme_failed' => 'Aktif tema silinemez. Lütfen başka bir temayı aktif tema olarak seçiniz.',
+        'delete_theme_success' => 'Tema başarıyla silindi!',
+        'create_title' => 'Tema oluştur',
+        'create_button' => 'Oluştur',
+        'create_new_blank_theme' => 'Yeni boş bir tema oluştur',
+        'create_theme_success' => 'Tema başarıyla oluşturuldu!',
+        'create_theme_required_name' => 'Please specify a name for the theme.',
+        'new_directory_name_label' => 'Tema dizini',
+        'new_directory_name_comment' => 'Kopyalanacak tema için yeni bir tema dizini giriniz.',
+        'dir_name_invalid' => 'İsim sadece sayı, latin harfleri ve şu sembolleri içerebilir: _- ',
+        'dir_name_taken' => 'İstenen tema dizini zaten mevcut.',
+        'find_more_themes' => 'Daha fazla tema bulun',
+        'saving' => 'Tema kaydediliyor...',
+        'return' => 'Tema listesine geri dön'
     ],
     'maintenance' => [
         'settings_menu' => 'Bakım modu',
@@ -36,6 +88,7 @@ return [
         'is_enabled_comment' => 'Aktifleştirildiğinde, web sitesi ziyaretçileri aşağıdaki seçtiğiniz sayfayı görecektir.'
     ],
     'page' => [
+        'not_found_name' => "':name' sayfası bulunamadı",
         'not_found' => [
             'label' => "Sayfa bulunamadı",
             'help' => "İstenilen sayfa bulunamadı.",
@@ -178,6 +231,71 @@ return [
         'manage_pages' => 'Sayfaları düzenleyebilsin',
         'manage_layouts' => 'Şablonları düzenleyebilsin',
         'manage_partials' => 'Parça Kodları düzenleyebilsin',
-        'manage_themes' => 'Temaları düzenleyebilsin'
+        'manage_themes' => 'Temaları düzenleyebilsin',
+        'manage_media' => 'Medyaları düzenleyebilsin'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Bir medya öğesi bulmak için %s butonuna tıklayın'
+    ],
+    'media' => [
+        'invalid_path' => "Geçersiz dosya dizini belirtildi: ':path'.",
+        'menu_label' => 'Medya',
+        'upload' => 'Yükle',
+        'move' => 'Taşı',
+        'delete' => 'Sil',
+        'add_folder' => 'Yeni Klasör',
+        'search' => 'Ara',
+        'display' => 'Görüntüle',
+        'filter_everything' => 'Her şey',
+        'filter_images' => 'Resimler',
+        'filter_video' => 'Video',
+        'filter_audio' => 'Ses',
+        'filter_documents' => 'Belgeler',
+        'library' => 'Kütüphane',
+        'folder_size_items' => 'öğe(ler)',
+        'size' => 'Boyut',
+        'title' => 'Başlık',
+        'last_modified' => 'Son düzenleme tarihi',
+        'public_url' => 'Public URL',
+        'click_here' => 'Buraya tıkla',
+        'thumbnail_error' => 'Önizleme oluşturulurken hata.',
+        'return_to_parent' => 'Ana klasöre geri dön',
+        'return_to_parent_label' => 'Yukarı git..',
+        'nothing_selected' => 'Hiçbir şey seçilmedi.',
+        'multiple_selected' => 'Birden fazla öğe seçildi.',
+        'uploading_file_num' => ':number adet dosya yükleniyor...',
+        'uploading_complete' => 'Yükleme tamamlandı',
+        'order_by' => 'Sırala',
+        'search' => 'Ara',
+        'folder' => 'Klasör',
+        'no_files_found' => 'İsteğiniz doğrultusunda hiçbir dosya bulunamadı.',
+        'delete_empty' => 'Lütfen silinecek öğeleri seçiniz.',
+        'delete_confirm' => 'Bu öğe veya öğeleri gerçekten silmek istediğinize emin misiniz?',
+        'error_renaming_file' => 'Öğeyi yeniden isimlendirirken hata.',
+        'new_folder_title' => 'Yeni Klasör',
+        'folder_name' => 'Klasör ismi',
+        'error_creating_folder' => 'Klasör oluştururken hata',
+        'folder_or_file_exist' => 'Belirtilen isimde bir klasör ya da dosya zaten mevcut.',
+        'move_empty' => 'Lütfen taşınacak öğeleri seçiniz.',
+        'move_popup_title' => 'Dosyaları veya klasörleri taşı',
+        'move_destination' => 'Hedef klasör',
+        'please_select_move_dest' => 'Lütfen hedef klasörü seçiniz.',
+        'move_dest_src_match' => 'Lütfen başka bir hedef klasör seçiniz.',
+        'empty_library' => 'Medya kütüphanesi boş. Başlamak için dosya yükleyin yada klasör oluşturun.',
+        'insert' => 'Ekle',
+        'crop_and_insert' => 'Kırp ve Ekle',
+        'select_single_image' => 'Lütfen sadece bir tane resim seçiniz.',
+        'selection_not_image' => 'Seçili öğe bir resim değil.',
+        'restore' => 'Tüm değişiklikleri geri al',
+        'resize' => 'Yeniden boyutlandırma...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Sabit oran',
+        'selection_mode_fixed_size' => 'Sabit boyut',
+        'height' => 'Yükseklik',
+        'width' => 'Genişlik',
+        'selection_mode' => 'Seçim modu',
+        'resize_image' => 'Resimi yeniden boyutlandırs',
+        'image_size' => 'Resim boyutu:',
+        'selected_size' => 'Seçili:'
     ]
-];
\ No newline at end of file
+];

From 5a39058b567605d42235af75bf3a1ab462038988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20Gerg=C5=91?= <gergo85@gmail.com>
Date: Mon, 21 Sep 2015 21:09:07 +0200
Subject: [PATCH 045/103] Translate the "CMS" string and minor cleanup

---
 modules/cms/controllers/Index.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index c1ec08eb0..05d561b24 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -99,7 +99,7 @@ class Index extends Controller
 
         $this->bodyClass = 'compact-container side-panel-not-fixed';
         $this->pageTitle = 'cms::lang.cms.menu_label';
-        $this->pageTitleTemplate = '%s CMS';
+        $this->pageTitleTemplate = '%s '.trans($this->pageTitle);
 
         if (Request::ajax() && Request::input('formWidgetAlias')) {
             $this->bindFormWidgetToController();
@@ -307,6 +307,7 @@ class Index extends Controller
         $partial = ComponentPartial::load($componentObj, 'default');
         $content = $partial->getContent();
         $content = str_replace('__SELF__', $alias, $content);
+
         return $content;
     }
 
@@ -328,7 +329,7 @@ class Index extends Controller
             'partial' => '\Cms\Classes\Partial',
             'layout'  => '\Cms\Classes\Layout',
             'content' => '\Cms\Classes\Content',
-            'asset'   => '\Cms\Classes\Asset',
+            'asset'   => '\Cms\Classes\Asset'
         ];
 
         if (!array_key_exists($type, $types)) {
@@ -392,7 +393,7 @@ class Index extends Controller
             'partial' => '~/modules/cms/classes/partial/fields.yaml',
             'layout'  => '~/modules/cms/classes/layout/fields.yaml',
             'content' => '~/modules/cms/classes/content/fields.yaml',
-            'asset'   => '~/modules/cms/classes/asset/fields.yaml',
+            'asset'   => '~/modules/cms/classes/asset/fields.yaml'
         ];
 
         if (!array_key_exists($type, $formConfigs)) {
@@ -427,7 +428,7 @@ class Index extends Controller
                 throw new ApplicationException(trans('cms::lang.component.invalid_request'));
             }
 
-            for ($index = 0; $index < $count; $index ++) {
+            for ($index = 0; $index < $count; $index++) {
                 $componentName = $componentNames[$index];
                 $componentAlias = $componentAliases[$index];
 
@@ -437,9 +438,7 @@ class Index extends Controller
                 }
 
                 $properties = json_decode($componentProperties[$index], true);
-                unset($properties['oc.alias']);
-                unset($properties['inspectorProperty']);
-                unset($properties['inspectorClassName']);
+                unset($properties['oc.alias'], $properties['inspectorProperty'], $properties['inspectorClassName']);
                 $settings[$section] = $properties;
             }
         }

From 6e85290c9ea1680a52a8416695d4141a8f97b4c2 Mon Sep 17 00:00:00 2001
From: flynsarmy <flynsarmy@gmail.com>
Date: Tue, 22 Sep 2015 10:38:35 +1000
Subject: [PATCH 046/103] Allow \ character in Page URLs. Fixes #1441

---
 modules/cms/classes/Page.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index 839547fda..85c76b4e3 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -21,7 +21,7 @@ class Page extends CmsCompoundObject
 
     protected $settingsValidationRules = [
         'title' => 'required',
-        'url'   => ['required', 'regex:/^\/[a-z0-9\/\:_\-\*\[\]\+\?\|\.\^\$]*$/i']
+        'url'   => ['required', 'regex:/^\/[a-z0-9\/\:_\-\*\[\]\+\?\|\.\^\\\$]*$/i']
     ];
 
     /**

From 933ea641cce2a3d53373ebbdc5c7b28431092d65 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 23 Sep 2015 05:45:55 +1000
Subject: [PATCH 047/103] Adds failed jobs table (from docs) Allow closures to
 be passed to Form|ListController Tidy up server detail payload

---
 modules/backend/behaviors/FormController.php  |  2 +-
 modules/backend/behaviors/ListController.php  |  2 +-
 modules/system/classes/UpdateManager.php      |  3 +--
 .../2015_10_01_000018_Db_FailedJobs.php       | 24 +++++++++++++++++++
 4 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php

diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index f110ef308..48906da73 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -693,7 +693,7 @@ class FormController extends ControllerBehavior
             if (!is_a($widget->getController(), $calledClass)) {
                 return;
             }
-            $callback($widget, $widget->model, $widget->getContext());
+            call_user_func_array($callback, [$widget, $widget->model, $widget->getContext()]);
         });
     }
 
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index 34830a1b1..54315e998 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -411,7 +411,7 @@ class ListController extends ControllerBehavior
             if (!is_a($widget->getController(), $calledClass)) {
                 return;
             }
-            $callback($widget, $widget->model);
+            call_user_func_array($callback, [$widget, $widget->model]);
         });
     }
 }
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index 99b631bff..2da60e101 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -836,8 +836,7 @@ class UpdateManager
      */
     protected function applyHttpAttributes($http, $postData)
     {
-        $postData['url'] = base64_encode(URL::to('/'));
-        $postData['server'] = base64_encode(serialize(['php' => PHP_VERSION]));
+        $postData['server'] = base64_encode(serialize(['php' => PHP_VERSION, 'url' => URL::to('/')]));
         if (Config::get('cms.edgeUpdates', false)) {
             $postData['edge'] = 1;
         }
diff --git a/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php b/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php
new file mode 100644
index 000000000..5a5ac906d
--- /dev/null
+++ b/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php
@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DbFailedJobs extends Migration
+{
+    public function up()
+    {
+        Schema::create('failed_jobs', function (Blueprint $table) {
+            $table->engine = 'InnoDB';
+            $table->increments('id');
+            $table->text('connection');
+            $table->text('queue');
+            $table->text('payload');
+            $table->timestamp('failed_at');
+        });
+    }
+
+    public function down()
+    {
+        Schema::dropIfExists('failed_jobs');
+    }
+}

From d56350dd341ab45785958c10a3de313514dfbb52 Mon Sep 17 00:00:00 2001
From: Vojta Svoboda <vojtasvoboda.cz@gmail.com>
Date: Wed, 23 Sep 2015 12:19:02 +0200
Subject: [PATCH 048/103] Add missing locales

---
 modules/system/lang/cs/lang.php    | 44 +++++++++++++++---------------
 modules/system/lang/de/lang.php    | 31 ++++++++++++++-------
 modules/system/lang/el/lang.php    |  1 +
 modules/system/lang/en/lang.php    |  1 +
 modules/system/lang/es-ar/lang.php |  1 +
 modules/system/lang/es/lang.php    |  1 +
 modules/system/lang/fa/lang.php    |  1 +
 modules/system/lang/fr/lang.php    |  1 +
 modules/system/lang/hu/lang.php    |  1 +
 modules/system/lang/id/lang.php    |  1 +
 modules/system/lang/it/lang.php    |  1 +
 modules/system/lang/ja/lang.php    |  1 +
 modules/system/lang/lv/lang.php    |  1 +
 modules/system/lang/nb-no/lang.php |  1 +
 modules/system/lang/nl/lang.php    |  1 +
 modules/system/lang/pl/lang.php    |  1 +
 modules/system/lang/pt-br/lang.php |  1 +
 modules/system/lang/ro/lang.php    |  1 +
 modules/system/lang/ru/lang.php    |  1 +
 modules/system/lang/sv/lang.php    |  1 +
 modules/system/lang/tr/lang.php    |  1 +
 modules/system/lang/zh-cn/lang.php |  1 +
 modules/system/lang/zh-tw/lang.php |  1 +
 23 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/modules/system/lang/cs/lang.php b/modules/system/lang/cs/lang.php
index dff4112c4..cf3a690dc 100644
--- a/modules/system/lang/cs/lang.php
+++ b/modules/system/lang/cs/lang.php
@@ -6,30 +6,30 @@ return [
         'tagline' => 'Getting back to basics'
     ],
     'locale' => [
-        'cs' => 'Czech',
-        'en' => 'English',
-        'de' => 'German',
-        'el' => 'Greek',
-        'es' => 'Spanish',
-        'es-ar' => 'Spanish (Argentina)',
-        'fa' => 'Persian',
-        'fr' => 'French',
-        'hu' => 'Hungarian',
+        'cs' => 'Čeština',
+        'en' => 'Angličtina',
+        'de' => 'Němčina',
+        'el' => 'Řečtina',
+        'es' => 'Španělština',
+        'es-ar' => 'Španělština (Argentinská)',
+        'fa' => 'Perština',
+        'fr' => 'Francouzština',
+        'hu' => 'Maďarština',
         'id' => 'Bahasa Indonesia',
-        'it' => 'Italian',
-        'ja' => 'Japanese',
-        'lv' => 'Latvian',
+        'it' => 'Italština',
+        'ja' => 'Japonština',
+        'lv' => 'Litevština',
         'nb-no' => 'Norwegian (Bokmål)',
-        'nl' => 'Dutch',
-        'pl' => 'Polish',
-        'pt-br' => 'Portuguese (Brazil)',
-        'ro' => 'Romanian',
-        'ru' => 'Russian',
-        'sv' => 'Swedish',
-        'sk' => 'Slovak (Slovakia)',
-        'tr' => 'Turkish',
-        'zh-cn' => 'Chinese (China)',
-        'zh-tw' => 'Chinese (Taiwan)'
+        'nl' => 'Holandština',
+        'pl' => 'Polština',
+        'pt-br' => 'Portugalština (Brazilská)',
+        'ro' => 'Rumunština',
+        'ru' => 'Ruština',
+        'sv' => 'Švédština',
+        'sk' => 'Slovenština',
+        'tr' => 'Turečtina',
+        'zh-cn' => 'Čínštína (Čína)',
+        'zh-tw' => 'Čínštína (Tchaj-wan)'
     ],
     'directory' => [
         'create_fail' => 'Nelze vytvořit složku: :name'
diff --git a/modules/system/lang/de/lang.php b/modules/system/lang/de/lang.php
index 67e3c77ca..7c463d583 100644
--- a/modules/system/lang/de/lang.php
+++ b/modules/system/lang/de/lang.php
@@ -6,19 +6,30 @@ return [
         'tagline' => 'Zurück zum Wesentlichen',
     ],
     'locale' => [
+        'cs' => 'Tschechisch',
         'en' => 'English',
-        'nl' => 'Dutch',
-        'ja' => 'Japanese',
-        'sv' => 'Swedish',
-        'tr' => 'Turkish',
         'de' => 'German',
-        'ru' => 'Russian',
-        'fr' => 'French',
-        'it' => 'Italian',
-        'ro' => 'Romana',
-        'pt-br' => 'Brazilian Portuguese',
+        'el' => 'Greek',
+        'es' => 'Spanish',
+        'es-ar' => 'Spanish (Argentina)',
         'fa' => 'Persian',
-        'nb-no' => 'Norwegisch (Bokmål)'
+        'fr' => 'French',
+        'hu' => 'Hungarian',
+        'id' => 'Bahasa Indonesia',
+        'it' => 'Italian',
+        'ja' => 'Japanese',
+        'lv' => 'Latvian',
+        'nb-no' => 'Norwegisch (Bokmål)',
+        'nl' => 'Dutch',
+        'pl' => 'Polish',
+        'pt-br' => 'Portuguese (Brazil)',
+        'ro' => 'Romana',
+        'ru' => 'Russian',
+        'sv' => 'Swedish',
+        'sk' => 'Slovak (Slovakia)',
+        'tr' => 'Turkish',
+        'zh-cn' => 'Chinese (China)',
+        'zh-tw' => 'Chinese (Taiwan)'
     ],
     'directory' => [
         'create_fail' => "Konnte Verzeichnis: :name nicht erstellen",
diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php
index f7cac295e..22b0739d3 100644
--- a/modules/system/lang/el/lang.php
+++ b/modules/system/lang/el/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Επιστροφή στα βασικά'
     ],
     'locale' => [
+        'cs' => 'Τσέχος',
         'en' => 'Αγγλικά',
         'de' => 'Γερμανικά',
         'el' => 'Ελληνικά',
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 0a814a82f..fa2d2a72d 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Getting back to basics'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English',
         'de' => 'German',
         'el' => 'Greek',
diff --git a/modules/system/lang/es-ar/lang.php b/modules/system/lang/es-ar/lang.php
index fc5438f57..d00502b0d 100644
--- a/modules/system/lang/es-ar/lang.php
+++ b/modules/system/lang/es-ar/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Getting back to basics',
     ],
     'locale' => [
+        'cs' => 'Checo',
         'en' => 'Inglés',
         'nl' => 'Holandés',
         'ja' => 'Japonés',
diff --git a/modules/system/lang/es/lang.php b/modules/system/lang/es/lang.php
index 921405ac1..69287df5d 100644
--- a/modules/system/lang/es/lang.php
+++ b/modules/system/lang/es/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Getting back to basics',
     ],
     'locale'         => [
+        'cs'    => 'Checo',
         'en'    => 'Inglés',
         'nl'    => 'Holandés',
         'ja'    => 'Japonés',
diff --git a/modules/system/lang/fa/lang.php b/modules/system/lang/fa/lang.php
index daa9b61ef..7e264e9e0 100644
--- a/modules/system/lang/fa/lang.php
+++ b/modules/system/lang/fa/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'بازگشت به گذشته',
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'انگلیسی',
         'de' => 'آلمانی',
         'es' => 'اسپانیایی',
diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php
index f67aaddbb..6ec7f7070 100644
--- a/modules/system/lang/fr/lang.php
+++ b/modules/system/lang/fr/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Retourner à l’essentiel',
     ],
     'locale' => [
+        'cs' => 'Tchèque',
         'en' => 'Anglais',
         'de' => 'Allemand',
         'el' => 'Grec',
diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php
index d4dd9656e..acabc24b2 100644
--- a/modules/system/lang/hu/lang.php
+++ b/modules/system/lang/hu/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Visszatérés az alapokhoz'
     ],
     'locale' => [
+        'cs' => 'Cseh',
         'en' => 'Angol',
         'de' => 'Német',
         'el' => 'Görög',
diff --git a/modules/system/lang/id/lang.php b/modules/system/lang/id/lang.php
index deec10fbe..10f3b7e4d 100644
--- a/modules/system/lang/id/lang.php
+++ b/modules/system/lang/id/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Dapati kembali yang mendasar'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'Inggris',
         'de' => 'Jerman',
         'es' => 'Spanyol',
diff --git a/modules/system/lang/it/lang.php b/modules/system/lang/it/lang.php
index 4d64bfa6f..4d7211e03 100644
--- a/modules/system/lang/it/lang.php
+++ b/modules/system/lang/it/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Tornare alle origini',
     ],
     'locale' => [
+        'cs' => 'Ceco',
         'en' => 'Inglese',
         'de' => 'Tedesco',
         'es' => 'Spagnolo',
diff --git a/modules/system/lang/ja/lang.php b/modules/system/lang/ja/lang.php
index 9e6117739..1f606fd7e 100644
--- a/modules/system/lang/ja/lang.php
+++ b/modules/system/lang/ja/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => '基本に戻ろう！',
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English',
         'de' => 'German',
         'es' => 'Spanish',
diff --git a/modules/system/lang/lv/lang.php b/modules/system/lang/lv/lang.php
index 35c856332..793f024b4 100644
--- a/modules/system/lang/lv/lang.php
+++ b/modules/system/lang/lv/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Atgriežamies pie pamatiem'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English',
         'de' => 'German',
         'es' => 'Spanish',
diff --git a/modules/system/lang/nb-no/lang.php b/modules/system/lang/nb-no/lang.php
index f8c36aca5..640405c7a 100644
--- a/modules/system/lang/nb-no/lang.php
+++ b/modules/system/lang/nb-no/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Getting back to basics'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'Engelsk',
         'de' => 'Tysk',
         'es' => 'Spansk',
diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php
index 5cdb6b7dd..9f8189108 100644
--- a/modules/system/lang/nl/lang.php
+++ b/modules/system/lang/nl/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Terug naar de basis',
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'Engels',
         'nl' => 'Nederlands',
         'ja' => 'Japans',
diff --git a/modules/system/lang/pl/lang.php b/modules/system/lang/pl/lang.php
index 28d387aa2..a87c57f85 100644
--- a/modules/system/lang/pl/lang.php
+++ b/modules/system/lang/pl/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Getting back to basics'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'Angielski',
         'de' => 'Niemiecki',
         'es' => 'Hiszpański',
diff --git a/modules/system/lang/pt-br/lang.php b/modules/system/lang/pt-br/lang.php
index 93b0a68f8..103cea1eb 100644
--- a/modules/system/lang/pt-br/lang.php
+++ b/modules/system/lang/pt-br/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Voltando ao básico',
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'Inglês',
         'de' => 'Alemão',
         'es' => 'Espanhol',
diff --git a/modules/system/lang/ro/lang.php b/modules/system/lang/ro/lang.php
index cf0dcdf30..296231200 100644
--- a/modules/system/lang/ro/lang.php
+++ b/modules/system/lang/ro/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Intoarcerea la elementele de baza',
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'Engleza',
         'nl' => 'Olandeza',
         'ja' => 'Japoneza',
diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php
index fd3e0ed8f..5ee6bc233 100644
--- a/modules/system/lang/ru/lang.php
+++ b/modules/system/lang/ru/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Возвращение к истокам'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English',
         'de' => 'German',
         'es' => 'Spanish',
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
index d92a6bbd8..e1e047040 100644
--- a/modules/system/lang/sv/lang.php
+++ b/modules/system/lang/sv/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Getting back to basics',
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English',
         'de' => 'German',
         'es' => 'Spanish',
diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php
index b511c0241..e166b84e2 100644
--- a/modules/system/lang/tr/lang.php
+++ b/modules/system/lang/tr/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => 'Basitliğe dönüş...'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English (United States)',
         'de' => 'Deutsch (Deutschland)',
         'es' => 'Español (Spanish)',
diff --git a/modules/system/lang/zh-cn/lang.php b/modules/system/lang/zh-cn/lang.php
index 7a2d24196..e349ecba4 100644
--- a/modules/system/lang/zh-cn/lang.php
+++ b/modules/system/lang/zh-cn/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => '欢迎使用October CMS！'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English',
         'de' => 'German',
         'es' => 'Spanish',
diff --git a/modules/system/lang/zh-tw/lang.php b/modules/system/lang/zh-tw/lang.php
index 9f5648340..46facf91e 100644
--- a/modules/system/lang/zh-tw/lang.php
+++ b/modules/system/lang/zh-tw/lang.php
@@ -6,6 +6,7 @@ return [
         'tagline' => '登入'
     ],
     'locale' => [
+        'cs' => 'Czech',
         'en' => 'English',
         'de' => 'German',
         'es' => 'Spanish',

From 99f2a40662e742e443310d999166dcf80ae64762 Mon Sep 17 00:00:00 2001
From: Jakub Zych <jakub@c-call.eu>
Date: Wed, 23 Sep 2015 15:12:17 +0200
Subject: [PATCH 049/103] small fix in polish translation

---
 modules/backend/lang/pl/lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/lang/pl/lang.php b/modules/backend/lang/pl/lang.php
index b692adc9c..8fdd8e6f5 100644
--- a/modules/backend/lang/pl/lang.php
+++ b/modules/backend/lang/pl/lang.php
@@ -219,7 +219,7 @@ return [
         'close' => "Zamknij",
         'add_name' => "Dodaj :name",
         'create' => "Stwórz",
-        'create_name' => "Create :name",
+        'create_name' => "Stwórz :name",
         'update' => "Aktualizuj",
         'update_name' => "Aktualizuj :name",
         'preview' => "Podgląd",

From 0e3e19a6859ccde1b93f0ccfdebd0a3dc3212042 Mon Sep 17 00:00:00 2001
From: Jakub Zych <jakub@c-call.eu>
Date: Wed, 23 Sep 2015 15:14:10 +0200
Subject: [PATCH 050/103] string replaced with translation key

backend::lang.list.no_records exists in all language files
---
 modules/backend/widgets/Lists.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 16fc21033..93b3f16aa 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -54,7 +54,7 @@ class Lists extends WidgetBase
     /**
      * @var string Message to display when there are no records in the list.
      */
-    public $noRecordsMessage = 'No records found';
+    public $noRecordsMessage = 'backend::lang.list.no_records';
 
     /**
      * @var int Maximum rows to display for each page.

From 7aea60f11db0b033da4106d30359749c2a4863aa Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 24 Sep 2015 05:35:15 +1000
Subject: [PATCH 051/103] * Build 298

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfce1f2b9..3392310bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* **Build 298** (2015-09-24)
+  - Added the ability to use a wildcard URL parameter in CMS pages (see CMS > Pages docs).
+
 * **Build 297** (2015-09-19)
   - Introduced new `Revisionable` trait for storing model history (see Database > Traits docs).
   - Added `timetense` list column type (see Backend > Lists docs), along with `|time_since` and `|time_tense` Twig filters.

From faf682e30e171b85a6dd760d2d7c4a9f0842f411 Mon Sep 17 00:00:00 2001
From: Dave Shoreman <code@dsdev.io>
Date: Thu, 24 Sep 2015 19:11:32 +0100
Subject: [PATCH 052/103] Localise last modified date for mediaManager items

Updates the string version of the date to use PHP's IntlDateFormatter
which gives us translated dates in the appropriate format, based on
the user's locale set in backend preferences.

If ever there's a case where locale wasn't set or didn't match anything,
it would default to the system locale.
---
 modules/cms/classes/MediaLibraryItem.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index 3289bca2b..9bbee80a8 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -2,6 +2,8 @@
 
 use File;
 use Config;
+use IntlDateFormatter;
+use Backend\Models\UserPreferences;
 
 /**
  * Represents a file or folder in the Media Library.
@@ -48,7 +50,7 @@ class MediaLibraryItem
 
     /**
      * @var array Contains a default list of files and directories to ignore.
-     * The list can be customized with the following configuration options: 
+     * The list can be customized with the following configuration options:
      * - cms.storage.media.image_extensions
      * - cms.storage.media.video_extensions
      * - cms.storage.media.audo_extensions
@@ -129,10 +131,18 @@ class MediaLibraryItem
 
     /**
      * Returns the item last modification date as string.
-     * @return string Returns the item last modification date as string.
+     * @return string Returns the item's last modification date as string.
      */
     public function lastModifiedAsString()
     {
-        return $this->lastModified ? date('M d, Y', $this->lastModified) : null;
+        if (!($date = $this->lastModified)) {
+            return null;
+        }
+
+        return IntlDateFormatter::create(
+            UserPreferences::forUser()->get('backend::backend.preferences')['locale'],
+            IntlDateFormatter::MEDIUM,
+            IntlDateFormatter::NONE
+        )->format($date);
     }
-}
\ No newline at end of file
+}

From 5816ae5604f53f9d568dfaee61e6c3f1db917640 Mon Sep 17 00:00:00 2001
From: Dave Shoreman <code@dsdev.io>
Date: Thu, 24 Sep 2015 10:59:59 +0100
Subject: [PATCH 053/103] Add permissions for account dropdown items

This adds permissions to Back-end Preferences and Code editor
preferences in the backend.

Instead of Access denied, the Backend Preferences page displays
an "Unable to find the spcified settings" error. Meh... it works.
---
 modules/backend/ServiceProvider.php               | 10 ++++++++++
 modules/backend/controllers/EditorPreferences.php |  2 ++
 modules/system/controllers/Settings.php           |  4 ++--
 modules/system/lang/en/lang.php                   |  2 ++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index f9c68c6a7..82d402dcb 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -110,6 +110,14 @@ class ServiceProvider extends ModuleServiceProvider
                     'label' => 'system::lang.permissions.manage_other_administrators',
                     'tab'   => 'system::lang.permissions.name'
                 ],
+                'backend.manage_preferences' => [
+                    'label' => 'system::lang.permissions.manage_preferences',
+                    'tab'   => 'system::lang.permissions.name'
+                ],
+                'backend.manage_editor' => [
+                    'label' => 'system::lang.permissions.manage_editor',
+                    'tab'   => 'system::lang.permissions.name'
+                ],
                 'backend.manage_branding' => [
                     'label' => 'system::lang.permissions.manage_branding',
                     'tab'   => 'system::lang.permissions.name'
@@ -207,6 +215,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => SettingsManager::CATEGORY_MYSETTINGS,
                     'icon'        => 'icon-laptop',
                     'class'       => 'Backend\Models\BackendPreferences',
+                    'permissions' => ['backend.manage_preferences'],
                     'order'       => 510,
                     'context'     => 'mysettings'
                 ],
@@ -216,6 +225,7 @@ class ServiceProvider extends ModuleServiceProvider
                     'category'    => SettingsManager::CATEGORY_MYSETTINGS,
                     'icon'        => 'icon-code',
                     'url'         => Backend::URL('backend/editorpreferences'),
+                    'permissions' => ['backend.manage_editor'],
                     'order'       => 520,
                     'context'     => 'mysettings'
                 ],
diff --git a/modules/backend/controllers/EditorPreferences.php b/modules/backend/controllers/EditorPreferences.php
index baf6a4452..91151931e 100644
--- a/modules/backend/controllers/EditorPreferences.php
+++ b/modules/backend/controllers/EditorPreferences.php
@@ -20,6 +20,8 @@ class EditorPreferences extends Controller
 
     public $formConfig = 'config_form.yaml';
 
+    public $requiredPermissions = ['backend.manage_editor'];
+
     /**
      * Constructor.
      */
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 3db05e392..b9eb356b8 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -30,8 +30,8 @@ class Settings extends Controller
     {
         parent::__construct();
 
-        if ($this->action == 'mysettings') {
-            $this->requiredPermissions = null;
+        if ($this->action == 'backend_preferences') {
+            $this->requiredPermissions = ['backend.manage_preferences'];
         }
 
         $this->addCss('/modules/system/assets/css/settings/settings.css', 'core');
diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php
index 0a814a82f..d07542036 100644
--- a/modules/system/lang/en/lang.php
+++ b/modules/system/lang/en/lang.php
@@ -316,6 +316,8 @@ return [
         'manage_mail_templates' => 'Manage mail templates',
         'manage_mail_settings' => 'Manage mail settings',
         'manage_other_administrators' => 'Manage other administrators',
+        'manage_preferences' => 'Manage backend preferences',
+        'manage_editor' => 'Manage code editor preferences',
         'view_the_dashboard' => 'View the dashboard',
         'manage_branding' => 'Customize the back-end'
     ]

From beca2dddc23aca31e7eb6156d043deab6e7fd1fd Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 25 Sep 2015 06:01:59 +1000
Subject: [PATCH 054/103] Fixes the full screen button in code editor

---
 .../codeeditor/assets/js/build-min.js         |  9 ++---
 .../codeeditor/assets/js/codeeditor.js        | 38 +++++++++----------
 modules/system/assets/ui/js/drag.scroll.js    | 26 +++++++------
 modules/system/assets/ui/storm-min.js         | 12 +++---
 4 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/modules/backend/formwidgets/codeeditor/assets/js/build-min.js b/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
index 9ca99cb1b..3fa617592 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/build-min.js
@@ -4267,10 +4267,6 @@ if(this.isFullscreen){$('body').css({overflow:'hidden'})}
 else{$('body').css({overflow:'inherit'})}
 this.editor.resize()
 this.editor.focus()}
-+function(exports){if(exports.ace&&typeof exports.ace.require=='function'){var emmetExt=exports.ace.require('ace/ext/emmet')
-if(emmetExt&&emmetExt.AceEmmetEditor&&emmetExt.AceEmmetEditor.prototype.getSyntax){var coreGetSyntax=emmetExt.AceEmmetEditor.prototype.getSyntax
-emmetExt.AceEmmetEditor.prototype.getSyntax=function(){var $syntax=$.proxy(coreGetSyntax,this)()
-return $syntax=='twig'?'html':$syntax};}}}(window)
 var old=$.fn.codeEditor
 $.fn.codeEditor=function(option){var args=Array.prototype.slice.call(arguments,1),result
 this.each(function(){var $this=$(this)
@@ -4287,4 +4283,7 @@ $.oc={}
 $.oc.codeEditorExtensionModes={'htm':'html','html':'html','md':'markdown','txt':'plain_text','js':'javascript','less':'less','scss':'scss','sass':'sass','css':'css'}
 $.fn.codeEditor.noConflict=function(){$.fn.codeEditor=old
 return this}
-$(document).render(function(){$('[data-control="codeeditor"]').codeEditor()})}(window.jQuery);
\ No newline at end of file
+$(document).render(function(){$('[data-control="codeeditor"]').codeEditor()});+function(exports){if(exports.ace&&typeof exports.ace.require=='function'){var emmetExt=exports.ace.require('ace/ext/emmet')
+if(emmetExt&&emmetExt.AceEmmetEditor&&emmetExt.AceEmmetEditor.prototype.getSyntax){var coreGetSyntax=emmetExt.AceEmmetEditor.prototype.getSyntax
+emmetExt.AceEmmetEditor.prototype.getSyntax=function(){var $syntax=$.proxy(coreGetSyntax,this)()
+return $syntax=='twig'?'html':$syntax};}}}(window)}(window.jQuery);
\ No newline at end of file
diff --git a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
index d19228864..f429889a9 100644
--- a/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
+++ b/modules/backend/formwidgets/codeeditor/assets/js/codeeditor.js
@@ -338,24 +338,6 @@
         this.editor.focus()
     }
 
-    // FIX EMMET HTML WHEN SYNTAX IS TWIG
-    // ==================================
-
-    +function (exports) {
-        if (exports.ace && typeof exports.ace.require == 'function') {
-            var emmetExt = exports.ace.require('ace/ext/emmet')
-
-            if (emmetExt && emmetExt.AceEmmetEditor && emmetExt.AceEmmetEditor.prototype.getSyntax) {
-                var coreGetSyntax = emmetExt.AceEmmetEditor.prototype.getSyntax
-
-                emmetExt.AceEmmetEditor.prototype.getSyntax = function () {
-                    var $syntax = $.proxy(coreGetSyntax, this)()
-                    return $syntax == 'twig' ? 'html' : $syntax
-                };
-            }
-        }
-    }(window)
-
     // CODEEDITOR PLUGIN DEFINITION
     // ============================
 
@@ -407,6 +389,24 @@
     // ===============
     $(document).render(function () {
         $('[data-control="codeeditor"]').codeEditor()
-    })
+    });
+
+    // FIX EMMET HTML WHEN SYNTAX IS TWIG
+    // ==================================
+
+    +function (exports) {
+        if (exports.ace && typeof exports.ace.require == 'function') {
+            var emmetExt = exports.ace.require('ace/ext/emmet')
+
+            if (emmetExt && emmetExt.AceEmmetEditor && emmetExt.AceEmmetEditor.prototype.getSyntax) {
+                var coreGetSyntax = emmetExt.AceEmmetEditor.prototype.getSyntax
+
+                emmetExt.AceEmmetEditor.prototype.getSyntax = function () {
+                    var $syntax = $.proxy(coreGetSyntax, this)()
+                    return $syntax == 'twig' ? 'html' : $syntax
+                };
+            }
+        }
+    }(window)
 
 }(window.jQuery);
diff --git a/modules/system/assets/ui/js/drag.scroll.js b/modules/system/assets/ui/js/drag.scroll.js
index 0e4f290ca..4a0b00890 100644
--- a/modules/system/assets/ui/js/drag.scroll.js
+++ b/modules/system/assets/ui/js/drag.scroll.js
@@ -294,14 +294,14 @@
 
         var self = this,
             params = {
-            duration: 300, 
-            queue: false, 
-            complete: function(){
-                self.fixScrollClasses()
-                if (callback !== undefined)
-                    callback()
+                duration: 300,
+                queue: false,
+                complete: function(){
+                    self.fixScrollClasses()
+                    if (callback !== undefined)
+                        callback()
+                }
             }
-        }
 
         params = $.extend(params, options || {})
 
@@ -314,20 +314,23 @@
             if (offset < 0) {
                 this.el.animate({'scrollLeft': $el.get(0).offsetLeft}, params)
                 animated = true
-            } else {
+            }
+            else {
                 offset = $el.get(0).offsetLeft + $el.width() - (this.el.scrollLeft() + this.el.width())
                 if (offset > 0) {
                     this.el.animate({'scrollLeft': $el.get(0).offsetLeft + $el.width() - this.el.width()}, params)
                     animated = true
                 }
             }
-        } else {
+        }
+        else {
             offset = $el.get(0).offsetTop - this.el.scrollTop()
 
             if (offset < 0) {
                 this.el.animate({'scrollTop': $el.get(0).offsetTop}, params)
                 animated = true
-            } else {
+            }
+            else {
                 offset = $el.get(0).offsetTop - (this.el.scrollTop() + this.el.height())
                 if (offset > 0) {
                     this.el.animate({'scrollTop': $el.get(0).offsetTop + $el.height() - this.el.height()}, params)
@@ -336,8 +339,9 @@
             }
         }
 
-        if (!animated && callback !== undefined)
+        if (!animated && callback !== undefined) {
             callback()
+        }
     }
 
     DragScroll.prototype.dispose = function() {
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index b5d0ab812..aff7d5105 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -1540,15 +1540,17 @@ params=$.extend(params,options||{})
 var offset=0,animated=false
 if(!this.options.vertical){offset=$el.get(0).offsetLeft-this.el.scrollLeft()
 if(offset<0){this.el.animate({'scrollLeft':$el.get(0).offsetLeft},params)
-animated=true}else{offset=$el.get(0).offsetLeft+$el.width()-(this.el.scrollLeft()+this.el.width())
+animated=true}
+else{offset=$el.get(0).offsetLeft+$el.width()-(this.el.scrollLeft()+this.el.width())
 if(offset>0){this.el.animate({'scrollLeft':$el.get(0).offsetLeft+$el.width()-this.el.width()},params)
-animated=true}}}else{offset=$el.get(0).offsetTop-this.el.scrollTop()
+animated=true}}}
+else{offset=$el.get(0).offsetTop-this.el.scrollTop()
 if(offset<0){this.el.animate({'scrollTop':$el.get(0).offsetTop},params)
-animated=true}else{offset=$el.get(0).offsetTop-(this.el.scrollTop()+this.el.height())
+animated=true}
+else{offset=$el.get(0).offsetTop-(this.el.scrollTop()+this.el.height())
 if(offset>0){this.el.animate({'scrollTop':$el.get(0).offsetTop+$el.height()-this.el.height()},params)
 animated=true}}}
-if(!animated&&callback!==undefined)
-callback()}
+if(!animated&&callback!==undefined){callback()}}
 DragScroll.prototype.dispose=function(){this.scrollClassContainer=null
 $(document).off('ready',this.proxy(this.fixScrollClasses))
 $(window).off('resize',this.proxy(this.fixScrollClasses))

From 44bfda46ccd668a6a68b25cc83e024ec0f19000b Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 07:55:39 +1000
Subject: [PATCH 055/103] Translate page title template

---
 modules/backend/layouts/_head.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index 46445d936..d46f64e87 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -4,7 +4,7 @@
 <meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
 <meta name="csrf-token" content="<?= csrf_token() ?>">
 <link rel="icon" type="image/png" href="<?= Backend::skinAsset('assets/images/favicon.png') ?>">
-<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
+<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e(trans($this->pageTitleTemplate)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
     <?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
 </title>
 <?php

From 70882a0e333a13445c4afbbacd073e2f4508a0c4 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 08:01:08 +1000
Subject: [PATCH 056/103] Minor revert from previous 2 commits

---
 modules/backend/layouts/_head.htm | 2 +-
 modules/cms/controllers/Index.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/backend/layouts/_head.htm b/modules/backend/layouts/_head.htm
index d46f64e87..46445d936 100644
--- a/modules/backend/layouts/_head.htm
+++ b/modules/backend/layouts/_head.htm
@@ -4,7 +4,7 @@
 <meta name="backend-base-path" content="<?= Backend::baseUrl() ?>">
 <meta name="csrf-token" content="<?= csrf_token() ?>">
 <link rel="icon" type="image/png" href="<?= Backend::skinAsset('assets/images/favicon.png') ?>">
-<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e(trans($this->pageTitleTemplate)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
+<title data-title-template="<?= empty($this->pageTitleTemplate) ? '%s' : e($this->pageTitleTemplate) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>">
     <?= e(trans($this->pageTitle)) ?> | <?= e(Backend\Models\BrandSettings::get('app_name')) ?>
 </title>
 <?php
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 05d561b24..e7783813a 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -438,7 +438,9 @@ class Index extends Controller
                 }
 
                 $properties = json_decode($componentProperties[$index], true);
-                unset($properties['oc.alias'], $properties['inspectorProperty'], $properties['inspectorClassName']);
+                unset($properties['oc.alias']);
+                unset($properties['inspectorProperty']);
+                unset($properties['inspectorClassName']);
                 $settings[$section] = $properties;
             }
         }

From 863bac86fec67ffadb5744f5916622039565a179 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 08:01:32 +1000
Subject: [PATCH 057/103] Foundation code samples should be inline

---
 modules/system/assets/ui/docs/foundation.md | 260 ++++++++++----------
 1 file changed, 135 insertions(+), 125 deletions(-)

diff --git a/modules/system/assets/ui/docs/foundation.md b/modules/system/assets/ui/docs/foundation.md
index ef3cce04c..0f943db00 100644
--- a/modules/system/assets/ui/docs/foundation.md
+++ b/modules/system/assets/ui/docs/foundation.md
@@ -36,16 +36,18 @@ October Storm provides everything we need to meet the goals. Please read on to l
 
 OOP approach and prototypes should be used in all places. This approach automatically deals with closures that could retain references to scope variables. Typical class code template:
 
-    function ($) { "use strict";
-        var SomeClass = function() {
-            this.init()
-        }
-
-        SomeClass.prototype.init = function (){
-            ...
-        }
+```js
+function ($) { "use strict";
+    var SomeClass = function() {
+        this.init()
     }
 
+    SomeClass.prototype.init = function (){
+        ...
+    }
+}
+```
+
 ## Basics of writing disposable classes
 
 If a class should be disposable (all UI controls should be disposable), the class should extend `$.oc.foundation.base` class. That class has two useful methods: `proxy(method)` and `dispose()`.
@@ -60,29 +62,31 @@ If a class should be disposable (all UI controls should be disposable), the clas
 
 Example of a disposable class:
 
-    +function ($) { "use strict";
-        var Base = $.oc.foundation.base,
-            BaseProto = Base.prototype
+```js
++function ($) { "use strict";
+    var Base = $.oc.foundation.base,
+        BaseProto = Base.prototype
 
-        var SomeDisposableClass = function(element) {
-            this.$el = $(element)
+    var SomeDisposableClass = function(element) {
+        this.$el = $(element)
 
-            Base.call(this)
-            this.init()
-        }
-
-        SomeDisposableClass.prototype = Object.create(BaseProto)
-        SomeDisposableClass.prototype.constructor = SomeDisposableClass
-
-        SomeDisposableClass.prototype.init = function () {
-        }
-
-        SomeDisposableClass.prototype.dispose = function () {
-            this.$el = null
-            BaseProto.dispose.call(this)
-        }
+        Base.call(this)
+        this.init()
     }
 
+    SomeDisposableClass.prototype = Object.create(BaseProto)
+    SomeDisposableClass.prototype.constructor = SomeDisposableClass
+
+    SomeDisposableClass.prototype.init = function () {
+    }
+
+    SomeDisposableClass.prototype.dispose = function () {
+        this.$el = null
+        BaseProto.dispose.call(this)
+    }
+}
+```
+
 A couple of important things to note:
 
 1. The class constructor should call Base.call(this).
@@ -92,134 +96,140 @@ A couple of important things to note:
 
 When binding events, use this.proxy() to make references to event handlers. Always unbind events in dispose() method:
 
-    +function ($) { "use strict";
-        var Base = $.oc.foundation.base,
-            BaseProto = Base.prototype
+```js
++function ($) { "use strict";
+    var Base = $.oc.foundation.base,
+        BaseProto = Base.prototype
 
-        var SomeDisposableClass = function(element) {
-            this.$el = $(element)
+    var SomeDisposableClass = function(element) {
+        this.$el = $(element)
 
-            Base.call(this)
-            this.init()
-        }
-
-        [...]
-
-        SomeDisposableClass.prototype.init = function () {
-            this.$el.on('click', this.proxy(this.onClick))
-        }
-
-        SomeDisposableClass.prototype.dispose = function () {
-            this.$el.off('click', this.proxy(this.onClick))
-            this.$el = null
-            BaseProto.dispose.call(this)
-        }
+        Base.call(this)
+        this.init()
     }
 
+    [...]
+
+    SomeDisposableClass.prototype.init = function () {
+        this.$el.on('click', this.proxy(this.onClick))
+    }
+
+    SomeDisposableClass.prototype.dispose = function () {
+        this.$el.off('click', this.proxy(this.onClick))
+        this.$el = null
+        BaseProto.dispose.call(this)
+    }
+}
+```
+
 ## Making disposable controls
 
 UI controls should support two ways of disposing - with calling their `dispose()` method and with invoking the dispose-control handler. Also, disposable controls should mark their corresponding DOM elements as disposable, with October foundation API. Example:
 
-    +function ($) { "use strict";
-        var Base = $.oc.foundation.base,
-            BaseProto = Base.prototype
+```js
++function ($) { "use strict";
+    var Base = $.oc.foundation.base,
+        BaseProto = Base.prototype
 
-        var SomeDisposableControl = function(element) {
-            this.$el = $(element)
+    var SomeDisposableControl = function(element) {
+        this.$el = $(element)
 
-            $.oc.foundation.controlUtils.markDisposable(element)
-            Base.call(this)
-            this.init()
-        }
-
-        ...
-
-        SomeDisposableControl.prototype.init = function () {
-            this.$el.one('dispose-control', this.proxy(this.dispose))
-        }
-
-        SomeDisposableControl.prototype.dispose = function () {
-            this.$el.off('dispose-control', this.proxy(this.dispose))
-            this.$el = null
-            BaseProto.dispose.call(this)
-        }
+        $.oc.foundation.controlUtils.markDisposable(element)
+        Base.call(this)
+        this.init()
     }
 
+    ...
+
+    SomeDisposableControl.prototype.init = function () {
+        this.$el.one('dispose-control', this.proxy(this.dispose))
+    }
+
+    SomeDisposableControl.prototype.dispose = function () {
+        this.$el.off('dispose-control', this.proxy(this.dispose))
+        this.$el = null
+        BaseProto.dispose.call(this)
+    }
+}
+```
+
 `$.oc.foundation.controlUtils.markDisposable(element)` call in the constructor adds `data-disposable` attribute to the DOM element, allowing the framework to find all disposable elements in a container and dispose them by calling their dispose-control handler when it's required.
 
 ## Full example of a jQuery plugin that creates a disposable control
 
 We already have a boilerplate code for jQuery code. Disposable controls approach just extends it. Don't forget to remove the  data associated with controls from their DOM elements.
 
-    +function ($) { "use strict";
-        var Base = $.oc.foundation.base,
-            BaseProto = Base.prototype
+```js
++function ($) { "use strict";
+    var Base = $.oc.foundation.base,
+        BaseProto = Base.prototype
 
-        var SomeDisposableControl = function (element, options) {
-            this.$el = $(element)
-            this.options = options || {}
+    var SomeDisposableControl = function (element, options) {
+        this.$el = $(element)
+        this.options = options || {}
 
-            $.oc.foundation.controlUtils.markDisposable(element)
-            Base.call(this)
-            this.init()
-        }
+        $.oc.foundation.controlUtils.markDisposable(element)
+        Base.call(this)
+        this.init()
+    }
 
-        SomeDisposableControl.prototype = Object.create(BaseProto)
-        SomeDisposableControl.prototype.constructor = SomeDisposableControl
+    SomeDisposableControl.prototype = Object.create(BaseProto)
+    SomeDisposableControl.prototype.constructor = SomeDisposableControl
 
-        SomeDisposableControl.prototype.init = function() {
-            this.$el.on('click', this.proxy(this.onClick))
-            this.$el.one('dispose-control', this.proxy(this.dispose))
-        }
+    SomeDisposableControl.prototype.init = function() {
+        this.$el.on('click', this.proxy(this.onClick))
+        this.$el.one('dispose-control', this.proxy(this.dispose))
+    }
 
-        SomeDisposableControl.prototype.dispose = function() {
-            this.$el.off('click', this.proxy(this.onClick))
-            this.$el.off('dispose-control', this.proxy(this.dispose))
-            this.$el.removeData('oc.someDisposableControl')
+    SomeDisposableControl.prototype.dispose = function() {
+        this.$el.off('click', this.proxy(this.onClick))
+        this.$el.off('dispose-control', this.proxy(this.dispose))
+        this.$el.removeData('oc.someDisposableControl')
 
-            this.$el = null
+        this.$el = null
 
-            // In some cases options could contain callbacks, 
-            // so it's better to clean them up too.
-            this.options = null
+        // In some cases options could contain callbacks, 
+        // so it's better to clean them up too.
+        this.options = null
 
-            BaseProto.dispose.call(this)
-        }
+        BaseProto.dispose.call(this)
+    }
 
-        SomeDisposableControl.DEFAULTS = {
-            someParam: null
-        }
+    SomeDisposableControl.DEFAULTS = {
+        someParam: null
+    }
 
-        // PLUGIN DEFINITION
-        // ============================
+    // PLUGIN DEFINITION
+    // ============================
 
-        var old = $.fn.someDisposableControl
+    var old = $.fn.someDisposableControl
 
-        $.fn.someDisposableControl = function (option) {
-            var args = Array.prototype.slice.call(arguments, 1), items, result
+    $.fn.someDisposableControl = function (option) {
+        var args = Array.prototype.slice.call(arguments, 1), items, result
 
-            items = this.each(function () {
-                var $this   = $(this)
-                var data    = $this.data('oc.someDisposableControl')
-                var options = $.extend({}, SomeDisposableControl.DEFAULTS, $this.data(), typeof option == 'object' && option)
-                if (!data) $this.data('oc.someDisposableControl', (data = new SomeDisposableControl(this, options)))
-                if (typeof option == 'string') result = data[option].apply(data, args)
-                if (typeof result != 'undefined') return false
-            })
-
-            return result ? result : items
-        }
-
-        $.fn.someDisposableControl.Constructor = SomeDisposableControl
-
-        $.fn.someDisposableControl.noConflict = function () {
-            $.fn.someDisposableControl = old
-            return this
-        }
-
-        // Add this only if required
-        $(document).render(function (){
-            $('[data-some-disposable-control]').someDisposableControl()
+        items = this.each(function () {
+            var $this   = $(this)
+            var data    = $this.data('oc.someDisposableControl')
+            var options = $.extend({}, SomeDisposableControl.DEFAULTS, $this.data(), typeof option == 'object' && option)
+            if (!data) $this.data('oc.someDisposableControl', (data = new SomeDisposableControl(this, options)))
+            if (typeof option == 'string') result = data[option].apply(data, args)
+            if (typeof result != 'undefined') return false
         })
 
-    }(window.jQuery);
+        return result ? result : items
+    }
+
+    $.fn.someDisposableControl.Constructor = SomeDisposableControl
+
+    $.fn.someDisposableControl.noConflict = function () {
+        $.fn.someDisposableControl = old
+        return this
+    }
+
+    // Add this only if required
+    $(document).render(function (){
+        $('[data-some-disposable-control]').someDisposableControl()
+    })
+
+}(window.jQuery);
+```
\ No newline at end of file

From 6e1194784a5add80f5b936449b4bf82768b4dc31 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 08:10:25 +1000
Subject: [PATCH 058/103] Take some emphasis off the inactive main menu items
 NB: The "wizard" CMS icon doesn't seem to like font size 28px, but all other
 icons appear to render cleanly at this size.

---
 modules/backend/assets/css/october.css        |  2 ++
 .../backend/assets/less/layout/mainmenu.less  | 21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
index 61a8c574a..1c35abea2 100644
--- a/modules/backend/assets/css/october.css
+++ b/modules/backend/assets/css/october.css
@@ -656,6 +656,8 @@ nav#layout-mainmenu.navbar ul li a,nav#layout-mainmenu .menu-toggle,.mainmenu-co
 nav#layout-mainmenu.navbar ul li a:hover,nav#layout-mainmenu .menu-toggle:hover,.mainmenu-collapsed li a:hover{background-color:transparent !important}
 nav#layout-mainmenu.navbar ul li a:active,nav#layout-mainmenu .menu-toggle:active,.mainmenu-collapsed li a:active,nav#layout-mainmenu.navbar ul li a:focus,nav#layout-mainmenu .menu-toggle:focus,.mainmenu-collapsed li a:focus{text-decoration:none;color:#555555}
 nav#layout-mainmenu.navbar ul li a i,nav#layout-mainmenu .menu-toggle i,.mainmenu-collapsed li a i{line-height:1;font-size:35px;vertical-align:middle;margin-right:10px}
+nav#layout-mainmenu.navbar ul li a i{font-size:28px}
+nav#layout-mainmenu.navbar ul li.active a i{font-size:35px}
 .mainmenu-collapsed li a i{width:40px;text-align:left;display:inline-block}
 nav#layout-mainmenu.navbar ul li:hover a:active,.mainmenu-collapsed li:hover a:active,nav#layout-mainmenu.navbar ul li:hover a:focus,.mainmenu-collapsed li:hover a:focus{color:#ffffff !important}
 .touch .mainmenu-collapsed li a:hover{color:#555555}
diff --git a/modules/backend/assets/less/layout/mainmenu.less b/modules/backend/assets/less/layout/mainmenu.less
index 689ca95be..68ee9617e 100644
--- a/modules/backend/assets/less/layout/mainmenu.less
+++ b/modules/backend/assets/less/layout/mainmenu.less
@@ -83,7 +83,9 @@ nav#layout-mainmenu.navbar {
     .toolbar-item {
         padding-right: 0;
 
-        &:before, &:after { margin-top: 0; }
+        &:before, &:after {
+            margin-top: 0;
+        }
         &:before { left: -12px; }
         &:after { right: -12px; }
 
@@ -173,6 +175,15 @@ nav#layout-mainmenu .menu-toggle,
     }
 }
 
+nav#layout-mainmenu.navbar ul li {
+    a {
+        i { font-size: 28px; }
+    }
+    &.active a {
+        i { font-size: 35px; }
+    }
+}
+
 .mainmenu-collapsed li a i {
     width: 40px;
     text-align: left;
@@ -188,7 +199,9 @@ nav#layout-mainmenu.navbar ul li:hover,
     }
 }
 
-.touch .mainmenu-collapsed li a:hover {color: @color-mainmenu-inactive;}
+.touch .mainmenu-collapsed li a:hover {
+    color: @color-mainmenu-inactive;
+}
 
 nav#layout-mainmenu.navbar ul li,
 .mainmenu-collapsed li {
@@ -196,7 +209,9 @@ nav#layout-mainmenu.navbar ul li,
         color: @color-mainmenu-active !important;
         font-weight: 600;
 
-        a {color: @color-mainmenu-active !important;}
+        a {
+            color: @color-mainmenu-active !important;
+        }
     }
 
     &:hover {

From b4fdf27023b4d3f0329c7e4c9ea0778695ae8cf9 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 08:24:16 +1000
Subject: [PATCH 059/103] Tidy up popups docs

---
 modules/system/assets/ui/docs/popup.md | 71 ++++++++++++++++++++++----
 1 file changed, 62 insertions(+), 9 deletions(-)

diff --git a/modules/system/assets/ui/docs/popup.md b/modules/system/assets/ui/docs/popup.md
index 682a6b885..4c33c5549 100644
--- a/modules/system/assets/ui/docs/popup.md
+++ b/modules/system/assets/ui/docs/popup.md
@@ -1,13 +1,17 @@
 # Popups
 
-Displays a modal popup
+Displays a modal popup, based on the Bootstrap modal implementation.
 
-# Example
+- [Examples](#examples)
+- [Inline popups](#inline-popups)
+- [Remote popups](#remote-popups)
 
-    <!-- Basic Popup -->
-    <a data-toggle="modal" href="#content-basic" class="btn btn-primary btn-lg">Launch basic content</a>
+<a name="examples"></a>
+## Examples
 
-    <div class="control-popup modal fade" id="content-basic" tabindex="-1" role="dialog">
+    <a data-toggle="modal" href="#contentBasic" class="btn btn-primary btn-lg">Launch basic content</a>
+
+    <div class="control-popup modal fade" id="contentBasic" tabindex="-1" role="dialog">
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-body">
@@ -18,8 +22,6 @@ Displays a modal popup
         </div>
     </div>
 
-
-    <!-- Confirmation Popup -->
     <a data-toggle="modal" href="#content-confirmation" class="btn btn-primary btn-lg">Launch Confirmation dialog</a>
 
     <div class="control-popup modal fade" id="content-confirmation" tabindex="-1" role="dialog">
@@ -41,5 +43,56 @@ Displays a modal popup
         </div>
     </div>
 
-    <!-- Ajax Popup -->
-    <a data-control="popup" data-ajax="popup-content.htm" href="javascript:;" class="btn btn-primary btn-lg">Launch Ajax Form</a>
+<a name="inline-popups"></a>
+## Inline popups
+
+An inline popup places the popup content inside the current page, hidden from the view. For example, this container will not be visible on the page.
+
+```html
+<div class="control-popup modal fade" id="contentBasic">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body">
+                <button type="button" class="close" data-dismiss="modal">&times;</button>
+                <p>This is a very basic example of a popup...</p>
+            </div>
+        </div>
+    </div>
+</div>
+```
+
+Use the `data-toggle="modal"` HTML attribute to launch this container as a popup.
+
+```html
+<a data-toggle="modal" href="#contentBasic" class="btn btn-primary btn-lg">
+    Launch basic content
+</a>
+```
+
+<a name="remote-popups"></a>
+## Remote popups
+
+Content for the popup can be loaded remotely using an AJAX request. Use the `data-handler` attribute to populate a popup with the contents of an AJAX handler.
+
+```html
+<a
+    data-control="popup"
+    data-handler="onLoadContent"
+    href="javascript:;"
+    class="btn btn-primary btn-lg">
+    Launch Ajax Form
+</a>
+```
+
+Using the `data-ajax` attribute you can refer to an external file or URL directly.
+
+```html
+<a
+    data-control="popup"
+    data-ajax="popup-content.htm"
+    href="javascript:;"
+    class="btn btn-primary btn-lg">
+    Launch Ajax Form
+</a>
+```
+

From 9a54db74adecbd288bc83185cbf83f2aa28aab77 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 08:29:17 +1000
Subject: [PATCH 060/103] Move docs out of JS file

---
 .../backend/assets/js/october.simplelist.js   |  2 +-
 modules/system/assets/ui/docs/popup.md        | 25 +++++++++++++++++++
 modules/system/assets/ui/js/drag.sort.js      |  1 -
 modules/system/assets/ui/js/popup.js          | 19 +-------------
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/modules/backend/assets/js/october.simplelist.js b/modules/backend/assets/js/october.simplelist.js
index b26b2a377..f1158c7aa 100644
--- a/modules/backend/assets/js/october.simplelist.js
+++ b/modules/backend/assets/js/october.simplelist.js
@@ -7,7 +7,7 @@
  * JavaScript API:
  * $('#simplelist').simplelist()
  *
- * Dependences: 
+ * Dependences:
  * - Sortable (jquery-sortable.js)
  */
 +function ($) { "use strict";
diff --git a/modules/system/assets/ui/docs/popup.md b/modules/system/assets/ui/docs/popup.md
index 4c33c5549..9e3262b96 100644
--- a/modules/system/assets/ui/docs/popup.md
+++ b/modules/system/assets/ui/docs/popup.md
@@ -5,6 +5,7 @@ Displays a modal popup, based on the Bootstrap modal implementation.
 - [Examples](#examples)
 - [Inline popups](#inline-popups)
 - [Remote popups](#remote-popups)
+- [API documentation](#api-docs)
 
 <a name="examples"></a>
 ## Examples
@@ -96,3 +97,27 @@ Using the `data-ajax` attribute you can refer to an external file or URL directl
 </a>
 ```
 
+<a name="api-docs"></a>
+## API documentation
+
+### Options:
+- content: content HTML string or callback
+
+### Data attributes:
+- data-control="popup" - enables the ajax popup plugin
+- data-ajax="popup-content.htm" - ajax content to load
+- data-handler="onLoadContent" - October ajax request name
+- data-keyboard="false" - Allow popup to be closed with the keyboard
+- data-extra-data="file_id: 1" - October ajax request data
+- data-size="large" - Popup size, available sizes: giant, huge, large, small, tiny
+
+### JavaScript API:
+
+```js
+$('a#someLink').popup({ ajax: 'popup-content.htm' })
+$('a#someLink').popup({ handler: 'onLoadSomePopup' })
+$('a#someLink').popup({ handler: 'onLoadSomePopup', extraData: { id: 3 } })
+```
+
+### Dependences:
+- Bootstrap Modal (modal.js)
\ No newline at end of file
diff --git a/modules/system/assets/ui/js/drag.sort.js b/modules/system/assets/ui/js/drag.sort.js
index fc9df56ac..bc44d0a46 100644
--- a/modules/system/assets/ui/js/drag.sort.js
+++ b/modules/system/assets/ui/js/drag.sort.js
@@ -5,7 +5,6 @@
  * Sortable plugin.
  *
  * - Documentation: ../docs/drag-sort.md
- * - Note: Consider using october.simplelist.js with "is-sortable" class.
  */
 
  +function ($) { "use strict";
diff --git a/modules/system/assets/ui/js/popup.js b/modules/system/assets/ui/js/popup.js
index caa3e0fd3..4c0bddeae 100644
--- a/modules/system/assets/ui/js/popup.js
+++ b/modules/system/assets/ui/js/popup.js
@@ -4,24 +4,7 @@
 /*
  * Ajax Popup plugin
  *
- * Options:
- * - content: content HTML string or callback
- * 
- * Data attributes:
- * - data-control="popup" - enables the ajax popup plugin
- * - data-ajax="popup-content.htm" - ajax content to load
- * - data-handler="widget:pluginName" - October ajax request name
- * - data-keyboard="false" - Allow popup to be closed with the keyboard
- * - data-extra-data="file_id: 1" - October ajax request data
- * - data-size="large" - Popup size, available sizes: giant, huge, large, small, tiny
- *
- * JavaScript API:
- * $('a#someLink').popup({ ajax: 'popup-content.htm' })
- * $('a#someLink').popup({ handler: 'onLoadSomePopup' })
- * $('a#someLink').popup({ handler: 'onLoadSomePopup', extraData: { id: 3 } })
- *
- * Dependences:
- * - Bootstrap Modal (modal.js)
+ * - Documentation: ../docs/popup.md
  */
 
 +function ($) { "use strict";

From cf25f1caac7e09d7555969269c897f24225ce5ac Mon Sep 17 00:00:00 2001
From: Christopher Forsberg <christopher.forsberg@argroup.se>
Date: Wed, 23 Sep 2015 18:32:51 +0200
Subject: [PATCH 061/103] Added missing client.php to modules/system/lang/sv/.

Updates to Swedish translations of OctoberCMS * Added missing keys * Updated some translations that were incorrect
---
 modules/backend/lang/sv/lang.php  |  33 +++--
 modules/cms/lang/sv/lang.php      |  70 +++++++++-
 modules/system/lang/sv/client.php |  57 ++++++++
 modules/system/lang/sv/lang.php   | 221 +++++++++++++++++++-----------
 4 files changed, 288 insertions(+), 93 deletions(-)
 create mode 100644 modules/system/lang/sv/client.php

diff --git a/modules/backend/lang/sv/lang.php b/modules/backend/lang/sv/lang.php
index a58a6e13b..8fbbad678 100644
--- a/modules/backend/lang/sv/lang.php
+++ b/modules/backend/lang/sv/lang.php
@@ -2,7 +2,7 @@
 
 return [
     'auth' => [
-        'title' => 'Administrations område'
+        'title' => 'Administrationsområde'
     ],
     'field' => [
         'invalid_type' => 'Felaktig fälttyp använd :type.',
@@ -31,12 +31,12 @@ return [
         'login_placeholder' => 'användarnamn',
         'password_placeholder' => 'lösenord',
         'forgot_password' => "Glömt ditt lösenord?",
-        'enter_email' => "Ange din epost-adress",
+        'enter_email' => "Ange din e-postadress",
         'enter_login' => "Ange ditt användarnamn",
-        'email_placeholder' => "epost",
+        'email_placeholder' => "e-post",
         'enter_new_password' => "Välj ett nytt lösenord",
         'password_reset' => "Återställ lösenord",
-        'restore_success' => "Ett meddelande har sänts till din epost-adress med instruktioner om hur du återställer ditt lösenord",
+        'restore_success' => "Ett meddelande har sänts till din e-postadress med instruktioner om hur du återställer ditt lösenord",
         'restore_error' => "En användare med användarnamnet ':login' kunde ej hittas",
         'reset_success' => "Ditt lösenord har blivit återställt. Du kan nu logga in",
         'reset_error' => "Felaktig data för lösenordsåterställning. Var vänlig prova igen",
@@ -60,10 +60,10 @@ return [
         'columns' => '{1} column|[2,Inf] kolonner',
         'widget_new_row_label' => 'Forcera en ny rad',
         'widget_new_row_description' => 'Lägg widgeten på en ny rad.',
-        'widget_title_label' => 'Widget titel',
+        'widget_title_label' => 'Widget-titel',
         'widget_title_error' => 'En widgets titel är tvingande.',
         'status' => [
-            'widget_title_default' => 'System status',
+            'widget_title_default' => 'Systemstatus',
             'online' => 'online',
             'maintenance' => 'i underhåll',
             'update_available' => '{0} uppdateringar tillgängliga!|{1} uppdatering tillgänglig!|[2,Inf] uppdateringar tillgängliga!'
@@ -86,6 +86,7 @@ return [
         'password' => "Lösenord",
         'password_confirmation' => "Bekräfta lösenord",
         'permissions' => 'Rättigheter',
+        'account' => 'Konto',
         'superuser' => "Superanvändare",
         'superuser_comment' => "Markera denna checkbox för att ge denna person tillgång till alla områden",
         'send_invite' => 'Inbjudan är sänd via e-post',
@@ -107,6 +108,7 @@ return [
             'new' => 'Ny administratörsgrupp',
             'delete_confirm' => 'Vill du verkligen radera denna administratörgrupp?',
             'return' => 'Återgå till grupplistan',
+            'users_count' => 'Användare'
         ],
         'preferences' => [
             'not_authenticated' => 'Det finns ingen autentiserad användare att ladda eller spara inställningar för',
@@ -139,7 +141,13 @@ return [
         'attachment' => 'Bilaga',
         'help' => 'Lägg till en och beskriving för denna bilagan.',
         'title_label' => 'Titel',
-        'description_label' => 'Beskriving'
+        'description_label' => 'Beskriving',
+        'default_prompt' => 'Klicka på %s eller dra en fil hit för att ladda upp',
+        'attachment_url' => 'Bilage-URL',
+        'upload_file' => 'Ladda upp fil',
+        'upload_error' => 'Fel vid uppladdning',
+        'remove_confirm' => 'Är du säker?',
+        'remove_file' => 'Radera fil'
     ],
     'form' => [
         'create_title' => "Ny :name",
@@ -148,10 +156,10 @@ return [
         'create_success' => ':name är nu skapad',
         'update_success' => ':name har blivit uppdaterad',
         'delete_success' => ':name kunde ej raderas',
-        'missing_id' => "Record ID för formuläret har ej blivit specificerat",
+        'missing_id' => "Rad-ID för formuläret har ej blivit specificerat",
         'missing_model' => 'Formuläregenskapen som används i :class har ingen modell definierad',
         'missing_definition' => "Formuläregenskapen saknar ett fält för ':field'",
-        'not_found' => 'Record ID :id för formuläret kunde ej hittas',
+        'not_found' => 'Rad-ID :id för formuläret kunde ej hittas',
         'action_confirm' => 'Är du säker?',
         'create' => 'Skapa',
         'create_and_close' => 'Skapa och stäng',
@@ -176,11 +184,13 @@ return [
         'close' => 'Stäng',
         'confirm' => 'Bekräfta',
         'reload' => 'Ladda om',
+        'complete' => 'Slutför',
         'ok' => 'OK',
         'or' => 'eller',
         'confirm_tab_close' => 'Vill du verkligen stänga fliken? Ej sparade ändringar kommer gå förlorade',
         'behavior_not_ready' => 'Formuläregenskap har ej blivit initierad, kontrollera att du anropat initForm() i din controller',
         'preview_no_files_message' => 'Filen är inte uppladdad',
+        'preview_no_record_message' => 'Ingen rad är vald.',
         'select' => 'Välj',
         'select_all' => 'alla',
         'select_none' => 'ingen',
@@ -223,6 +233,10 @@ return [
         'unlink_name' => "Avlänka :name",
         'unlink_confirm' => "Är du säker?",
     ],
+    'reorder' => [
+        'default_title' => 'Ordna om rader',
+        'no_records' => 'Det finns inga rader att sortera.',
+    ],
     'model' => [
         'name' => "Modell",
         'not_found' => "Modellen ':class' med ID :id kunde ej hittas",
@@ -247,6 +261,7 @@ return [
         'code_folding' => 'Dölj kod',
         'word_wrap' => 'Radbryting',
         'highlight_active_line' => 'Markera aktiv rad',
+        'auto_closing' => 'Stäng taggar och specialtecken automatiskt',
         'show_invisibles' => 'Visa dolda tecken',
         'show_gutter' => 'Visa ränna',
         'theme' => 'Färgschema'
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
index 7bffd4500..c395219f5 100644
--- a/modules/cms/lang/sv/lang.php
+++ b/modules/cms/lang/sv/lang.php
@@ -38,8 +38,10 @@ return [
         'dir_name_label' => 'Katalognamn',
         'dir_name_create_label' => 'Destinationen för temakatalogen',
         'theme_label' => 'Tema',
+        'theme_title' => 'Teman',
         'activate_button' => 'Aktivera',
         'active_button' => 'Aktivera',
+        'customize_theme' => 'Anpassa tema',
         'customize_button' => 'Anpassa',
         'duplicate_button' => 'Duplicera',
         'duplicate_title' => 'Duplicera temat',
@@ -75,6 +77,7 @@ return [
         'dir_name_invalid' => 'Namn kan bara innehålla siffror, latinska bokstäver och följande symboler: _-',
         'dir_name_taken' => 'Den önskade temakatalogen finns redan.',
         'find_more_themes' => 'Hitta fler teman på OctoberCMS Theme Marketplace',
+        'saving' => 'Sparar tema...',
         'return' => 'Återvänd till temalistan',
     ],
     'maintenance' => [
@@ -227,6 +230,71 @@ return [
         'manage_pages' => 'Hantera sidor',
         'manage_layouts' => 'Hantera layouts',
         'manage_partials' => 'Hantera partials',
-        'manage_themes' => 'Hantera teman'
+        'manage_themes' => 'Hantera teman',
+        'manage_media' => 'Hantera media'
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Klicka på %s knappen för att hitta ett mediaföremål'
+    ],
+    'media' => [
+        'invalid_path' => "Felaktig filsökväg angiven: ':path'.",
+        'menu_label' => 'Media',
+        'upload' => 'Ladda upp',
+        'move' => 'Flytta',
+        'delete' => 'Radera',
+        'add_folder' => 'Ny mapp',
+        'search' => 'Sök',
+        'display' => 'Visa',
+        'filter_everything' => 'Allt',
+        'filter_images' => 'Bilder',
+        'filter_video' => 'Videor',
+        'filter_audio' => 'Ljud',
+        'filter_documents' => 'Dokument',
+        'library' => 'Bibliotek',
+        'folder_size_items' => 'föremål',
+        'size' => 'Storlek',
+        'title' => 'Titel',
+        'last_modified' => 'Senast ändrad',
+        'public_url' => 'Publik URL',
+        'click_here' => 'Klicka här',
+        'thumbnail_error' => 'Fel vid generering av thumbnail.',
+        'return_to_parent' => 'Återgå till mappens förälder',
+        'return_to_parent_label' => 'Upp ..',
+        'nothing_selected' => 'Inget är valt.',
+        'multiple_selected' => 'Flera föremål valda.',
+        'uploading_file_num' => 'Laddar upp :number fil(er)...',
+        'uploading_complete' => 'Uppladdning slutförd',
+        'order_by' => 'Ordna efter',
+        'search' => 'Sök',
+        'folder' => 'Mapp',
+        'no_files_found' => 'Inga filer kunde hittas baserat på din sökning.',
+        'delete_empty' => 'Vänligen välj föremål att radera.',
+        'delete_confirm' => 'Är du säker att du vill radera de valda föremålen?',
+        'error_renaming_file' => 'Fel vid namnbyte av föremålet.',
+        'new_folder_title' => 'Ny mapp',
+        'folder_name' => 'Mappnamn',
+        'error_creating_folder' => 'Fel vid skapande av mapp',
+        'folder_or_file_exist' => 'En mapp eller fil med det angivna namnet existerar redan.',
+        'move_empty' => 'Vänligen välj föremål att flytta.',
+        'move_popup_title' => 'Flytta filer eller mappar',
+        'move_destination' => 'Destinationsmapp',
+        'please_select_move_dest' => 'Vänligen välj en destinationsmapp.',
+        'move_dest_src_match' => 'Vänligen välj en annan destinationsmapp.',
+        'empty_library' => 'Mediabiblioteket är tomt. Ladda upp filer eller skapa mappar för att börja.',
+        'insert' => 'Infoga',
+        'crop_and_insert' => 'Beskär & infoga',
+        'select_single_image' => 'Vänligen välj en enskild bild.',
+        'selection_not_image' => 'Det valda föremålet är inte en bild.',
+        'restore' => 'Ångra alla ändringar',
+        'resize' => 'Anpassa storlek...',
+        'selection_mode_normal' => 'Normal',
+        'selection_mode_fixed_ratio' => 'Fast proportion',
+        'selection_mode_fixed_size' => 'Fast storlek',
+        'height' => 'Höjd',
+        'width' => 'Bredd',
+        'selection_mode' => 'Urvalsläge',
+        'resize_image' => 'Anpassa bildstorlek',
+        'image_size' => 'Bildstorlek:',
+        'selected_size' => 'Vald:'
     ]
 ];
diff --git a/modules/system/lang/sv/client.php b/modules/system/lang/sv/client.php
new file mode 100644
index 000000000..2a5f3f9b5
--- /dev/null
+++ b/modules/system/lang/sv/client.php
@@ -0,0 +1,57 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Client-side Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | These are messages made available to the client browser via JavaScript.
+    | To compile this file run: php artisan october:util compile lang
+    |
+    */
+
+    'markdowneditor' => [
+        'formatting' => 'Formatering',
+        'quote' => 'Citat',
+        'code' => 'Kod',
+        'header1' => 'Rubrik 1',
+        'header2' => 'Rubrik 2',
+        'header3' => 'Rubrik 3',
+        'header4' => 'Rubrik 4',
+        'header5' => 'Rubrik 5',
+        'header6' => 'Rubrik 6',
+        'bold' => 'Fet',
+        'italic' => 'Kursiv',
+        'unorderedlist' => 'Oordnad lista',
+        'orderedlist' => 'Ordnad lista',
+        'video' => 'Video',
+        'image' => 'Bild',
+        'link' => 'Länk',
+        'horizontalrule' => 'Infoga horisontiell linje',
+        'fullscreen' => 'Fullskärm',
+        'preview' => 'Förhandsgranska',
+    ],
+
+    'mediamanager' => [
+        'insert_link' => "Infoga medialänk",
+        'insert_image' => "Infoga bild",
+        'insert_video' => "Infoga video",
+        'insert_audio' => "Infoga ljud",
+        'invalid_file_empty_insert' => "Vänligen välj en fil att infoga till länken.",
+        'invalid_file_single_insert' => "Vänligen välj en enskild fil.",
+        'invalid_image_empty_insert' => "Vänligen välj bild(er) att infoga.",
+        'invalid_video_empty_insert' => "Vänligen välj en video att infoga.",
+        'invalid_audio_empty_insert' => "Vänligen välj en ljudfil att infoga.",
+    ],
+
+    'alert' => [
+        'confirm_button_text' => 'OK',
+        'cancel_button_text' => 'Avbryt',
+    ],
+
+];
+
+
+
diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php
index e1e047040..07ecf303f 100644
--- a/modules/system/lang/sv/lang.php
+++ b/modules/system/lang/sv/lang.php
@@ -7,25 +7,28 @@ return [
     ],
     'locale' => [
         'cs' => 'Czech',
-        'en' => 'English',
-        'de' => 'German',
-        'es' => 'Spanish',
-        'es-ar' => 'Spanish (Argentina)',
-        'fa' => 'Persian',
-        'fr' => 'French',
-        'hu' => 'Hungarian',
-        'id' => 'Bahasa Indonesia',
-        'it' => 'Italian',
-        'ja' => 'Japanese',
-        'nl' => 'Dutch',
-        'pl' => 'Polish',
-        'pt-br' => 'Brazilian Portuguese',
-        'ro' => 'Romanian',
-        'ru' => 'Russian',
-        'sv' => 'Swedish',
-        'sk' => 'Slovak (Slovakia)',
-        'tr' => 'Turkish',
-        'nb-no' => 'Norska (Bokmål)'
+        'en' => 'Engelska',
+        'de' => 'Tyska',
+        'es' => 'Spanska',
+        'es-ar' => 'Spanska (Argentina)',
+        'fa' => 'Persiska',
+        'fr' => 'Franska',
+        'hu' => 'Ungerska',
+        'id' => 'Indonesiska (Bahasa Indonesia)',
+        'it' => 'Italienska',
+        'ja' => 'Japanska',
+        'lv' => 'Latviska',
+        'nb-no' => 'Norska (Bokmål)',
+        'nl' => 'Holländska',
+        'pl' => 'Polska',
+        'pt-br' => 'Brasiliansk portugisiska',
+        'ro' => 'Rumänska',
+        'ru' => 'Ryska',
+        'se' => 'Svenska',
+        'sk' => 'Slovakiska (Slovakien)',
+        'tr' => 'Turkiska',
+        'zh-cn' => 'Kinesiska (Kina)',
+        'zh-tw' => 'Kinesiska (Taiwan)'
     ],
     'directory' => [
         'create_fail' => "Kunde inte skapa mapp: :name",
@@ -54,30 +57,54 @@ return [
             'my_settings' => 'Mina inställningar'
         ]
     ],
-    'plugin' => [
-        'unnamed' => 'Namnlöst plugin',
+    'theme' => [
+        'label' => 'Tema',
+        'unnamed' => 'Namnlöst tema',
         'name' => [
-            'label' => 'Plugin-namn',
-            'help' => 'Namnge pluginet efter dess unika kod. Exempelvis RainLab.Blog',
+            'label' => 'Temanamn',
+            'help' => 'Namnge temat med en unik kod. Till exempel, RainLab.Vanilla'
         ],
     ],
+    'themes' => [
+        'install' => 'Installerar teman',
+        'search' => 'sök efter teman att installera...',
+        'installed' => 'Installerade teman',
+        'no_themes' => 'Det finns inga teman installerade från marknadsplatsen.',
+        'recommended' => 'Rekommenderat',
+        'remove_confirm' => 'Är du säker på att du vill radera det här temat?'
+    ],
+    'plugin' => [
+        'unnamed' => 'Namnlöst tillägg',
+        'name' => [
+            'label' => 'Tilläggsnamn',
+            'help' => 'Namnge tillägget efter dess unika kod. Exempelvis RainLab.Blog',
+        ]
+        ],
     'plugins' => [
-        'manage' => 'Hantera pluginerna',
+        'manage' => 'Hantera tillägg',
         'enable_or_disable' => 'Aktivera eller inaktivera',
-        'enable_or_disable_title' => 'Aktivera eller inaktivera pluginerna',
+        'enable_or_disable_title' => 'Aktivera eller inaktivera tillägg',
+        'install' => 'Installera tillägg',
+        'install_products' => 'Installera produkter',
+        'search' => 'sök efter tillägg att installera...',
+        'installed' => 'Installerade tillägg',
+        'no_plugins' => 'Det finns inga tillägg installerade från marknadsplatsen.',
+        'recommended' => 'Rekommenderat',
         'remove' => 'Ta bort',
         'refresh' => 'Uppdatera',
         'disabled_label' => 'Avaktivera',
-        'disabled_help' => 'Pluginerna som är avaktiverade är igorerade av appliationen.',
-        'selected_amount' => 'Markerade plugins: :amount',
+        'disabled_help' => 'De avaktiverade tilläggen ignorerades av systemet.',
+        'frozen_label' => 'Frys uppdateringar',
+        'frozen_help' => 'Tillägg som är frusna kommer att ignoreras av uppdateringsprocessen.',
+        'selected_amount' => 'Markerade tillägg: :amount',
         'remove_confirm' => 'Är du säker?',
-        'remove_success' => 'Lyckades bort dessa plugins från systemet.',
+        'remove_success' => 'Tilläggen raderades.',
         'refresh_confirm' => 'Är du säker?',
-        'refresh_success' => 'Lyckades uppdatera dessa plugins från systemet.',
+        'refresh_success' => 'Tilläggen uppdaterades.',
         'disable_confirm' => 'Är du säker?',
-        'disable_success' => 'Lyckades avaktivera dessa plugins från systemet.',
-        'enable_success' => 'Lyckades aktivera dessa plugins.',
-        'unknown_plugin' => 'Pluginen har blivit borttagen från systemet.'
+        'disable_success' => 'Tilläggen avaktiverades.',
+        'enable_success' => 'Aktiverade tilläggen.',
+        'unknown_plugin' => 'Tillägget har raderats.'
     ],
     'project' => [
         'name' => 'Projekt',
@@ -88,10 +115,10 @@ return [
         'id' => [
             'label' => 'Projekt-ID',
             'help' => 'Hur du hittar ditt Projekt-ID',
-            'missing' => 'Var god välj ett Projekt-ID',
+            'missing' => 'Vänligen välj ett Projekt-ID',
         ],
         'detach_confirm' => 'Vill du verkligen avlänka detta projekt?',
-        'unbind_success' => 'Projektet har blivit avlänkat',
+        'unbind_success' => 'Projektet har avlänkats',
     ],
     'settings' => [
         'menu_label' => 'Inställningar',
@@ -102,15 +129,14 @@ return [
         'search' => 'Sök'
     ],
     'mail' => [
-        'log_file' => 'Logfiler',
-        'menu_label' => 'Epost-konfiguration',
-        'menu_description' => 'Hantera epost-inställningar',
+        'log_file' => 'Loggfiler',
+        'menu_label' => 'E-postkonfiguration',
+        'menu_description' => 'Hantera e-postinställningar',
         'general' => 'Generellt',
-        'method' => 'Email-metod',
+        'method' => 'E-postmetod',
         'sender_name' => 'Avsändarnamn',
-        'sender_email' => 'Avsändarens epost-adress',
+        'sender_email' => 'Avsändarens e-postadress',
         'php_mail' => 'PHP mail',
-        'sendmail' => 'Sendmail',
         'smtp' => 'SMTP',
         'smtp_address' => 'SMTP-adress',
         'smtp_authorization' => 'SMTP-autentisering krävs',
@@ -121,55 +147,65 @@ return [
         'smtp_ssl' => 'SSL-anslutning krävs',
         'sendmail' => 'Sendmail',
         'sendmail_path' => 'Sendmail-sökväg',
-        'sendmail_path_comment' => 'Var god ange sökvägen till sendmail',
+        'sendmail_path_comment' => 'Vänligen ange sökvägen till sendmail',
         'mailgun' => 'Mailgun',
         'mailgun_domain' => 'Mailgun domän',
         'mailgun_domain_comment' => 'Vänligen ange Mailgun domännamnet.',
         'mailgun_secret' => 'Mailgun hemlighet',
-        'mailgun_secret_comment' => 'Ange din Mailgun API nyckel.',
+        'mailgun_secret_comment' => 'Ange din Mailgun API-nyckel.',
         'mandrill' => 'Mandrill',
         'mandrill_secret' => 'Mandrill hemlighet',
-        'mandrill_secret_comment' => 'Ange din API nyckel.'
+        'mandrill_secret_comment' => 'Ange din API-nyckel.',
+        'drivers_hint_header' => 'Drivrutiner är inte installerade',
+        'drivers_hint_content' => 'Den här e-postmetoden kräver att tillägget ":plugin" är installerat innan du kan skicka e-post.'
     ],
     'mail_templates' => [
-        'menu_label' => 'Epost mall',
-        'menu_description' => 'Ändra epost-mallar som skickas till användare och administratörer, hantera epost-utseende.',
+        'menu_label' => 'E-postmall',
+        'menu_description' => 'Ändra e-postmallar som skickas till användare och administratörer, hantera e-postlayouter.',
         'new_template' => 'Ny mall',
-        'new_layout' => 'Ny utseende',
+        'new_layout' => 'Ny layout',
         'template' => 'Mall',
         'templates' => 'Mallar',
-        'menu_layouts_label' => 'Epost mallar',
-        'layout' => 'Utseende',
-        'layouts' => 'Utseenden',
+        'menu_layouts_label' => 'E-postmallar',
+        'layout' => 'Layout',
+        'layouts' => 'Layouter',
+        'no_layout' => '-- ingen layout --',
         'name' => 'Namn',
         'name_comment' => 'Unikt namn för att hänvisa till den här mallen',
         'code' => 'Kod',
         'code_comment' => 'Unik kod som används för att hänvisa till den här mallen',
-        'subject' => 'Ärende',
-        'subject_comment' => 'Ärende till epost meddelandet',
+        'subject' => 'Ämne',
+        'subject_comment' => 'Mailets ämne',
         'description' => 'Beskrivning',
         'content_html' => 'HTML',
         'content_css' => 'CSS',
-        'content_text' => 'Klartext',
+        'content_text' => 'Text',
         'test_send' => 'Skicka ett testmeddelande',
         'test_success' => 'Testmeddelandet har skickats.',
-        'return' => 'Återvänd till mall-listan'
+        'return' => 'Återvänd till mallistan',
+        'test_confirm' => 'Ett testmeddelande kommer skickas till :email. Fortsätt?',
+        'saving' => 'Sparar mall...',
+        'sending' => 'Skickar testmeddelande...',
     ],
     'install' => [
         'project_label' => 'Länka till Projekt',
-        'plugin_label' => 'Installera Plugin',
-        'missing_plugin_name' => 'Välj ett plugin-namn att installera',
+        'plugin_label' => 'Installera tillägg',
+        'theme_label' => 'Installera tema',
+        'missing_plugin_name' => 'Välj ett tilläggsnamn att installera',
+        'missing_theme_name' => 'Vänligen specificera ett tema att installera.',
         'install_completing' => 'Installationen är klar',
-        'install_success' => 'Pluginet har installerats',
+        'install_success' => 'Tillägget har installerats',
     ],
     'updates' => [
         'title' => 'Hantera uppdateringar',
-        'name' => 'Uppdatera mjukvara',
+        'name' => 'Uppdatera systemet',
         'menu_label' => 'Uppdateringar',
-        'menu_description' => 'Uppdatera systemet, hantera och installera plugins och teman.',
+        'menu_description' => 'Uppdatera systemet, hantera och installera tillägg och teman.',
+        'return_link' => 'Återgå till systemuppdateringar',
         'check_label' => 'Sök efter uppdateringar',
         'retry_label' => 'Försök igen',
         'plugin_name' => 'Namn',
+        'plugin_code' => 'Kod',
         'plugin_description' => 'Beskrivning',
         'plugin_version' => 'Version',
         'plugin_author' => 'Skapare',
@@ -178,15 +214,17 @@ return [
         'core_build_help' => 'Senaste build är tillgänglig.',
         'core_downloading' => 'Laddar ner applikationsfiler',
         'core_extracting' => 'Packar upp applikationsfiler',
-        'plugins' => 'Plugins',
+        'plugins' => 'Tillägg',
+        'themes' => 'Teman',
         'disabled' => 'Avaktiverade',
-        'plugin_downloading' => 'Laddar ner plugin: :name',
-        'plugin_extracting' => 'Packar upp plugin: :name',
-        'plugin_version_none' => 'Nytt plugin',
+        'plugin_downloading' => 'Laddar ner tillägg: :name',
+        'plugin_extracting' => 'Packar upp tillägg: :name',
+        'plugin_version_none' => 'Nytt tillägg',
+        'plugin_current_version' => 'Nuvarande version',
         'theme_new_install' => 'Installation av nytt tema.',
         'theme_downloading' => 'Ladda ner temat: :name',
         'theme_extracting' => 'Packar upp temat: :name',
-        'update_label' => 'Updatera mjukvara',
+        'update_label' => 'Uppdatera systemet',
         'update_completing' => 'Slutför uppdatering',
         'update_loading' => 'Laddar tillgängliga uppdateringar...',
         'update_success' => 'Uppdateringen är slutförd.',
@@ -194,12 +232,29 @@ return [
         'force_label' => 'Tvinga uppdatering',
         'found' => [
             'label' => 'Hittade nya uppdateringar!',
-            'help' => 'Klicka på Updatera mjukvara för att påbörja processen.'
+            'help' => 'Klicka på Uppdatera systemet för att påbörja processen.'
         ],
         'none' => [
             'label' => 'Inga uppdateringar',
             'help' => 'Inga nya uppdateringar hittades.'
-        ]
+    ],
+        'important_action' => [
+            'empty' => 'Välj åtgärd',
+            'confirm' => 'Bekräfta uppdatering',
+            'skip' => 'Hoppa över detta tillägg (en gång)',
+            'ignore' => 'Hoppa över detta tillägg (alltid)',
+        ],
+        'important_action_required' => 'Åtgärd krävs',
+        'important_view_guide' => 'Visa uppgraderingsguide',
+        'important_alert_text' => 'Några uppdateringar behöver din uppmärksamhet.',
+        'details_title' => 'Tilläggsdetaljer',
+        'details_view_homepage' => 'Visa hemsida',
+        'details_readme' => 'Dokumentation',
+        'details_readme_missing' => 'Det finns ingen dokumentation tillgänglig.',
+        'details_upgrades' => 'Uppgraderingsguide',
+        'details_upgrades_missing' => 'Det finns inga uppgraderingsinstruktioner tillgängliga.',
+        'details_current_version' => 'Nuvarande version',
+        'details_author' => 'Författare',
     ],
     'server' => [
         'connect_error' => 'Ett fel uppstod vid anslutning till servern.',
@@ -210,10 +265,10 @@ return [
         'file_corrupt' => 'Filen från servern är korrupt.',
     ],
     'behavior' => [
-        'missing_property' => 'Klassen :class måste definera egenskapen $:property som används av :behavior -egenskapen',
+        'missing_property' => 'Klassen :class måste definiera egenskapen $:property som används av :behavior -egenskapen',
     ],
     'config' => [
-        'not_found' => 'Kunde inte hitta konfigurationsfilen :file definerad för :location',
+        'not_found' => 'Kunde inte hitta konfigurationsfilen :file definierad för :location',
         'required' => 'Konfigurationen som används i :location måste sända med ett värde :property',
     ],
     'zip' => [
@@ -221,42 +276,42 @@ return [
     ],
     'event_log' => [
         'hint' => 'Denna logg visar en lista över potentiella fel som uppstår i applikationen, såsom undantag och felsökningsinformation.',
-        'menu_label' => 'Händelselog',
+        'menu_label' => 'Händelselogg',
         'menu_description' => 'Visa systemloggmeddelanden med respektive tid och detaljer.',
         'empty_link' => 'Töm händelseloggen',
         'empty_loading' => 'Tömmer händelselogg...',
         'empty_success' => 'Lyckades tömma händelseloggen.',
         'return_link' => 'Återvänd till händelseloggen',
         'id' => 'ID',
-        'id_label' => 'Händelse ID',
+        'id_label' => 'Händelse-ID',
         'created_at' => 'Datum och tid',
         'message' => 'Meddelande',
         'level' => 'Nivå'
     ],
     'request_log' => [
-        'hint' => 'Denna loggen visar en lista med förfrågningar från webbläsare som kan kräva uppmärksamhet. Till exempel, om en besökare öppnar en CMS sida som inte kan hittas så skapas en post med statuskoden 404.',
-        'menu_label' => 'Förgrådan-logg',
-        'menu_description' => 'Visa otillåtna eller omdirigerade förgrågningar, så som Sidan kunde inte hittas (404).',
-        'empty_link' => 'Töm förfrågningan-loggen',
-        'empty_loading' => 'Tömmer förfrågningan-loggen...',
-        'empty_success' => 'Lyckades tömma förfrågningan-loggen.',
-        'return_link' => 'Återvänd till förfrågningan-loggen',
+        'hint' => 'Denna loggen visar en lista med förfrågningar från webbläsare som kan kräva uppmärksamhet. Till exempel, om en besökare öppnar en CMS sida som inte kan hittas, så skapas en post med statuskoden 404.',
+        'menu_label' => 'Förfrågningslogg',
+        'menu_description' => 'Visa otillåtna eller omdirigerade förfrågningar, så som Sidan kunde inte hittas (404).',
+        'empty_link' => 'Töm förfrågningsloggen',
+        'empty_loading' => 'Tömmer förfrågningsloggen...',
+        'empty_success' => 'Lyckades tömma förfrågningsloggen.',
+        'return_link' => 'Återvänd till förfrågningsloggen',
         'id' => 'ID',
-        'id_label' => 'Log ID',
+        'id_label' => 'Logg-ID',
         'count' => 'Räknare',
-        'referer' => 'Refererare',
+        'referer' => 'Hänvisning',
         'url' => 'URL',
         'status_code' => 'Status'
     ],
     'permissions' => [
         'name' => 'System',
         'manage_system_settings' => 'Hantera system inställningar',
-        'manage_software_updates' => 'Hantera mjukvaruuppdateringar',
+        'manage_software_updates' => 'Hantera systemuppdateringar',
         'access_logs' => 'Visa system loggen',
-        'manage_mail_templates' => 'Hantera epost-mallar',
-        'manage_mail_settings' => 'Hantera epost inställningar',
+        'manage_mail_templates' => 'Hantera e-postmallar',
+        'manage_mail_settings' => 'Hantera e-postinställningar',
         'manage_other_administrators' => 'Hantera andra administratörer',
-        'view_the_dashboard' => 'Visa the kontrollpanelen',
-        'manage_branding' => 'Anpassa back-end'
+        'view_the_dashboard' => 'Visa kontrollpanelen',
+        'manage_branding' => 'Anpassa backend'
     ]
 ];

From 8d11fe125745227704d82b70638902a7ac3899ff Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 08:51:13 +1000
Subject: [PATCH 062/103] Minor touch up to #1462

---
 modules/cms/classes/MediaLibraryItem.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index 9bbee80a8..a0a6dd72b 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -1,9 +1,10 @@
 <?php namespace Cms\Classes;
 
+use App;
 use File;
 use Config;
-use IntlDateFormatter;
 use Backend\Models\UserPreferences;
+use IntlDateFormatter;
 
 /**
  * Represents a file or folder in the Media Library.
@@ -140,7 +141,7 @@ class MediaLibraryItem
         }
 
         return IntlDateFormatter::create(
-            UserPreferences::forUser()->get('backend::backend.preferences')['locale'],
+            App::getLocale(),
             IntlDateFormatter::MEDIUM,
             IntlDateFormatter::NONE
         )->format($date);

From cac8b54e874da9bdc368c1c6d9f28efd685f8a18 Mon Sep 17 00:00:00 2001
From: Dave Shoreman <code@dsdev.io>
Date: Thu, 24 Sep 2015 12:04:26 +0100
Subject: [PATCH 063/103] Remove superuser field for non-superusers

If an admin user has permission to manage other users, they are
able to set others as superuser, or even create their own
superuser account. That's not really what we want.
---
 modules/backend/controllers/Users.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/modules/backend/controllers/Users.php b/modules/backend/controllers/Users.php
index b7cd8d5a7..0caea82b7 100644
--- a/modules/backend/controllers/Users.php
+++ b/modules/backend/controllers/Users.php
@@ -94,6 +94,10 @@ class Users extends Controller
             return;
         }
 
+        if (!$this->user->isSuperUser()) {
+            $form->removeField('permissions[superuser]');
+        }
+
         /*
          * Add permissions tab
          */

From a636dd1ad8b6c791067e4e7f55afd57ccca3c60a Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 11:41:02 +1000
Subject: [PATCH 064/103] Form widgets returns data only if it has a field
 definition

---
 modules/backend/widgets/Form.php | 62 ++++++++++----------------------
 1 file changed, 18 insertions(+), 44 deletions(-)

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 6c1a70eb4..a07e6d870 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -832,28 +832,35 @@ class Form extends WidgetBase
      */
     public function getSaveData()
     {
-        $data = ($this->arrayName) ? post($this->arrayName) : post();
+        $result = [];
 
+        /*
+         * Source data
+         */
+        $data = $this->arrayName ? post($this->arrayName) : post();
         if (!$data) {
             $data = [];
         }
 
         /*
-         * Number fields should be converted to integers
+         * Spin over each field and extract the postback value
          */
         foreach ($this->allFields as $field) {
-            if ($field->type != 'number') {
-                continue;
-            }
-
             /*
              * Handle HTML array, eg: item[key][another]
              */
             $parts = HtmlHelper::nameToArray($field->fieldName);
             $dotted = implode('.', $parts);
             if (($value = array_get($data, $dotted)) !== null) {
-                $value = !strlen(trim($value)) ? null : (float) $value;
-                array_set($data, $dotted, $value);
+
+                /*
+                 * Number fields should be converted to integers
+                 */
+                if ($field->type == 'number') {
+                    $value = !strlen(trim($value)) ? null : (float) $value;
+                }
+
+                array_set($result, $dotted, $value);
             }
         }
 
@@ -864,44 +871,11 @@ class Form extends WidgetBase
             $parts = HtmlHelper::nameToArray($field);
             $dotted = implode('.', $parts);
 
-            $widgetValue = $widget->getSaveValue(array_get($data, $dotted));
-
-            array_set($data, $dotted, $widgetValue);
+            $widgetValue = $widget->getSaveValue(array_get($result, $dotted));
+            array_set($result, $dotted, $widgetValue);
         }
 
-        /*
-         * Handle fields that differ by fieldName and valueFrom
-         * @todo @deprecated / Not needed? Remove if year >= 2016
-         */
-        // $remappedFields = [];
-        // foreach ($this->allFields as $field) {
-        //     if ($field->fieldName == $field->valueFrom) {
-        //         continue;
-        //     }
-
-        //     /*
-        //      * Get the value, remove it from the data collection
-        //      */
-        //     $parts = HtmlHelper::nameToArray($field->fieldName);
-        //     $dotted = implode('.', $parts);
-        //     $value = array_get($data, $dotted);
-        //     array_forget($data, $dotted);
-
-        //     /*
-        //      * Set the new value to the data collection
-        //      */
-        //     $parts = HtmlHelper::nameToArray($field->valueFrom);
-        //     $dotted = implode('.', $parts);
-        //     array_set($remappedFields, $dotted, $value);
-        // }
-
-        // if (count($remappedFields) > 0) {
-        //     $data = array_merge($remappedFields, $data);
-        //     // Could be useful one day for field name collisions
-        //     // $data['X_OCTOBER_REMAPPED_FIELDS'] = $remappedFields;
-        // }
-
-        return $data;
+        return $result;
     }
 
     /*

From 0a31869525ab5c1b87b2b93535fdd53940e153cf Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 12:46:53 +1000
Subject: [PATCH 065/103] Render API code examples as inline

---
 .../system/assets/ui/docs/input-trigger.md    | 31 ++++++++++++-------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/modules/system/assets/ui/docs/input-trigger.md b/modules/system/assets/ui/docs/input-trigger.md
index d3fe5a856..62b5eb7b0 100644
--- a/modules/system/assets/ui/docs/input-trigger.md
+++ b/modules/system/assets/ui/docs/input-trigger.md
@@ -21,6 +21,7 @@ The API allows to change elements' visibility or status (enabled/disabled) basin
             type="text"
             id="triggerTxt1"
             value=""
+            onkeyup="$(this).trigger('change')"
             placeholder="Enter 'foo' or 'bar' here"
             class="form-control" />
     </p>
@@ -49,18 +50,24 @@ The API allows to change elements' visibility or status (enabled/disabled) basin
 
 Example code:
 
-    <input type="button" class="btn disabled"
-        data-trigger-action="enable"
-        data-trigger="#cblist input[type=checkbox]"
-        data-trigger-condition="checked" ... >
+```html
+<input type="button" class="btn disabled"
+    data-trigger-action="enable"
+    data-trigger="#cblist input[type=checkbox]"
+    data-trigger-condition="checked" ... >
+```
 
 Multiple actions are supported:
 
-    data-trigger-action="hide|empty"
+```html
+data-trigger-action="hide|empty"
+```
 
 Multie value conditions are supported:
 
-    data-trigger-condition="value[foo][bar]"
+```html
+data-trigger-condition="value[foo][bar]"
+```
 
 ### Supported events:
 
@@ -69,8 +76,10 @@ Multie value conditions are supported:
 
 ### JavaScript API:
 
-    $('#mybutton').triggerOn({
-        triggerCondition: 'checked',
-        trigger: '#cblist input[type=checkbox]',
-        triggerAction: 'enable' 
-    })
+```html
+$('#mybutton').triggerOn({
+    triggerCondition: 'checked',
+    trigger: '#cblist input[type=checkbox]',
+    triggerAction: 'enable' 
+})
+```
\ No newline at end of file

From de8bd67f0d1e73ba2844672b8258568e4ab9a98c Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 26 Sep 2015 14:15:49 +1000
Subject: [PATCH 066/103] Defauilt input.preset uses "slug" as default, as per
 docs

---
 modules/system/assets/ui/js/input.preset.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/system/assets/ui/js/input.preset.js b/modules/system/assets/ui/js/input.preset.js
index 64d43284a..59a89e83f 100644
--- a/modules/system/assets/ui/js/input.preset.js
+++ b/modules/system/assets/ui/js/input.preset.js
@@ -236,21 +236,23 @@
             return this.formatNamespace()
         }
 
-        if (this.options.inputPresetType == 'camel')
+        if (this.options.inputPresetType == 'camel') {
             var value = toCamel(this.$src.val())
+        }
         else {
             var value = slugify(this.$src.val())
         }
 
-        if (this.options.inputPresetType == 'url')
+        if (this.options.inputPresetType == 'url') {
             value = '/' + value
+        }
 
         return value.replace(/\s/gi, "-")
     }
 
     InputPreset.DEFAULTS = {
         inputPreset: '',
-        inputPresetType: 'file',
+        inputPresetType: 'slug',
         inputPresetClosestParent: undefined,
         inputPresetPrefixInput: undefined
     }

From 60facd2741847906b4785388455aa351a031ab16 Mon Sep 17 00:00:00 2001
From: flynsarmy <flynsarmy@gmail.com>
Date: Sat, 26 Sep 2015 18:12:13 +1000
Subject: [PATCH 067/103] Use correct folder permissions in ThemeImport/Export

---
 modules/cms/models/ThemeExport.php | 6 +++---
 modules/cms/models/ThemeImport.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/cms/models/ThemeExport.php b/modules/cms/models/ThemeExport.php
index dc9247f25..bd6fa5c79 100644
--- a/modules/cms/models/ThemeExport.php
+++ b/modules/cms/models/ThemeExport.php
@@ -86,10 +86,10 @@ class ThemeExport extends Model
             $zipName = uniqid('oc');
             $zipPath = temp_path().'/'.$zipName;
 
-            if (!@mkdir($tempPath))
+            if (!File::makeDirectory($tempPath))
                 throw new ApplicationException('Unable to create directory '.$tempPath);
 
-            if (!@mkdir($metaPath = $tempPath . '/meta'))
+            if (!File::makeDirectory($metaPath = $tempPath . '/meta'))
                 throw new ApplicationException('Unable to create directory '.$metaPath);
 
             File::copy($themePath.'/theme.yaml', $tempPath.'/theme.yaml');
@@ -133,7 +133,7 @@ class ThemeExport extends Model
         $headers = Response::download($zipPath, $outputName)->headers->all();
         $result = Response::make(File::get($zipPath), 200, $headers);
 
-        @unlink($zipPath);
+        @File::delete($zipPath);
 
         return $result;
     }
diff --git a/modules/cms/models/ThemeImport.php b/modules/cms/models/ThemeImport.php
index 5e9fa034f..59e78fe04 100644
--- a/modules/cms/models/ThemeImport.php
+++ b/modules/cms/models/ThemeImport.php
@@ -101,7 +101,7 @@ class ThemeImport extends Model
 
             File::put($zipPath, $file->getContents());
 
-            if (!@mkdir($tempPath))
+            if (!File::makeDirectory($tempPath))
                 throw new ApplicationException('Unable to create directory '.$tempPath);
 
             Zip::extract($zipPath, $tempPath);

From 5396525f2feb948848e2440e5f48b5f19ec65fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20Gerg=C5=91?= <gergo85@gmail.com>
Date: Sat, 26 Sep 2015 12:03:35 +0200
Subject: [PATCH 068/103] Update the Hungarian language

---
 modules/system/lang/hu/lang.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php
index acabc24b2..4814396ff 100644
--- a/modules/system/lang/hu/lang.php
+++ b/modules/system/lang/hu/lang.php
@@ -6,8 +6,8 @@ return [
         'tagline' => 'Visszatérés az alapokhoz'
     ],
     'locale' => [
-        'cs' => 'Cseh',
         'en' => 'Angol',
+        'cs' => 'Cseh',
         'de' => 'Német',
         'el' => 'Görög',
         'es' => 'Spanyol',
@@ -147,6 +147,10 @@ return [
         'smtp_password' => 'Jelszó',
         'smtp_port' => 'SMTP port',
         'smtp_ssl' => 'SSL kapcsolat szükséges',
+        'smtp_encryption' => 'SMTP titkosítás típusa',
+        'smtp_encryption_none' => 'Nincs',
+        'smtp_encryption_tls' => 'TLS',
+        'smtp_encryption_ssl' => 'SSL',
         'sendmail' => 'Sendmail',
         'sendmail_path' => 'Sendmail elérési útja',
         'sendmail_path_comment' => 'Adja meg a Sendmail program elérési útját.',
@@ -285,7 +289,7 @@ return [
         'empty_success' => 'Az eseménynapló kiürítése sikerült.',
         'return_link' => 'Vissza az eseménynapló listához',
         'id' => 'Azonosító',
-        'id_label' => 'Esemény azonosító',
+        'id_label' => 'Esemény azonosítója',
         'created_at' => 'Időpont',
         'message' => 'Üzenet',
         'level' => 'Szint'
@@ -309,10 +313,12 @@ return [
         'name' => 'Rendszer',
         'manage_system_settings' => 'Rendszer beállítások kezelése',
         'manage_software_updates' => 'Szoftver frissítések kezelése',
-        'access_logs' => 'Rendszer napló megtekintése',
+        'access_logs' => 'Rendszer naplók megtekintése',
         'manage_mail_templates' => 'Levél sablonok kezelése',
         'manage_mail_settings' => 'Levelezési beállítások kezelése',
-        'manage_other_administrators' => 'Másik adminisztrátor kezelése',
+        'manage_other_administrators' => 'Adminisztrátorok kezelése',
+        'manage_preferences' => 'Beállítások menü kezelése',
+        'manage_editor' => 'Kódszerkesztő testreszabása',
         'view_the_dashboard' => 'Vezérlőpult megtekintése',
         'manage_branding' => 'Admin felület testreszabása'
     ]

From b28e5ed9a034b86ebf8a421e9fd3f5815d926792 Mon Sep 17 00:00:00 2001
From: Marco Tesche <marco@tesche.biz>
Date: Sat, 26 Sep 2015 19:49:35 +0200
Subject: [PATCH 069/103] German translation for client.php (system module)

---
 modules/system/lang/de/client.php | 57 +++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 modules/system/lang/de/client.php

diff --git a/modules/system/lang/de/client.php b/modules/system/lang/de/client.php
new file mode 100644
index 000000000..85f8ff66f
--- /dev/null
+++ b/modules/system/lang/de/client.php
@@ -0,0 +1,57 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Client-side Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | These are messages made available to the client browser via JavaScript.
+    | To compile this file run: php artisan october:util compile lang
+    |
+    */
+
+    'markdowneditor' => [
+        'formatting' => 'Formatierung',
+        'quote' => 'Zitat',
+        'code' => 'Code',
+        'header1' => 'Überschrift 1',
+        'header2' => 'Überschrift 2',
+        'header3' => 'Überschrift 3',
+        'header4' => 'Überschrift 4',
+        'header5' => 'Überschrift 5',
+        'header6' => 'Überschrift 6',
+        'bold' => 'Fett',
+        'italic' => 'Kursiv',
+        'unorderedlist' => 'Normale Liste',
+        'orderedlist' => 'Nummerierte Liste',
+        'video' => 'Video',
+        'image' => 'Bild',
+        'link' => 'Link',
+        'horizontalrule' => 'Horizontale Linie',
+        'fullscreen' => 'Vollbild',
+        'preview' => 'Vorschau',
+    ],
+
+    'mediamanager' => [
+        'insert_link' => "Link aus Medienbibliothek",
+        'insert_image' => "Bild aus Medienbibliothek",
+        'insert_video' => "Video aus Medienbibliothek",
+        'insert_audio' => "Audio aus Medienbibliothek",
+        'invalid_file_empty_insert' => "Bitte Datei auswählen.",
+        'invalid_file_single_insert' => "Bitte nur eine Datei wählen.",
+        'invalid_image_empty_insert' => "Bitte ein Bild auswählen.",
+        'invalid_video_empty_insert' => "Bitte ein Video auswählen.",
+        'invalid_audio_empty_insert' => "Bitte eine Audiodatei auswählen.",
+    ],
+
+    'alert' => [
+        'confirm_button_text' => 'OK',
+        'cancel_button_text' => 'Abbrechen',
+    ],
+
+];
+
+
+

From 676a4d00bc7927daf9c896b14e3f84d9d519adc1 Mon Sep 17 00:00:00 2001
From: Mulia Arifandi Nasution <mul14.net@gmail.com>
Date: Sun, 27 Sep 2015 02:28:12 +0700
Subject: [PATCH 070/103] Minimum password length should be 4 characters

Because the minimum password length on User model is 4
https://github.com/octobercms/october/blob/master/modules/backend/models/User.php#L26-L27
---
 modules/backend/controllers/Auth.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/backend/controllers/Auth.php b/modules/backend/controllers/Auth.php
index 6c1c37e93..787e4a062 100644
--- a/modules/backend/controllers/Auth.php
+++ b/modules/backend/controllers/Auth.php
@@ -64,7 +64,7 @@ class Auth extends Controller
     {
         $rules = [
             'login'    => 'required|min:2|max:32',
-            'password' => 'required|min:2'
+            'password' => 'required|min:4'
         ];
 
         $validation = Validator::make(post(), $rules);
@@ -96,7 +96,7 @@ class Auth extends Controller
         BackendAuth::logout();
         return Backend::redirect('backend');
     }
-    
+
     /**
      * Request a password reset verification code.
      */
@@ -176,7 +176,7 @@ class Auth extends Controller
         }
 
         $rules = [
-            'password' => 'required|min:2'
+            'password' => 'required|min:4'
         ];
 
         $validation = Validator::make(post(), $rules);

From 17bdf010dcd3a41526199cf9e241172b8fb65153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szab=C3=B3=20Gerg=C5=91?= <gergo85@gmail.com>
Date: Sun, 27 Sep 2015 11:13:39 +0200
Subject: [PATCH 071/103] Minor changes

---
 modules/system/lang/hu/lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php
index 4814396ff..730f5ff5d 100644
--- a/modules/system/lang/hu/lang.php
+++ b/modules/system/lang/hu/lang.php
@@ -101,9 +101,9 @@ return [
         'selected_amount' => 'Kijelölt bővítmények: :amount',
         'remove_confirm' => 'Valóban törölni akarja a kijelölt bővítményeket?',
         'remove_success' => 'A bővítmények sikeresen eltávolításra kerültek.',
-        'refresh_confirm' => 'Valóban frissíteni akarja a kijelölt bővítményeket?',
+        'refresh_confirm' => 'Biztos benne?',
         'refresh_success' => 'A bővítmények sikeresen frissítésre kerültek.',
-        'disable_confirm' => 'Valóban tiltani akarja a kijelölt bővítményeket?',
+        'disable_confirm' => 'Biztos benne?',
         'disable_success' => 'A bővítmények sikeresen letiltásra kerültek.',
         'enable_success' => 'A bővítmények sikeresen engedélyezésre kerültek.',
         'unknown_plugin' => 'A bővítmények eltávolítása megtörtént.'

From d4ce89e9baa974a632ecc277a1c9791892696b79 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Mon, 28 Sep 2015 10:12:06 +1000
Subject: [PATCH 072/103] Fixes relation render onclick in list view to obey
 $model->primaryKey value Fixes #1454

---
 modules/backend/behaviors/RelationController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 9b23b589d..20006f29e 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -555,7 +555,8 @@ class RelationController extends ControllerBehavior
             $config->recordUrl = $this->getConfig('view[recordUrl]', null);
 
             $defaultOnClick = sprintf(
-                "$.oc.relationBehavior.clickViewListRecord(':id', '%s', '%s')",
+                "$.oc.relationBehavior.clickViewListRecord(':%s', '%s', '%s')",
+                $this->relationModel->getKeyName(),
                 $this->field,
                 $this->relationGetSessionKey()
             );

From dd6e0a383631ec88d14804f8cfe334b21d807377 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Mon, 28 Sep 2015 10:52:24 +1000
Subject: [PATCH 073/103] Persist the search term across AJAX requests only
 Fixes #1448

---
 .../backend/behaviors/RelationController.php  | 65 ++++++++++++++-----
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 20006f29e..07d4ab4f4 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -3,10 +3,11 @@
 use Db;
 use Lang;
 use Event;
+use Request;
 use Form as FormHelper;
 use Backend\Classes\ControllerBehavior;
-use ApplicationException;
 use October\Rain\Database\Model;
+use ApplicationException;
 
 /**
  * Relation Controller Behavior
@@ -318,6 +319,13 @@ class RelationController extends ControllerBehavior
             $this->toolbarWidget->bindToController();
         }
 
+        /*
+         * Search widget
+         */
+        if ($this->searchWidget = $this->makeSearchWidget()) {
+            $this->searchWidget->bindToController();
+        }
+
         /*
          * View widget
          */
@@ -484,17 +492,6 @@ class RelationController extends ControllerBehavior
     // Widgets
     //
 
-    protected function makeSearchWidget()
-    {
-        $config = $this->makeConfig();
-        $config->alias = $this->alias . 'ManageSearch';
-        $config->growable = false;
-        $config->prompt = 'backend::lang.list.search_prompt';
-        $widget = $this->makeWidget('Backend\Widgets\Search', $config);
-        $widget->cssClasses[] = 'recordfinder-search';
-        return $widget;
-    }
-
     protected function makeToolbarWidget()
     {
         $defaultConfig = [];
@@ -539,6 +536,29 @@ class RelationController extends ControllerBehavior
         return $toolbarWidget;
     }
 
+    protected function makeSearchWidget()
+    {
+        if (!$this->getConfig('manage[showSearch]')) {
+            return null;
+        }
+
+        $config = $this->makeConfig();
+        $config->alias = $this->alias . 'ManageSearch';
+        $config->growable = false;
+        $config->prompt = 'backend::lang.list.search_prompt';
+        $widget = $this->makeWidget('Backend\Widgets\Search', $config);
+        $widget->cssClasses[] = 'recordfinder-search';
+
+        /*
+         * Persist the search term across AJAX requests only
+         */
+        if (!Request::ajax()) {
+            $widget->setActiveTerm(null);
+        }
+
+        return $widget;
+    }
+
     protected function makeViewWidget()
     {
         /*
@@ -614,7 +634,15 @@ class RelationController extends ControllerBehavior
                         return $widget->onRefresh();
                     });
 
-                    $searchWidget->setActiveTerm(null);
+                    /*
+                     * Persist the search term across AJAX requests only
+                     */
+                    if (Request::ajax()) {
+                        $widget->setSearchTerm($searchWidget->getActiveTerm());
+                    }
+                    else {
+                        $searchWidget->setActiveTerm(null);
+                    }
                 }
             }
         }
@@ -681,15 +709,18 @@ class RelationController extends ControllerBehavior
             /*
              * Link the Search Widget to the List Widget
              */
-            if ($this->getConfig('manage[showSearch]')) {
-                $this->searchWidget = $this->makeSearchWidget();
-                $this->searchWidget->bindToController();
+            if ($this->searchWidget) {
                 $this->searchWidget->bindEvent('search.submit', function () use ($widget) {
                     $widget->setSearchTerm($this->searchWidget->getActiveTerm());
                     return $widget->onRefresh();
                 });
 
-                $this->searchWidget->setActiveTerm(null);
+                /*
+                 * Persist the search term across AJAX requests only
+                 */
+                if (Request::ajax()) {
+                    $widget->setSearchTerm($this->searchWidget->getActiveTerm());
+                }
             }
         }
         /*

From 00998f93ca23f48167b568d0db845c4f410441b2 Mon Sep 17 00:00:00 2001
From: Alexander Guth <alexander@familie-guth.com>
Date: Tue, 29 Sep 2015 14:09:23 +0200
Subject: [PATCH 074/103] Missing use statement

---
 modules/backend/behaviors/ReorderController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/backend/behaviors/ReorderController.php b/modules/backend/behaviors/ReorderController.php
index 6102b5500..7d50e4ce6 100644
--- a/modules/backend/behaviors/ReorderController.php
+++ b/modules/backend/behaviors/ReorderController.php
@@ -2,6 +2,7 @@
 
 use Lang;
 use Backend;
+use ApplicationException;
 use Backend\Classes\ControllerBehavior;
 
 /**
@@ -263,4 +264,4 @@ class ReorderController extends ControllerBehavior
         return $contents;
     }
 
-}
\ No newline at end of file
+}

From 98dd952d4b59ba437aa9fe19ddb898be6a49f993 Mon Sep 17 00:00:00 2001
From: Alwin Drenth <alwin@vdlp.nl>
Date: Tue, 29 Sep 2015 15:02:48 +0200
Subject: [PATCH 075/103] Fix undefined variable $filePath

Also added proper phpDoc to the PluginBase class
---
 modules/system/classes/PluginBase.php | 42 ++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
index 830b6120a..748899d6c 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -13,6 +13,9 @@ use Yaml;
  */
 class PluginBase extends ServiceProviderBase
 {
+    /**
+     * @var boolean
+     */
     protected $loadedYamlConfigration = false;
 
     /**
@@ -32,6 +35,9 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Returns information about this plugin, including plugin name and developer name.
+     *
+     * @return array
+     * @throws SystemException
      */
     public function pluginDetails()
     {
@@ -50,6 +56,8 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Register method, called when the plugin is first registered.
+     *
+     * @return void
      */
     public function register()
     {
@@ -57,6 +65,8 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Boot method, called right before the request route.
+     *
+     * @return array
      */
     public function boot()
     {
@@ -64,6 +74,8 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Registers CMS markup tags introduced by this plugin.
+     *
+     * @return array
      */
     public function registerMarkupTags()
     {
@@ -72,6 +84,8 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Registers any front-end components implemented in this plugin.
+     *
+     * @return array
      */
     public function registerComponents()
     {
@@ -80,6 +94,8 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Registers back-end navigation items for this plugin.
+     *
+     * @return array
      */
     public function registerNavigation()
     {
@@ -88,6 +104,8 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Registers any back-end permissions used by this plugin.
+     *
+     * @return array
      */
     public function registerPermissions()
     {
@@ -96,6 +114,8 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Registers any back-end configuration links used by this plugin.
+     *
+     * @return array
      */
     public function registerSettings()
     {
@@ -104,6 +124,9 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Registers scheduled tasks that are executed on a regular basis.
+     *
+     * @param string $schedule
+     * @return void
      */
     public function registerSchedule($schedule)
     {
@@ -116,12 +139,13 @@ class PluginBase extends ServiceProviderBase
      *  'className1'=>[
      *          'label'    => 'My widget 1',
      *          'context' => ['context-1', 'context-2'],
-     *      ], 
+     *      ],
      *  'className2' => [
      *          'label'    => 'My widget 2',
      *          'context' => 'context-1'
      *      ]
      * ]
+     * @return array
      */
     public function registerReportWidgets()
     {
@@ -133,6 +157,7 @@ class PluginBase extends ServiceProviderBase
      * The widgets must be returned in the following format:
      * ['className1' => 'alias'],
      * ['className2' => 'anotherAlias']
+     * @return array
      */
     public function registerFormWidgets()
     {
@@ -144,6 +169,7 @@ class PluginBase extends ServiceProviderBase
      * The templates must be returned in the following format:
      * ['acme.blog::mail.welcome' => 'This is a description of the welcome template'],
      * ['acme.blog::mail.forgot_password' => 'This is a description of the forgot password template'],
+     * @return array
      */
     public function registerMailTemplates()
     {
@@ -152,8 +178,9 @@ class PluginBase extends ServiceProviderBase
 
     /**
      * Registers a new console (artisan) command
-     * @param $key The command name
-     * @param $class The command class
+     *
+     * @param string $key The command name
+     * @param string $class The command class
      * @return void
      */
     public function registerConsoleCommand($key, $class)
@@ -166,6 +193,13 @@ class PluginBase extends ServiceProviderBase
         $this->commands($key);
     }
 
+    /**
+     * Read configuration from YAML file
+     *
+     * @param string|null $exceptionMessage
+     * @return array|bool
+     * @throws SystemException
+     */
     protected function getConfigurationFromYaml($exceptionMessage = null)
     {
         if ($this->loadedYamlConfigration !== false) {
@@ -186,7 +220,7 @@ class PluginBase extends ServiceProviderBase
         else {
             $this->loadedYamlConfigration = Yaml::parse(file_get_contents($yamlFilePath));
             if (!is_array($this->loadedYamlConfigration)) {
-                throw new SystemException('Invalid format of the plugin configuration file: %s. The file should define an array.', $filePath);
+                throw new SystemException('Invalid format of the plugin configuration file: %s. The file should define an array.', $yamlFilePath);
             }
         }
 

From bbfba7dc34ed7b9d74884ba780fbb2a75afd2108 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 30 Sep 2015 05:26:00 +1000
Subject: [PATCH 076/103] Remove the use of Twig_Loader_String, added
 Twig::parse

---
 CHANGELOG.md                           |  3 +++
 modules/system/ServiceProvider.php     | 17 ++++-------------
 modules/system/aliases.php             |  1 +
 modules/system/models/MailTemplate.php | 14 +++++++-------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3392310bb..33e959d88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* **Build 300** (2015-10-xx)
+  - Added new helper `Twig::parse` for parsing Twig.
+
 * **Build 298** (2015-09-24)
   - Added the ability to use a wildcard URL parameter in CMS pages (see CMS > Pages docs).
 
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index c0eb14170..d8913f8ef 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -257,10 +257,10 @@ class ServiceProvider extends ModuleServiceProvider
     protected function registerTwigParser()
     {
         /*
-         * Register basic Twig
+         * Register system Twig environment
          */
-        App::singleton('twig', function ($app) {
-            $twig = new Twig_Environment(new TwigLoader(), ['auto_reload' => true]);
+        App::singleton('twig.environment', function ($app) {
+            $twig = new Twig_Environment(new TwigLoader, ['auto_reload' => true]);
             $twig->addExtension(new TwigExtension);
             return $twig;
         });
@@ -269,16 +269,7 @@ class ServiceProvider extends ModuleServiceProvider
          * Register .htm extension for Twig views
          */
         App::make('view')->addExtension('htm', 'twig', function () {
-            return new TwigEngine(App::make('twig'));
-        });
-
-        /*
-         * Register Twig that will parse strings
-         */
-        App::singleton('twig.string', function ($app) {
-            $twig = $app['twig'];
-            $twig->setLoader(new Twig_Loader_String);
-            return $twig;
+            return new TwigEngine(App::make('twig.environment'));
         });
     }
 
diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index 93920f893..d7859661f 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -51,6 +51,7 @@ return [
     'Str'             => 'October\Rain\Support\Facades\Str',
     'Markdown'        => 'October\Rain\Support\Facades\Markdown',
     'Yaml'            => 'October\Rain\Support\Facades\Yaml',
+    'Twig'            => 'October\Rain\Support\Facades\Twig',
     'DbDongle'        => 'October\Rain\Support\Facades\DbDongle',
     'Backend'         => 'Backend\Facades\Backend',
     'BackendMenu'     => 'Backend\Facades\BackendMenu',
diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php
index bc708ce66..b560cbfa0 100644
--- a/modules/system/models/MailTemplate.php
+++ b/modules/system/models/MailTemplate.php
@@ -2,6 +2,7 @@
 
 use App;
 use File;
+use Twig;
 use View;
 use Model;
 use October\Rain\Mail\MailParser;
@@ -130,17 +131,16 @@ class MailTemplate extends Model
         }
 
         /*
-         * Get Twig to load from a string
+         * Subject
          */
-        $twig = App::make('twig.string');
-        $message->subject($twig->render($template->subject, $data));
+        $message->subject(Twig::parse($template->subject, $data));
 
         /*
          * HTML contents
          */
-        $html = $twig->render($template->content_html, $data);
+        $html = Twig::parse($template->content_html, $data);
         if ($template->layout) {
-            $html = $twig->render($template->layout->content_html, [
+            $html = Twig::parse($template->layout->content_html, [
                 'content' => $html,
                 'css' => $template->layout->content_css
             ] + (array) $data);
@@ -152,9 +152,9 @@ class MailTemplate extends Model
          * Text contents
          */
         if (strlen($template->content_text)) {
-            $text = $twig->render($template->content_text, $data);
+            $text = Twig::parse($template->content_text, $data);
             if ($template->layout) {
-                $text = $twig->render($template->layout->content_text, [
+                $text = Twig::parse($template->layout->content_text, [
                     'content' => $text
                 ] + (array) $data);
             }

From 3f53ae1ccf542c78ecaf58d5155216994db28f19 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 30 Sep 2015 05:26:12 +1000
Subject: [PATCH 077/103] Fixes instance of WSOD

---
 modules/system/models/EventLog.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/system/models/EventLog.php b/modules/system/models/EventLog.php
index fc3e3aa9e..4e172b80c 100644
--- a/modules/system/models/EventLog.php
+++ b/modules/system/models/EventLog.php
@@ -31,6 +31,7 @@ class EventLog extends Model
     {
         return (
             class_exists('Model') &&
+            Model::getConnectionResolver() &&
             DbDongle::hasDatabase() &&
             !defined('OCTOBER_NO_EVENT_LOGGING')
         );

From 21680f60f9fa10a5292e540f9a6287c6f16244bf Mon Sep 17 00:00:00 2001
From: Alwin Drenth <alwin@vdlp.nl>
Date: Tue, 29 Sep 2015 22:04:14 +0200
Subject: [PATCH 078/103] Updated Dutch language for CMS

---
 modules/cms/lang/nl/lang.php | 200 +++++++++++++++++++++++++++++------
 1 file changed, 165 insertions(+), 35 deletions(-)

diff --git a/modules/cms/lang/nl/lang.php b/modules/cms/lang/nl/lang.php
index edeb86b2e..12281aef4 100644
--- a/modules/cms/lang/nl/lang.php
+++ b/modules/cms/lang/nl/lang.php
@@ -7,35 +7,95 @@ return [
         'file_already_exists' => 'Bestand ":name" bestaat al.',
         'error_saving' => 'Bestand opslaan mislukt: ":name". Controleer de schrijfrechten.',
         'error_creating_directory' => 'Map aanmaken mislukt: ":name". Controleer de schrijfrechten.',
-        'invalid_file_extension'=>'Ongeldige bestandsextensie: :invalid. Toegestane extensies zijn: :allowed.',
+        'invalid_file_extension' => 'Ongeldige bestandsextensie: :invalid. Toegestane extensies zijn: :allowed.',
         'error_deleting' => 'Fout bij het verwijderen van template: ":name". Controleer de schrijfrechten.',
         'delete_success' => 'Templates zijn succesvol verwijderd: :count.',
         'file_name_required' => 'Het invullen van een bestandsnaam is verplicht.'
     ],
     'theme' => [
+        'not_found_name' => 'Het thema \':name\' is niet gevonden.',
         'active' => [
-            'not_set' => "Er is geen actief thema geselecteerd.",
-            'not_found' => "Het actieve thema is niet gevonden.",
+            'not_set' => 'Er is geen actief thema geselecteerd.',
+            'not_found' => 'Het actieve thema is niet gevonden.',
         ],
         'edit' => [
-            'not_set' => "Er is geen thema ingesteld om te kunnen bewerken.",
-            'not_found' => "Het te bewerken thema is niet gevonden.",
-            'not_match' => "Het object dat je probeert te openen behoort niet tot het te bewerken thema. Herlaad de pagina."
+            'not_set' => 'Er is geen thema ingesteld om te kunnen bewerken.',
+            'not_found' => 'Het te bewerken thema is niet gevonden.',
+            'not_match' => 'Het object dat je probeert te openen behoort niet tot het te bewerken thema. Herlaad de pagina.'
         ],
         'settings_menu' => 'Front-end thema',
-        'settings_menu_description' => 'Bekijk de lijst met geïnstalleerde themas en selecteer een beschikbaar thema.',
+        'settings_menu_description' => 'Bekijk de lijst met geïnstalleerde thema\'s en selecteer een beschikbaar thema.',
         'find_more_themes' => 'Vind meer thema\'s op de OctoberCMS thema marktplaats.',
         'activate_button' => 'Activeer',
         'active_button' => 'Activeer',
+        'default_tab' => 'Eigenschappen',
+        'name_label' => 'Naam',
+        'name_create_placeholder' => 'Thema naam',
+        'author_label' => 'Auteur',
+        'author_placeholder' => 'Naam of bedrijfsnaam',
+        'description_label' => 'Omschrijving',
+        'description_placeholder' => 'Thema omschrijving',
+        'homepage_label' => 'Website',
+        'homepage_placeholder' => 'Website URL',
+        'code_label' => 'Code',
+        'code_placeholder' => 'Een unieke code voor dit thema (wordt gebruikt voor distributie)',
+        'dir_name_label' => 'Mapnaam',
+        'dir_name_create_label' => 'Mapnaam van het thema',
+        'theme_label' => 'Thema',
+        'theme_title' => 'Thema\'s',
+        'customize_theme' => 'Thema aanpassen',
+        'customize_button' => 'Aanpassen',
+        'duplicate_button' => 'Dupliceren',
+        'duplicate_title' => 'Dupliceer thema',
+        'duplicate_theme_success' => 'Thema succesvol gedupliceerd!',
+        'manage_button' => 'Beheer',
+        'manage_title' => 'Beheer thema',
+        'edit_properties_title' => 'Thema',
+        'edit_properties_button' => 'Wijzig eigenschappen',
+        'save_properties' => 'Eigenschappen opslaan',
+        'import_button' => 'Importeren',
+        'import_title' => 'Importeer thema',
+        'import_theme_success' => 'Thema succesvol geïmporteerd!',
+        'import_uploaded_file' => 'Thema archiefbestand',
+        'import_overwrite_label' => 'Overschijf bestaande bestanden',
+        'import_overwrite_comment' => 'Untick this box to only import new files',
+        'import_folders_label' => 'Mappen',
+        'import_folders_comment' => 'Selecteer de mappen die je wilt importeren:',
+        'export_button' => 'Exporteren',
+        'export_title' => 'Exporteer thema',
+        'export_folders_label' => 'Mappen',
+        'export_folders_comment' => 'Selecteer de mappen die je wilt exporteren:',
+        'delete_button' => 'Verwijderen',
+        'delete_confirm' => 'Weet je zeker dat je dit thema wilt verwijderen? Dit kan niet ongedaan worden gemaakt!',
+        'delete_active_theme_failed' => 'Kan het actieve thema niet verwijderen, maak eerst een ander thema actief.',
+        'delete_theme_success' => 'Thema succesvol verwijderd!',
+        'create_title' => 'Thema aanmaken',
+        'create_button' => 'Aanmaken',
+        'create_new_blank_theme' => 'Maak een nieuw leeg thema',
+        'create_theme_success' => 'Thema succesvol aangemaakt!',
+        'create_theme_required_name' => 'Geef a.u.b. een naam op voor dit thema.',
+        'new_directory_name_label' => 'Thema mapnaam',
+        'new_directory_name_comment' => 'Geef een nieuwe mapnaam op voor het gedupliceerde thema.',
+        'dir_name_invalid' => 'Naam mag alleen cijfers, letters en de volgende symbolen bevatten: _-',
+        'dir_name_taken' => 'Opgegeven mapnaam bestaat reeds.',
+        'saving' => 'Thema opslaan...',
+        'return' => 'Terug naar thema lijst',
+    ],
+    'maintenance' => [
+        'settings_menu' => 'Onderhoudsmodus',
+        'settings_menu_description' => 'Instellingen voor de onderhoudsmodus pagina.',
+        'is_enabled' => 'Onderhoudsmodus inschakelen',
+        'is_enabled_comment' => 'Toon de volgende pagina als onderhoudsmodus is ingeschakeld:'
     ],
     'page' => [
+        'not_found_name' => 'De pagina \':name\' is niet gevonden.',
         'not_found' => [
-            'label' => "Pagina niet gevonden",
-            'help' => "De opgevraagde pagina kan niet worden gevonden.",
+            'label' => 'Pagina niet gevonden',
+            'help' => 'De opgevraagde pagina kan niet worden gevonden.',
         ],
         'custom_error' => [
-            'label' => "Paginafout",
-            'help' => "Onze excuses, er is iets mis gegaan. De opgevraagde pagina kan niet worden getoond.",
+            'label' => 'Paginafout',
+            'help' => 'Onze excuses, er is iets mis gegaan. De opgevraagde pagina kan niet worden getoond.',
         ],
         'menu_label' => 'Pagina\'s',
         'no_list_records' => 'Geen pagina\'s gevonden',
@@ -43,39 +103,43 @@ return [
         'invalid_url' => 'Ongeldig URL formaat. De URL moet beginnen met een schuine streep en mag enkel bestaan uit letters, cijfers en de volgende tekens: ._-[]:?|/+*^$',
         'delete_confirm_multiple' => 'Weet je zeker dat je de geselecteerde pagina\'s wilt verwijderen?',
         'delete_confirm_single' => 'Weet je zeker dat je deze pagina wilt verwijderen?',
-        'no_layout' => '-- geen layout --'
+        'no_layout' => '-- geen layout --',
+        'unsaved_label' => 'Niet opgeslagen pagina\'s',
     ],
     'layout' => [
+        'unsaved_label' => 'Niet opgeslagen layouts',
         'not_found_name' => "De layout ':name' is niet gevonden",
         'menu_label' => 'Layouts',
         'no_list_records' => 'Geen layouts gevonden',
         'new' => 'Nieuwe layout',
         'delete_confirm_multiple' => 'Weet je zeker dat je de geselecteerde layouts wilt verwijderen?',
-        'delete_confirm_single' => 'Weet je zeker dat je deze layout wilt verwijderen?'
+        'delete_confirm_single' => 'Weet je zeker dat je deze layout wilt verwijderen?',
     ],
     'partial' => [
-        'not_found_name' => "Het sjabloon (partial) ':name' is niet gevonden.",
-        'invalid_name' => "Ongeldige naam voor sjabloon (partial): :name.",
+        'unsaved_label' => 'Niet opgeslagen sjablonen',
+        'not_found_name' => 'Het sjabloon (partial) \':name\' is niet gevonden.',
+        'invalid_name' => 'Ongeldige naam voor sjabloon (partial): :name.',
         'menu_label' => 'Sjablonen',
         'no_list_records' => 'Geen sjablonen (partial) gevonden',
         'delete_confirm_multiple' => 'Weet je zeker dat je de geselecteerde sjablonen wilt verwijderen?',
         'delete_confirm_single' => 'Weet je zeker dat je dit sjabloon wilt verwijderen?',
-        'new' => 'Nieuw sjabloon'
+        'new' => 'Nieuw sjabloon',
     ],
     'content' => [
+        'unsaved_label' => 'Niet opgeslagen tekstblokken',
         'not_found_name' => "Het tekstblok (content) ':name' is niet gevonden.",
         'menu_label' => 'Tekstblokken',
         'no_list_records' => 'Geen tekstblokken (content) gevonden',
         'delete_confirm_multiple' => 'Weet je zeker dat je de geselecteerde tekstblokken of mappen wilt verwijderen?',
         'delete_confirm_single' => 'Weet je zeker dat je dit tekstblok wilt verwijderen?',
-        'new' => 'Nieuw tekstblok'
+        'new' => 'Nieuw tekstblok',
     ],
     'ajax_handler' => [
-        'invalid_name' => "Ongeldige AJAX handlernaam: :name.",
-        'not_found' => "AJAX handler ':name' is niet gevonden.",
+        'invalid_name' => 'Ongeldige AJAX handlernaam: :name.',
+        'not_found' => 'AJAX handler \':name\' is niet gevonden.',
     ],
     'cms' => [
-        'menu_label' => "CMS"
+        'menu_label' => 'CMS'
     ],
     'sidebar' => [
         'add' => 'Toevoegen',
@@ -102,7 +166,8 @@ return [
         'exit_fullscreen' => 'Volledig scherm afsluiten',
     ],
     'asset' => [
-        'menu_label' => "Middelen",
+        'menu_label' => 'Middelen',
+        'unsaved_label' => 'Niet opgeslagen middelen',
         'drop_down_add_title' => 'Toevoegen...',
         'drop_down_operation_title' => 'Actie...',
         'upload_files' => 'Bestand(en) uploaden',
@@ -140,31 +205,96 @@ return [
         'error_moving_file' => 'Fout bij verplaatsen bestand :file',
         'error_moving_directory' => 'Fout bij verplaatsen map :dir',
         'error_deleting_directory' => 'Fout bij het verwijderen van de oorspronkelijke map :dir',
-        'path' => 'Pad'
+        'path' => 'Pad',
     ],
     'component' => [
-        'menu_label' => "Componenten",
-        'unnamed' => "Naamloos",
-        'no_description' => "Geen beschrijving opgegeven",
-        'alias' => "Alias",
-        'alias_description' => "Een unieke naam voor dit component voor gebruik in de code van een pagina of layout.",
-        'validation_message' => "Een alias voor het component is verplicht en mag alleen bestaan uit letters, cijfers en underscores. De alias moet beginnen met een letter.",
-        'invalid_request' => "De template kan niet worden opgeslagen vanwege ongeldige componentgegevens.",
+        'menu_label' => 'Componenten',
+        'unnamed' => 'Naamloos',
+        'no_description' => 'Geen beschrijving opgegeven',
+        'alias' => 'Alias',
+        'alias_description' => 'Een unieke naam voor dit component voor gebruik in de code van een pagina of layout.',
+        'validation_message' => 'Een alias voor het component is verplicht en mag alleen bestaan uit letters, cijfers en underscores. De alias moet beginnen met een letter.',
+        'invalid_request' => 'De template kan niet worden opgeslagen vanwege ongeldige componentgegevens.',
         'no_records' => 'Geen componenten gevonden',
-        'not_found' => "Het component ':name' is niet gevonden.",
-        'method_not_found' => "Het component ':name' bevat geen ':method' methode.",
+        'not_found' => 'Het component \':name\' is niet gevonden.',
+        'method_not_found' => 'Het component \':name\' bevat geen \':method\' methode.',
     ],
     'template' => [
-        'invalid_type' => "Onbekend type template.",
-        'not_found' => "De opgevraagde template is niet gevonden.",
-        'saved'=> "De template is succesvol opgeslagen."
+        'invalid_type' => 'Onbekend type template.',
+        'not_found' => 'De opgevraagde template is niet gevonden.',
+        'saved' => 'De template is succesvol opgeslagen.'
     ],
     'permissions' => [
+        'name' => 'Cms',
         'manage_content' => 'Beheer inhoud',
         'manage_assets' => 'Beheer middelen',
         'manage_pages' => 'Beheer pagina\'s',
         'manage_layouts' => 'Beheer layouts',
         'manage_partials' => 'Beheer sjablonen',
-        'manage_themes' => 'Beheer thema\'s'
+        'manage_themes' => 'Beheer thema\'s',
+        'manage_media' => 'Beheer media',
+    ],
+    'mediafinder' => [
+        'default_prompt' => 'Klik op de %s knop om een media item te vinden'
+    ],
+    'media' => [
+        'invalid_path' => 'Ongeldig pad opgegeven: \':path\'.',
+        'menu_label' => 'Media',
+        'upload' => 'Uploaden',
+        'move' => 'Verplaatsen',
+        'delete' => 'Verwijderen',
+        'add_folder' => 'Map toevoegen',
+        'search' => 'Zoeken',
+        'display' => 'Weergeven',
+        'filter_everything' => 'Alles',
+        'filter_images' => 'Afbeeldingen',
+        'filter_video' => 'Video\'s',
+        'filter_audio' => 'Audio',
+        'filter_documents' => 'Documenten',
+        'library' => 'Bibliotheek',
+        'folder_size_items' => 'item(s)',
+        'size' => 'Grootte',
+        'title' => 'Titel',
+        'last_modified' => 'Laatst gewijzigd',
+        'public_url' => 'URL',
+        'click_here' => 'Klik hier',
+        'thumbnail_error' => 'Fout opgetreden bij genereren miniatuurweergave.',
+        'return_to_parent' => 'Terug naar bovenliggende map',
+        'return_to_parent_label' => 'Naar bovenliggende ...',
+        'nothing_selected' => 'Er is niets geselecteerd.',
+        'multiple_selected' => 'Meerdere items geselecteerd.',
+        'uploading_file_num' => 'Uploaden van :number bestanden...',
+        'uploading_complete' => 'Uploaden voltooid',
+        'order_by' => 'Sorteer op',
+        'folder' => 'Map',
+        'no_files_found' => 'Er zijn geen bestanden gevonden.',
+        'delete_empty' => 'Selecteer items om te verwijderen.',
+        'delete_confirm' => 'Weet je zeker dat je de geselecteerde items wilt verwijderen?',
+        'error_renaming_file' => 'Fout bij wijzigen naam.',
+        'new_folder_title' => 'Nieuwe map',
+        'folder_name' => 'Mapnaam',
+        'error_creating_folder' => 'Fout bij maken van map',
+        'folder_or_file_exist' => 'Er bestaat reeds een map of bestand met deze naam.',
+        'move_empty' => 'Selecteer de items om te verplaatsen.',
+        'move_popup_title' => 'Verplaats bestanden of mappen',
+        'move_destination' => 'Doelmap',
+        'please_select_move_dest' => 'Selecteer een doelmap.',
+        'move_dest_src_match' => 'Selecteer een andere doelmap.',
+        'empty_library' => 'De media bibliotheek is leeg. Upload bestanden of maak mappen aan om te beginnen.',
+        'insert' => 'Invoegen',
+        'crop_and_insert' => 'Uitsnijden & Invoegen',
+        'select_single_image' => 'Selecteer één afbeelding.',
+        'selection_not_image' => 'Het geselecteerde item is geen afbeelding.',
+        'restore' => 'Alle wijzigingen ongedaan maken',
+        'resize' => 'Wijzig grootte...',
+        'selection_mode_normal' => 'Normaal',
+        'selection_mode_fixed_ratio' => 'Vaste ratio',
+        'selection_mode_fixed_size' => 'Vaste grootte',
+        'height' => 'Hoogte',
+        'width' => 'Breedte',
+        'selection_mode' => 'Selectie modus',
+        'resize_image' => 'Wijzig grootte van afbeelding',
+        'image_size' => 'Grootte afbeelding:',
+        'selected_size' => 'Geselecteerd:'
     ]
 ];

From 8139def4351d4216b813f98afd4c4d15a981489f Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 30 Sep 2015 06:09:51 +1000
Subject: [PATCH 079/103] Bump max values to their db equivalents

---
 modules/backend/models/User.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/backend/models/User.php b/modules/backend/models/User.php
index 162ae84ac..0169d3205 100644
--- a/modules/backend/models/User.php
+++ b/modules/backend/models/User.php
@@ -22,9 +22,9 @@ class User extends UserBase
      */
     public $rules = [
         'login' => 'required|between:2,24|unique:backend_users',
-        'email' => 'required|between:3,64|email|unique:backend_users',
-        'password' => 'required:create|between:4,64|confirmed',
-        'password_confirmation' => 'required_with:password|between:4,64'
+        'email' => 'required|between:3,255|email|unique:backend_users',
+        'password' => 'required:create|between:4,255|confirmed',
+        'password_confirmation' => 'required_with:password|between:4,255'
     ];
 
     /**

From 2ecf2db311bd462993c6db2481a02cba04a15359 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 30 Sep 2015 20:52:31 +1000
Subject: [PATCH 080/103] Remove dependency on IntlDateFormatter

---
 modules/cms/classes/MediaLibraryItem.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index a0a6dd72b..ba25001e1 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -4,7 +4,7 @@ use App;
 use File;
 use Config;
 use Backend\Models\UserPreferences;
-use IntlDateFormatter;
+use Carbon\Carbon;
 
 /**
  * Represents a file or folder in the Media Library.
@@ -140,10 +140,6 @@ class MediaLibraryItem
             return null;
         }
 
-        return IntlDateFormatter::create(
-            App::getLocale(),
-            IntlDateFormatter::MEDIUM,
-            IntlDateFormatter::NONE
-        )->format($date);
+        return Carbon::createFromTimestamp($date)->toFormattedDateString();
     }
 }

From c30851d6840f41ccd609e4c1c1262c4637d992b8 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 30 Sep 2015 20:54:00 +1000
Subject: [PATCH 081/103] Remove dead ns ref

---
 modules/cms/classes/MediaLibraryItem.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/cms/classes/MediaLibraryItem.php b/modules/cms/classes/MediaLibraryItem.php
index ba25001e1..062df3ce6 100644
--- a/modules/cms/classes/MediaLibraryItem.php
+++ b/modules/cms/classes/MediaLibraryItem.php
@@ -1,6 +1,5 @@
 <?php namespace Cms\Classes;
 
-use App;
 use File;
 use Config;
 use Backend\Models\UserPreferences;

From d9097d658801d3c9fd9a340467c869fc226adc2c Mon Sep 17 00:00:00 2001
From: Michael Query <michaelquery@gmail.com>
Date: Wed, 30 Sep 2015 15:11:23 -0600
Subject: [PATCH 082/103] Fixes broken installation link in Readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dfd714366..621795737 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ The best place to learn October is by [reading the documentation](http://october
 
 ### Installing October
 
-Instructions on how to install October can be found at the [installation guide](http://octobercms.com/docs/help/install).
+Instructions on how to install October can be found at the [installation guide](http://octobercms.com/docs/setup/installation).
 
 ### Development Team
 

From 97595a631e5f60cc0eac9564b692bfd3f3597309 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 1 Oct 2015 17:23:42 +1000
Subject: [PATCH 083/103] Adds the ability to inject custom buttons + icons

---
 modules/backend/widgets/table/assets/css/table.css   | 10 +++++-----
 modules/backend/widgets/table/assets/js/build-min.js |  6 +++---
 modules/backend/widgets/table/assets/js/table.js     |  6 +++---
 modules/backend/widgets/table/assets/less/table.less |  6 ++++--
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/modules/backend/widgets/table/assets/css/table.css b/modules/backend/widgets/table/assets/css/table.css
index b8dfa97c2..a9541f8be 100644
--- a/modules/backend/widgets/table/assets/css/table.css
+++ b/modules/backend/widgets/table/assets/css/table.css
@@ -137,17 +137,17 @@
   background: white;
   border-bottom: 1px solid #e0e0e0;
 }
-.control-table .toolbar a {
+.control-table .toolbar a.btn {
   color: #323e50;
   padding: 10px;
   opacity: 0.5;
   filter: alpha(opacity=50);
 }
-.control-table .toolbar a:hover {
+.control-table .toolbar a.btn:hover {
   opacity: 1;
   filter: alpha(opacity=100);
 }
-.control-table .toolbar a:before {
+.control-table .toolbar a.table-icon:before {
   display: inline-block;
   content: ' ';
   width: 16px;
@@ -159,10 +159,10 @@
   background-position: 0 0;
   background-size: 32px auto;
 }
-.control-table .toolbar a.add-table-row-above:before {
+.control-table .toolbar a.table-icon.add-table-row-above:before {
   background-position: 0 -56px;
 }
-.control-table .toolbar a.delete-table-row:before {
+.control-table .toolbar a.table-icon.delete-table-row:before {
   background-position: 0 -113px;
 }
 .control-table.active .toolbar {
diff --git a/modules/backend/widgets/table/assets/js/build-min.js b/modules/backend/widgets/table/assets/js/build-min.js
index 240ff44e9..72c4570f9 100644
--- a/modules/backend/widgets/table/assets/js/build-min.js
+++ b/modules/backend/widgets/table/assets/js/build-min.js
@@ -78,17 +78,17 @@ return
 this.toolbar=document.createElement('div')
 this.toolbar.setAttribute('class','toolbar')
 if(this.options.adding){var addBelowButton=document.createElement('a')
-addBelowButton.setAttribute('class','btn add-table-row-below')
+addBelowButton.setAttribute('class','btn table-icon add-table-row-below')
 addBelowButton.setAttribute('data-cmd','record-add-below')
 this.toolbar.appendChild(addBelowButton)
 if(this.navigation.paginationEnabled()||!this.options.rowSorting){addBelowButton.textContent='Add row'}else{addBelowButton.textContent='Add row below'
 var addAboveButton=document.createElement('a')
-addAboveButton.setAttribute('class','btn add-table-row-above')
+addAboveButton.setAttribute('class','btn table-icon add-table-row-above')
 addAboveButton.textContent='Add row above'
 addAboveButton.setAttribute('data-cmd','record-add-above')
 this.toolbar.appendChild(addAboveButton)}}
 if(this.options.deleting){var deleteButton=document.createElement('a')
-deleteButton.setAttribute('class','btn delete-table-row')
+deleteButton.setAttribute('class','btn table-icon delete-table-row')
 deleteButton.textContent='Delete row'
 deleteButton.setAttribute('data-cmd','record-delete')
 this.toolbar.appendChild(deleteButton)}
diff --git a/modules/backend/widgets/table/assets/js/table.js b/modules/backend/widgets/table/assets/js/table.js
index bb98d9eb0..21076ce91 100644
--- a/modules/backend/widgets/table/assets/js/table.js
+++ b/modules/backend/widgets/table/assets/js/table.js
@@ -223,7 +223,7 @@
 
         if (this.options.adding) {
             var addBelowButton = document.createElement('a')
-            addBelowButton.setAttribute('class', 'btn add-table-row-below')
+            addBelowButton.setAttribute('class', 'btn table-icon add-table-row-below')
             addBelowButton.setAttribute('data-cmd', 'record-add-below')
             this.toolbar.appendChild(addBelowButton)
 
@@ -236,7 +236,7 @@
                 addBelowButton.textContent = 'Add row below'
 
                 var addAboveButton = document.createElement('a')
-                addAboveButton.setAttribute('class', 'btn add-table-row-above')
+                addAboveButton.setAttribute('class', 'btn table-icon add-table-row-above')
                 addAboveButton.textContent = 'Add row above'
                 addAboveButton.setAttribute('data-cmd', 'record-add-above')
                 this.toolbar.appendChild(addAboveButton)
@@ -245,7 +245,7 @@
 
         if (this.options.deleting) {
             var deleteButton = document.createElement('a')
-            deleteButton.setAttribute('class', 'btn delete-table-row')
+            deleteButton.setAttribute('class', 'btn table-icon delete-table-row')
             deleteButton.textContent = 'Delete row'
             deleteButton.setAttribute('data-cmd', 'record-delete')
             this.toolbar.appendChild(deleteButton)
diff --git a/modules/backend/widgets/table/assets/less/table.less b/modules/backend/widgets/table/assets/less/table.less
index 6b34401b1..c43af84b8 100644
--- a/modules/backend/widgets/table/assets/less/table.less
+++ b/modules/backend/widgets/table/assets/less/table.less
@@ -177,7 +177,7 @@
         background: white;
         border-bottom: 1px solid @table-inactive-border;
 
-        a {
+        a.btn {
             color: #323e50;
             padding: 10px;
             .opacity(0.5);
@@ -185,14 +185,16 @@
             &:hover {
                 .opacity(1);
             }
+        }
 
+        a.table-icon {
             &:before {
                 display: inline-block;
                 content: ' ';
                 width: 16px;
                 height: 16px;
                 margin-right: 8px;
-                position: relative; 
+                position: relative;
                 top: 3px;
                 background: transparent url(../images/table-icons.gif) no-repeat;
                 background-position: 0 0;

From f97b9a6831e29aecfc9f46b0cd67574943d12960 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 1 Oct 2015 18:13:15 +1000
Subject: [PATCH 084/103] Allows custom toolbar buttons to be injected Removes
 the assumption that all anchors are pagination links Make code easier to read
 in places Sorry, had to use jQuery in some places too

---
 .../widgets/table/assets/js/build-min.js      | 21 +++++++-----
 .../assets/js/table.datasource.client.js      |  3 +-
 .../assets/js/table.helper.navigation.js      | 33 ++++++++++++-------
 .../backend/widgets/table/assets/js/table.js  |  3 ++
 4 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/modules/backend/widgets/table/assets/js/build-min.js b/modules/backend/widgets/table/assets/js/build-min.js
index 72c4570f9..75d7d2f88 100644
--- a/modules/backend/widgets/table/assets/js/build-min.js
+++ b/modules/backend/widgets/table/assets/js/build-min.js
@@ -288,6 +288,8 @@ if(!this.validate()){ev.preventDefault()
 return}
 var fieldName=this.options.alias.indexOf('[')>-1?this.options.alias+'[TableData]':this.options.alias+'TableData';data.options.data[fieldName]=this.dataSource.getAllData()}}
 Table.prototype.onToolbarClick=function(ev){var target=this.getEventTarget(ev),cmd=target.getAttribute('data-cmd')
+if(!cmd)
+return
 switch(cmd){case'record-add-below':this.addRecord('below')
 break
 case'record-add-above':this.addRecord('above')
@@ -397,12 +399,11 @@ var paginationContainer=this.tableObj.getElement().querySelector('.pagination'),
 this.pageCount=this.calculatePageCount(recordCount,this.tableObj.options.recordsPerPage)
 if(!paginationContainer){paginationContainer=document.createElement('div')
 paginationContainer.setAttribute('class','pagination')
-newPaginationContainer=true}else
-curRecordCount=this.getRecordCount(paginationContainer)
+newPaginationContainer=true}
+else{curRecordCount=this.getRecordCount(paginationContainer)}
 if(newPaginationContainer||curRecordCount!=recordCount){paginationContainer.setAttribute('data-record-count',recordCount)
 var pageList=this.buildPaginationLinkList(recordCount,this.tableObj.options.recordsPerPage,this.pageIndex)
-if(!newPaginationContainer)
-paginationContainer.replaceChild(pageList,paginationContainer.children[0])
+if(!newPaginationContainer){paginationContainer.replaceChild(pageList,paginationContainer.children[0])}
 else{paginationContainer.appendChild(pageList)
 this.tableObj.getElement().appendChild(paginationContainer)}}else{this.markActiveLinkItem(paginationContainer,this.pageIndex)}}
 Navigation.prototype.calculatePageCount=function(recordCount,recordsPerPage){var pageCount=Math.ceil(recordCount/recordsPerPage)
@@ -415,6 +416,7 @@ Navigation.prototype.buildPaginationLinkList=function(recordCount,recordsPerPage
 for(var i=0;i<pageCount;i++){var item=document.createElement('li'),link=document.createElement('a')
 if(i==pageIndex)
 item.setAttribute('class','active')
+$(item).addClass('pagination-link')
 link.innerText=i+1
 link.setAttribute('data-page-index',i)
 link.setAttribute('href','#')
@@ -423,8 +425,7 @@ pageList.appendChild(item)}
 return pageList}
 Navigation.prototype.markActiveLinkItem=function(paginationContainer,pageIndex){var activeItem=paginationContainer.querySelector('.active'),list=paginationContainer.children[0]
 activeItem.setAttribute('class','')
-for(var i=0,len=list.children.length;i<len;i++){if(i==pageIndex)
-list.children[i].setAttribute('class','active')}}
+for(var i=0,len=list.children.length;i<len;i++){if(i==pageIndex){list.children[i].setAttribute('class','active')}}}
 Navigation.prototype.gotoPage=function(pageIndex,onSuccess){this.tableObj.unfocusTable()
 if(!this.tableObj.validate())
 return
@@ -450,7 +451,8 @@ return
 var row=this.tableObj.activeCell.parentNode,newRow=!ev.shiftKey?row.nextElementSibling:row.parentNode.children[row.parentNode.children.length-1],cellIndex=forceCellIndex!==undefined?forceCellIndex:this.tableObj.activeCell.cellIndex
 if(newRow){var cell=newRow.children[cellIndex]
 if(cell)
-this.tableObj.focusCell(cell)}else{if(!this.paginationEnabled())
+this.tableObj.focusCell(cell)}
+else{if(!this.paginationEnabled())
 return
 if(this.pageIndex<this.pageCount-1){var self=this
 this.gotoPage(this.pageIndex+1,function navDownPageSuccess(){self.focusCell('top',cellIndex)
@@ -524,7 +526,7 @@ return this.navigateRight(ev)
 if(ev.keyCode==9)
 return this.navigateNext(ev)}
 Navigation.prototype.onClick=function(ev){var target=this.tableObj.getEventTarget(ev,'A')
-if(!target)
+if(!target||!$(target).hasClass('pagination-link'))
 return
 var pageIndex=parseInt(target.getAttribute('data-page-index'))
 if(pageIndex===null)
@@ -552,7 +554,8 @@ this.data=JSON.parse(dataString)};Client.prototype=Object.create(BaseProto)
 Client.prototype.constructor=Client
 Client.prototype.dispose=function(){BaseProto.dispose.call(this)
 this.data=null}
-Client.prototype.getRecords=function(offset,count,onSuccess){if(!count){onSuccess(this.data,this.data.length)}else{onSuccess(this.data.slice(offset,offset+count),this.data.length)}}
+Client.prototype.getRecords=function(offset,count,onSuccess){if(!count){onSuccess(this.data,this.data.length)}
+else{onSuccess(this.data.slice(offset,offset+count),this.data.length)}}
 Client.prototype.createRecord=function(recordData,placement,relativeToKey,offset,count,onSuccess){if(placement==='bottom'){this.data.push(recordData)}
 else if(placement=='above'||placement=='below'){var recordIndex=this.getIndexOfKey(relativeToKey)
 if(placement=='below')
diff --git a/modules/backend/widgets/table/assets/js/table.datasource.client.js b/modules/backend/widgets/table/assets/js/table.datasource.client.js
index d53b1c7c5..56f3ca255 100644
--- a/modules/backend/widgets/table/assets/js/table.datasource.client.js
+++ b/modules/backend/widgets/table/assets/js/table.datasource.client.js
@@ -49,7 +49,8 @@
         if (!count) {
             // Return all records
             onSuccess(this.data, this.data.length)
-        } else {
+        }
+        else {
             // Return a subset of records
             onSuccess(this.data.slice(offset, offset+count), this.data.length)
         }
diff --git a/modules/backend/widgets/table/assets/js/table.helper.navigation.js b/modules/backend/widgets/table/assets/js/table.helper.navigation.js
index 058dc3c8c..61c5f974f 100644
--- a/modules/backend/widgets/table/assets/js/table.helper.navigation.js
+++ b/modules/backend/widgets/table/assets/js/table.helper.navigation.js
@@ -66,19 +66,24 @@
             paginationContainer = document.createElement('div')
             paginationContainer.setAttribute('class', 'pagination')
             newPaginationContainer = true
-        } else
+        }
+        else {
             curRecordCount = this.getRecordCount(paginationContainer)
+        }
 
         // Generate the new page list only if the record count has changed
         if (newPaginationContainer || curRecordCount != recordCount) {
             paginationContainer.setAttribute('data-record-count', recordCount)
 
-            var pageList = this.buildPaginationLinkList(recordCount, 
-                    this.tableObj.options.recordsPerPage, 
-                    this.pageIndex)
+            var pageList = this.buildPaginationLinkList(
+                recordCount,
+                this.tableObj.options.recordsPerPage,
+                this.pageIndex
+            )
 
-            if (!newPaginationContainer)
+            if (!newPaginationContainer) {
                 paginationContainer.replaceChild(pageList, paginationContainer.children[0])
+            }
             else {
                 paginationContainer.appendChild(pageList)
                 this.tableObj.getElement().appendChild(paginationContainer)
@@ -120,6 +125,8 @@
             if (i == pageIndex)
                 item.setAttribute('class', 'active')
 
+            $(item).addClass('pagination-link')
+
             link.innerText = i+1
             link.setAttribute('data-page-index', i)
             link.setAttribute('href', '#')
@@ -141,8 +148,9 @@
         activeItem.setAttribute('class', '')
 
         for (var i=0, len = list.children.length; i < len; i++) {
-            if (i == pageIndex)
+            if (i == pageIndex) {
                 list.children[i].setAttribute('class', 'active')
+            }
         }
     }
 
@@ -200,9 +208,9 @@
             return
 
         var row = this.tableObj.activeCell.parentNode,
-            newRow = !ev.shiftKey ? 
-                row.nextElementSibling :
-                row.parentNode.children[row.parentNode.children.length - 1],
+            newRow = !ev.shiftKey
+                ? row.nextElementSibling 
+                : row.parentNode.children[row.parentNode.children.length - 1],
             cellIndex = forceCellIndex !== undefined ? 
                 forceCellIndex :
                 this.tableObj.activeCell.cellIndex
@@ -212,7 +220,8 @@
 
             if (cell)
                 this.tableObj.focusCell(cell)
-        } else {
+        }
+        else {
             // Try to switch to the next page if that's possible
 
             if (!this.paginationEnabled())
@@ -377,8 +386,10 @@
             return this.navigateUp(ev)
         else if (ev.keyCode == 37)
             return this.navigateLeft(ev)
+
         if (ev.keyCode == 39)
             return this.navigateRight(ev)
+
         if (ev.keyCode == 9)
             return this.navigateNext(ev)
     }
@@ -389,7 +400,7 @@
 
         var target = this.tableObj.getEventTarget(ev, 'A')
 
-        if (!target)
+        if (!target || !$(target).hasClass('pagination-link'))
             return
 
         var pageIndex = parseInt(target.getAttribute('data-page-index'))
diff --git a/modules/backend/widgets/table/assets/js/table.js b/modules/backend/widgets/table/assets/js/table.js
index 21076ce91..fccb8a59d 100644
--- a/modules/backend/widgets/table/assets/js/table.js
+++ b/modules/backend/widgets/table/assets/js/table.js
@@ -766,6 +766,9 @@
         var target = this.getEventTarget(ev),
             cmd = target.getAttribute('data-cmd')
 
+        if (!cmd)
+            return
+
         switch (cmd) {
             case 'record-add-below':
                 this.addRecord('below')

From 51446f6a27b5680ba062c5afba71f95c6fda7c46 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 2 Oct 2015 05:11:39 +1000
Subject: [PATCH 085/103] Add alias for new Ini parser

---
 modules/system/aliases.php            | 1 +
 modules/system/assets/ui/storm-min.js | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/system/aliases.php b/modules/system/aliases.php
index d7859661f..8a89a8c46 100644
--- a/modules/system/aliases.php
+++ b/modules/system/aliases.php
@@ -51,6 +51,7 @@ return [
     'Str'             => 'October\Rain\Support\Facades\Str',
     'Markdown'        => 'October\Rain\Support\Facades\Markdown',
     'Yaml'            => 'October\Rain\Support\Facades\Yaml',
+    'Ini'             => 'October\Rain\Support\Facades\Ini',
     'Twig'            => 'October\Rain\Support\Facades\Twig',
     'DbDongle'        => 'October\Rain\Support\Facades\DbDongle',
     'Backend'         => 'Backend\Facades\Backend',
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index aff7d5105..84a8c9d96 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -3398,13 +3398,11 @@ this.$el.on('change',function(){self.cancelled=true})}
 InputPreset.prototype.formatNamespace=function(){var value=toCamel(this.$src.val())
 return value.substr(0,1).toUpperCase()+value.substr(1)}
 InputPreset.prototype.formatValue=function(){if(this.options.inputPresetType=='namespace'){return this.formatNamespace()}
-if(this.options.inputPresetType=='camel')
-var value=toCamel(this.$src.val())
+if(this.options.inputPresetType=='camel'){var value=toCamel(this.$src.val())}
 else{var value=slugify(this.$src.val())}
-if(this.options.inputPresetType=='url')
-value='/'+value
+if(this.options.inputPresetType=='url'){value='/'+value}
 return value.replace(/\s/gi,"-")}
-InputPreset.DEFAULTS={inputPreset:'',inputPresetType:'file',inputPresetClosestParent:undefined,inputPresetPrefixInput:undefined}
+InputPreset.DEFAULTS={inputPreset:'',inputPresetType:'slug',inputPresetClosestParent:undefined,inputPresetPrefixInput:undefined}
 var old=$.fn.inputPreset
 $.fn.inputPreset=function(option){return this.each(function(){var $this=$(this)
 var data=$this.data('oc.inputPreset')

From 8ed6a3cc518a54b2bec7984486c956c2639dd83d Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 3 Oct 2015 07:29:08 +1000
Subject: [PATCH 086/103] Fixes exception ref

---
 modules/cms/classes/MediaViewHelper.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/cms/classes/MediaViewHelper.php b/modules/cms/classes/MediaViewHelper.php
index 1e81cd7b8..e3955e4c7 100644
--- a/modules/cms/classes/MediaViewHelper.php
+++ b/modules/cms/classes/MediaViewHelper.php
@@ -1,5 +1,7 @@
 <?php namespace Cms\Classes;
 
+use ApplicationException;
+
 /**
  * Helper class for processing video and audio tags inserted by the Media Manager.
  *
@@ -80,7 +82,7 @@ class MediaViewHelper
 
         $controller = Controller::getController();
         if (!$controller) {
-            throw new Phpr_ApplicationException('Media tags can only be processed for front-end requests.');
+            throw new ApplicationException('Media tags can only be processed for front-end requests.');
         }
 
         $partial = Partial::loadCached($controller->getTheme(), $name);

From 91d3d4dbde4658f3f17aab68a9c682337f354f02 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 3 Oct 2015 07:30:11 +1000
Subject: [PATCH 087/103] Swap FileHelper methods for new Ini parser

---
 CHANGELOG.md                                  |  1 +
 modules/cms/classes/CmsCompoundObject.php     |  4 +-
 modules/cms/classes/CmsObject.php             |  1 +
 modules/cms/classes/Controller.php            |  1 -
 .../FileHelper.php => helpers/File.php}       | 48 +---------
 modules/system/assets/ui/js/input.trigger.js  |  3 -
 modules/system/providers.php                  |  2 +-
 tests/fixtures/cms/filehelper/sections.ini    | 10 --
 tests/fixtures/cms/filehelper/simple.ini      |  2 -
 tests/fixtures/cms/filehelper/subsections.ini | 15 ---
 tests/unit/cms/classes/FileHelperTest.php     | 92 -------------------
 tests/unit/cms/helpers/FileTest.php           | 18 ++++
 12 files changed, 25 insertions(+), 172 deletions(-)
 rename modules/cms/{classes/FileHelper.php => helpers/File.php} (63%)
 delete mode 100644 tests/fixtures/cms/filehelper/sections.ini
 delete mode 100644 tests/fixtures/cms/filehelper/simple.ini
 delete mode 100644 tests/fixtures/cms/filehelper/subsections.ini
 delete mode 100644 tests/unit/cms/classes/FileHelperTest.php
 create mode 100644 tests/unit/cms/helpers/FileTest.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33e959d88..c9874e1d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 * **Build 300** (2015-10-xx)
   - Added new helper `Twig::parse` for parsing Twig.
+  - Page settings now support infinite array nesting with October flavored INI syntax via `Ini::parse` and `Ini::render`.
 
 * **Build 298** (2015-09-24)
   - Added the ability to use a wildcard URL parameter in CMS pages (see CMS > Pages docs).
diff --git a/modules/cms/classes/CmsCompoundObject.php b/modules/cms/classes/CmsCompoundObject.php
index 9e1170e2f..3b3c16b0a 100644
--- a/modules/cms/classes/CmsCompoundObject.php
+++ b/modules/cms/classes/CmsCompoundObject.php
@@ -1,5 +1,6 @@
 <?php namespace Cms\Classes;
 
+use Ini;
 use Cache;
 use Config;
 use Validator;
@@ -7,7 +8,6 @@ use SystemException;
 use ValidationException;
 use Cms\Classes\ViewBag;
 use Cms\Classes\CodeBase;
-use Cms\Classes\FileHelper;
 use Cms\Twig\Loader as TwigLoader;
 use Cms\Twig\Extension as CmsTwigExtension;
 use System\Twig\Extension as SystemTwigExtension;
@@ -227,7 +227,7 @@ class CmsCompoundObject extends CmsObject
         $content = [];
 
         if ($this->settings) {
-            $content[] = FileHelper::formatIniString($this->settings);
+            $content[] = Ini::render($this->settings);
         }
 
         if ($this->code) {
diff --git a/modules/cms/classes/CmsObject.php b/modules/cms/classes/CmsObject.php
index 7e3484684..131bc0542 100644
--- a/modules/cms/classes/CmsObject.php
+++ b/modules/cms/classes/CmsObject.php
@@ -5,6 +5,7 @@ use Lang;
 use Cache;
 use Config;
 use Validator;
+use Cms\Helpers\File as FileHelper;
 use ApplicationException;
 use ValidationException;
 use RecursiveDirectoryIterator;
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index eff540c21..f4aea84e7 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -18,7 +18,6 @@ use Twig_Environment;
 use Cms\Twig\Loader as TwigLoader;
 use Cms\Twig\DebugExtension;
 use Cms\Twig\Extension as CmsTwigExtension;
-use Cms\Classes\FileHelper as CmsFileHelper;
 use Cms\Models\MaintenanceSettings;
 use System\Models\RequestLog;
 use System\Classes\ErrorHandler;
diff --git a/modules/cms/classes/FileHelper.php b/modules/cms/helpers/File.php
similarity index 63%
rename from modules/cms/classes/FileHelper.php
rename to modules/cms/helpers/File.php
index 8029e9c25..a99457e43 100644
--- a/modules/cms/classes/FileHelper.php
+++ b/modules/cms/helpers/File.php
@@ -1,4 +1,4 @@
-<?php namespace Cms\Classes;
+<?php namespace Cms\Helpers;
 
 /**
  * Defines some file-system helpers for the CMS system.
@@ -6,7 +6,7 @@
  * @package october\system
  * @author Alexey Bobkov, Samuel Georges
  */
-class FileHelper
+class File
 {
     /**
      * Validates a CMS object file or directory name.
@@ -68,48 +68,4 @@ class FileHelper
 
         return true;
     }
-
-    /**
-     * Formats an INI file string from an array
-     * @param array $data Data to format.
-     * @param int $level Specifies the level of array value.
-     * @return string Returns the INI file string.
-     */
-    public static function formatIniString($data, $level = 1)
-    {
-        $content = null;
-        $sections = [];
-
-        foreach ($data as $key => $value) {
-            if (is_array($value)) {
-                if ($level == 1) {
-                    $sections[$key] = self::formatIniString($value, $level+1);
-                }
-                else {
-                    foreach ($value as $val) {
-                        $content .= $key.'[] = "'.self::escapeIniString($val).'"'.PHP_EOL;
-                    }
-                }
-            }
-            elseif (strlen($value)) {
-                $content .= $key.' = "'.self::escapeIniString($value).'"'.PHP_EOL;
-            }
-        }
-
-        foreach ($sections as $key => $section) {
-            $content .= PHP_EOL.'['.$key.']'.PHP_EOL.$section.PHP_EOL;
-        }
-
-        return trim($content);
-    }
-
-    /**
-     * Escapes a string for saving in INI format
-     * @param string $string Specifies the string to escape
-     * @return string Returns the processed string
-     */
-    public static function escapeIniString($string)
-    {
-        return str_replace('"', '\"', $string);
-    }
 }
diff --git a/modules/system/assets/ui/js/input.trigger.js b/modules/system/assets/ui/js/input.trigger.js
index 1e63ea0d6..af4f62189 100644
--- a/modules/system/assets/ui/js/input.trigger.js
+++ b/modules/system/assets/ui/js/input.trigger.js
@@ -11,9 +11,6 @@
 
         this.options = options || {};
 
-        // @deprecated remove if year >= 2016
-        if (this.options.triggerType !== false && this.options.triggerAction === false) this.options.triggerAction = this.options.triggerType
-
         if (this.options.triggerCondition === false)
             throw new Error('Trigger condition is not specified.')
 
diff --git a/modules/system/providers.php b/modules/system/providers.php
index 9dd2df7ed..fa7636402 100644
--- a/modules/system/providers.php
+++ b/modules/system/providers.php
@@ -27,12 +27,12 @@ return [
     'October\Rain\Foundation\Providers\ArtisanServiceProvider',
     'October\Rain\Database\DatabaseServiceProvider',
     'October\Rain\Filesystem\FilesystemServiceProvider',
+    'October\Rain\Parse\ParseServiceProvider',
     'October\Rain\Html\HtmlServiceProvider',
     'October\Rain\Html\UrlServiceProvider',
     'October\Rain\Network\NetworkServiceProvider',
     'October\Rain\Scaffold\ScaffoldServiceProvider',
     'October\Rain\Flash\FlashServiceProvider',
     'October\Rain\Mail\MailServiceProvider',
-    'October\Rain\Parse\ParseServiceProvider',
 
 ];
diff --git a/tests/fixtures/cms/filehelper/sections.ini b/tests/fixtures/cms/filehelper/sections.ini
deleted file mode 100644
index b5f310f2a..000000000
--- a/tests/fixtures/cms/filehelper/sections.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-var1 = "value 1"
-var2 = "value 21"
-
-[section]
-sectionVar1 = "section value 1"
-sectionVar2 = "section value 2"
-
-[section data]
-sectionVar3 = "section value 3"
-sectionVar4 = "section value 4"
\ No newline at end of file
diff --git a/tests/fixtures/cms/filehelper/simple.ini b/tests/fixtures/cms/filehelper/simple.ini
deleted file mode 100644
index 73da84056..000000000
--- a/tests/fixtures/cms/filehelper/simple.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-var1 = "value 1"
-var2 = "value 21"
\ No newline at end of file
diff --git a/tests/fixtures/cms/filehelper/subsections.ini b/tests/fixtures/cms/filehelper/subsections.ini
deleted file mode 100644
index 07984e675..000000000
--- a/tests/fixtures/cms/filehelper/subsections.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-var1 = "value 1"
-var2 = "value 21"
-
-[section]
-sectionVar1 = "section value 1"
-sectionVar2 = "section value 2"
-subsection[] = "subsection value 1"
-subsection[] = "subsection value 2"
-sectionVar3 = "section value 3"
-
-[section data]
-sectionVar3 = "section value 3"
-sectionVar4 = "section value 4"
-subsection[] = "subsection value 1"
-subsection[] = "subsection value 2"
\ No newline at end of file
diff --git a/tests/unit/cms/classes/FileHelperTest.php b/tests/unit/cms/classes/FileHelperTest.php
deleted file mode 100644
index 43f7f6ae4..000000000
--- a/tests/unit/cms/classes/FileHelperTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-use Cms\Classes\FileHelper;
-
-class FileHelperTest extends TestCase
-{
-    public function testValidateName()
-    {
-        $this->assertFalse(FileHelper::validateName(''));
-        $this->assertTrue(FileHelper::validateName('01test-testdat'));
-        $this->assertTrue(FileHelper::validateName('test/testdat'));
-        $this->assertFalse(FileHelper::validateName('test\testdat'));
-        $this->assertTrue(FileHelper::validateName('01test-test.dat'));
-        $this->assertFalse(FileHelper::validateName('test@test.dat'));
-        $this->assertFalse(FileHelper::validateName('test::test'));
-        $this->assertFalse(FileHelper::validateName('@test'));
-    }
-
-    public function testFormatIniString()
-    {
-        $data = [
-            'var1'=>'value 1',
-            'var2'=>'value 21'
-        ];
-
-        $path = base_path().'/tests/fixtures/cms/filehelper/simple.ini';
-        $this->assertFileExists($path);
-
-        $str = FileHelper::formatIniString($data);
-        $this->assertNotEmpty($str);
-        $this->assertEquals($this->getContents($path), $str);
-
-        $data = [
-            'section' => [
-                'sectionVar1' => 'section value 1',
-                'sectionVar2' => 'section value 2'
-            ],
-            'section data' => [
-                'sectionVar3' => 'section value 3',
-                'sectionVar4' => 'section value 4'
-            ],
-            'var1'=>'value 1',
-            'var2'=>'value 21'
-        ];
-
-        $path = base_path().'/tests/fixtures/cms/filehelper/sections.ini';
-        $this->assertFileExists($path);
-
-        $str = FileHelper::formatIniString($data);
-        $this->assertEquals($this->getContents($path), $str);
-
-        $data = [
-            'section' => [
-                'sectionVar1' => 'section value 1',
-                'sectionVar2' => 'section value 2',
-                'subsection' => [
-                    'subsectionVar1' => 'subsection value 1',
-                    'subsectionVar2' => 'subsection value 2'
-                ],
-                'sectionVar3' => 'section value 3'
-            ],
-            'section data' => [
-                'sectionVar3' => 'section value 3',
-                'sectionVar4' => 'section value 4',
-                'subsection' => [
-                    'subsectionVar1' => 'subsection value 1',
-                    'subsectionVar2' => 'subsection value 2'
-                ]
-            ],
-            'var1'=>'value 1',
-            'var2'=>'value 21'
-        ];
-
-        $path = base_path().'/tests/fixtures/cms/filehelper/subsections.ini';
-        $this->assertFileExists($path);
-
-        $str = FileHelper::formatIniString($data);
-        $this->assertEquals($this->getContents($path), $str);
-   }
-
-   //
-   // Helpers
-   //
-
-   protected function getContents($path)
-   {
-        $content = file_get_contents($path);
-        $content = preg_replace('~\R~u', PHP_EOL, $content); // Normalize EOL
-        return $content;
-   }
-
-}
diff --git a/tests/unit/cms/helpers/FileTest.php b/tests/unit/cms/helpers/FileTest.php
new file mode 100644
index 000000000..dde19f0c3
--- /dev/null
+++ b/tests/unit/cms/helpers/FileTest.php
@@ -0,0 +1,18 @@
+<?php
+
+use Cms\Helpers\File as FileHelper;
+
+class FileTest extends TestCase
+{
+    public function testValidateName()
+    {
+        $this->assertFalse(FileHelper::validateName(''));
+        $this->assertTrue(FileHelper::validateName('01test-testdat'));
+        $this->assertTrue(FileHelper::validateName('test/testdat'));
+        $this->assertFalse(FileHelper::validateName('test\testdat'));
+        $this->assertTrue(FileHelper::validateName('01test-test.dat'));
+        $this->assertFalse(FileHelper::validateName('test@test.dat'));
+        $this->assertFalse(FileHelper::validateName('test::test'));
+        $this->assertFalse(FileHelper::validateName('@test'));
+    }
+}

From 8e986c42b1d1b8100abb406a61a25ec34caada9a Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 3 Oct 2015 07:31:01 +1000
Subject: [PATCH 088/103] Remove some deprecated code

---
 modules/system/partials/_settings_menu.htm |  8 +-------
 tests/unit/cms/classes/ControllerTest.php  | 11 -----------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/modules/system/partials/_settings_menu.htm b/modules/system/partials/_settings_menu.htm
index 0fa6a1367..67a25b2e0 100644
--- a/modules/system/partials/_settings_menu.htm
+++ b/modules/system/partials/_settings_menu.htm
@@ -1,10 +1,4 @@
 <?php
     $systemItems = System\Classes\SettingsManager::instance()->listItems('system');
-
-    // @todo Trialing the removal of this due to the new account menu
-    // @deprecated Remove if year >= 2016
-    $mySettingItems = []; //System\Classes\SettingsManager::instance()->listItems('mysettings');
 ?>
-<?php /* @deprecated Remove if year >= 2016 */ ?>
-<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $mySettingItems]); ?>
-<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $systemItems]); ?>
\ No newline at end of file
+<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items' => $systemItems]); ?>
diff --git a/tests/unit/cms/classes/ControllerTest.php b/tests/unit/cms/classes/ControllerTest.php
index e15220c1d..0c60429e8 100644
--- a/tests/unit/cms/classes/ControllerTest.php
+++ b/tests/unit/cms/classes/ControllerTest.php
@@ -189,17 +189,6 @@ class ControllerTest extends TestCase
         $theme = Theme::load('test');
         $controller = new Controller($theme);
         $controller->run('/ajax-test');
-
-        //
-        // This was the old approach, can remove this comment block if year >= 2017
-        //
-
-        // $response = $controller->run('/ajax-test');
-        // $this->assertInstanceOf('Symfony\Component\HttpFoundation\Response', $response);
-
-        // $this->assertInternalType('string', $response->getOriginalContent());
-        // $this->assertEquals(500, $response->getStatusCode());
-        // $this->assertEquals("AJAX handler 'onNoHandler' was not found.", $response->getOriginalContent());
     }
 
     /**

From 1847018b99a9b1d3d4893372fd71052bef6a06b6 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 3 Oct 2015 08:52:52 +1000
Subject: [PATCH 089/103] Switch to October flavored INI

---
 modules/cms/classes/SectionParser.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/cms/classes/SectionParser.php b/modules/cms/classes/SectionParser.php
index a9e913684..a0b26de07 100644
--- a/modules/cms/classes/SectionParser.php
+++ b/modules/cms/classes/SectionParser.php
@@ -1,5 +1,6 @@
 <?php namespace Cms\Classes;
 
+use Ini;
 use Str;
 
 /**
@@ -46,7 +47,7 @@ class SectionParser
         ];
 
         if ($count >= 3) {
-            $result['settings'] = parse_ini_string($sections[0], true);
+            $result['settings'] = Ini::parse($sections[0], true);
             $result['code'] = $sections[1];
 
             $result['code'] = preg_replace('/^\s*\<\?php/', '', $result['code']);
@@ -56,7 +57,7 @@ class SectionParser
             $result['markup'] = $sections[2];
         }
         elseif ($count == 2) {
-            $result['settings'] = parse_ini_string($sections[0], true);
+            $result['settings'] = Ini::parse($sections[0], true);
             $result['markup'] = $sections[1];
         }
         elseif ($count == 1) {

From 54985fcd10d808d09695b0a6f5d9568241a3cfa0 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 3 Oct 2015 11:41:40 +1000
Subject: [PATCH 090/103] * Build 300

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9874e1d6..39acb61fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
-* **Build 300** (2015-10-xx)
-  - Added new helper `Twig::parse` for parsing Twig.
+* **Build 300** (2015-10-03)
+  - **Happy 2nd Birthday October!**
   - Page settings now support infinite array nesting with October flavored INI syntax via `Ini::parse` and `Ini::render`.
+  - Added new helper `Twig::parse` for parsing Twig (see Services > Parser docs).
 
 * **Build 298** (2015-09-24)
   - Added the ability to use a wildcard URL parameter in CMS pages (see CMS > Pages docs).

From 19adf61c5e24423023afac8a20b3a1482db9f063 Mon Sep 17 00:00:00 2001
From: Sajjad <sajjad.servatjoo@gmail.com>
Date: Sat, 3 Oct 2015 12:36:57 +0330
Subject: [PATCH 091/103] Update Persian language

---
 modules/backend/lang/fa/lang.php      | 393 ++++++++++++++------------
 modules/cms/lang/fa/lang.php          |   6 +-
 modules/system/lang/fa/client.php     |  57 ++++
 modules/system/lang/fa/lang.php       |  45 ++-
 modules/system/lang/fa/validation.php |  24 +-
 5 files changed, 319 insertions(+), 206 deletions(-)
 create mode 100644 modules/system/lang/fa/client.php

diff --git a/modules/backend/lang/fa/lang.php b/modules/backend/lang/fa/lang.php
index 73c85acbe..6edd19772 100644
--- a/modules/backend/lang/fa/lang.php
+++ b/modules/backend/lang/fa/lang.php
@@ -5,267 +5,284 @@ return [
         'title' => 'بخش مدیریت',
     ],
     'field' => [
-        'invalid_type'              => 'نوع فیلد :type نا معتبر می باشد.',
+        'invalid_type' => 'نوع فیلد :type نا معتبر می باشد.',
         'options_method_not_exists' => 'کلاس مدل :model باید شامل متد :method() باشد و گزینه های مورد نیاز ":field" را بازگرداند.',
     ],
     'widget' => [
         'not_registered' => "کلاس مربوط به ابزارک ':name' به سیستم معرفی نشده است",
-        'not_bound'      => "ابزارکی تعریف شده در کلاس با نام ':name' به هیچ کنترلری ارتباط داده نشده است",
+        'not_bound' => "ابزارکی تعریف شده در کلاس با نام ':name' به هیچ کنترلری ارتباط داده نشده است",
     ],
     'page' => [
-        'untitled'      => "بدون عنوان",
+        'untitled' => "بدون عنوان",
         'access_denied' => [
-            'label'    => "شما مجوز دسترسی ندارید",
-            'help'     => "شما مجوز لازم براس دسترسی به این صفحه را ندارید.",
+            'label' => "شما مجوز دسترسی ندارید",
+            'help' => "شما مجوز لازم براس دسترسی به این صفحه را ندارید.",
             'cms_link' => "بازگشت به مدیریت",
+        ],
+        'invalid_token' => [
+            'label' => 'کلید امنیتی معتبر نمی باشد'
         ]
     ],
     'partial' => [
         'not_found_name' => "بخشی با نام ':name' یافت نشد.",
     ],
     'account' => [
-        'sign_out'             => 'خروج',
-        'login'                => 'ورود',
-        'reset'                => 'تنظیم مجدد',
-        'restore'              => 'بازگرداندن',
-        'login_placeholder'    => 'ورود',
+        'sign_out' => 'خروج',
+        'login' => 'ورود',
+        'reset' => 'تنظیم مجدد',
+        'restore' => 'بازگرداندن',
+        'login_placeholder' => 'ورود',
         'password_placeholder' => 'کلمه عبور',
-        'forgot_password'      => "کلمه عبور خود را فراموش کرده اید؟",
-        'enter_email'          => "پست الکترونیکی خود را وارد نمایید",
-        'enter_login'          => "نام کاربری خود را وارد نمایید",
-        'email_placeholder'    => "پست الکترونیکی",
-        'enter_new_password'   => "کلمه عبور جدید را وارد نمایید",
-        'password_reset'       => "بازگرداندن کلمه عبور",
-        'restore_success'      => "یک نامه به پست الکترونیکی شما جهت شروع عملیات بارگرداندن کلمه عبور ارسال شد.",
-        'restore_error'        => "کاربری با نام کاریری ':login' یافت نشد.",
-        'reset_success'        => "کلمه عبور شما بارگردانی شد و شما هم اکنون میتوانید وارد سیستم شوید.",
-        'reset_error'          => "اطلاعات رمز عبور نا معتبر است , لطفا مجددا تلاش نمایید!",
-        'reset_fail'           => "عدم توانایی در بازگرداندن کلمه عبور شما!",
-        'apply'                => 'اعمال کردن',
-        'cancel'               => 'انصراف',
-        'delete'               => 'حذف',
-        'ok'                   => 'تایید',
+        'forgot_password' => "کلمه عبور خود را فراموش کرده اید؟",
+        'enter_email' => "پست الکترونیکی خود را وارد نمایید",
+        'enter_login' => "نام کاربری خود را وارد نمایید",
+        'email_placeholder' => "پست الکترونیکی",
+        'enter_new_password' => "کلمه عبور جدید را وارد نمایید",
+        'password_reset' => "بازگرداندن کلمه عبور",
+        'restore_success' => "یک نامه به پست الکترونیکی شما جهت شروع عملیات بارگرداندن کلمه عبور ارسال شد.",
+        'restore_error' => "کاربری با نام کاریری ':login' یافت نشد.",
+        'reset_success' => "کلمه عبور شما بارگردانی شد و شما هم اکنون میتوانید وارد سیستم شوید.",
+        'reset_error' => "اطلاعات رمز عبور نا معتبر است , لطفا مجددا تلاش نمایید!",
+        'reset_fail' => "عدم توانایی در بازگرداندن کلمه عبور شما!",
+        'apply' => 'اعمال کردن',
+        'cancel' => 'انصراف',
+        'delete' => 'حذف',
+        'ok' => 'تایید',
     ],
     'dashboard' => [
-        'menu_label'                   => 'میز کار',
-        'widget_label'                 => 'ابزارک',
-        'widget_width'                 => 'عرض',
-        'full_width'                   => 'عرض کامل',
-        'add_widget'                   => 'افزودن ابزارک',
-        'widget_inspector_title'       => 'تنظیمات ابزارک',
+        'menu_label' => 'میز کار',
+        'widget_label' => 'ابزارک',
+        'widget_width' => 'عرض',
+        'full_width' => 'عرض کامل',
+        'add_widget' => 'افزودن ابزارک',
+        'widget_inspector_title' => 'تنظیمات ابزارک',
         'widget_inspector_description' => 'پیکر بندی ابزارک گزارشگیری',
-        'widget_columns_label'         => 'عرض :columns',
-        'widget_columns_description'   => 'عرض ابزارک باید عددی مابین 1 تا 10 باشد.',
-        'widget_columns_error'         => 'لطفا عرض ابزارک را عددی مابین 1 تا 10 وارد نمایید.',
-        'columns'                      => '{1} ستون|[2,Inf] ستون ها',
-        'widget_new_row_label'         => 'تحمیل سطر جدید',
-        'widget_new_row_description'   => 'افزودن ابزارک در سطر جدید.',
-        'widget_title_label'           => 'عنوان ابزارک',
-        'widget_title_error'           => 'گزینه "عنوان ابزارک" حتما باید وارد شود.',
-        'status'                       => [
+        'widget_columns_label' => 'عرض :columns',
+        'widget_columns_description' => 'عرض ابزارک باید عددی مابین 1 تا 10 باشد.',
+        'widget_columns_error' => 'لطفا عرض ابزارک را عددی مابین 1 تا 10 وارد نمایید.',
+        'columns' => '{1} ستون|[2,Inf] ستون ها',
+        'widget_new_row_label' => 'تحمیل سطر جدید',
+        'widget_new_row_description' => 'افزودن ابزارک در سطر جدید.',
+        'widget_title_label' => 'عنوان ابزارک',
+        'widget_title_error' => 'گزینه "عنوان ابزارک" حتما باید وارد شود.',
+        'status' => [
             'widget_title_default' => 'وضعیت سیستم',
-            'online'               => 'online',
+            'online' => 'online',
             'maintenance' => 'در حال به روز رسانی',
-            'update_available'     => '{0} به روز رسانی موجود است!|{1} به روز رسانی موجود است!|[2,Inf] به روز رسانی موجود است!',
+            'update_available' => '{0} به روز رسانی موجود است!|{1} به روز رسانی موجود است!|[2,Inf] به روز رسانی موجود است!',
         ]
     ],
     'user' => [
-        'name'                  => 'مدیریت',
-        'menu_label'            => 'مدیران',
-        'menu_description'      => 'مدیریت کاربران , گروه ها و دسترسی های مدیران.',
-        'list_title'            => 'مدیریت مدیران',
-        'new'                   => 'مدیر جدید',
-        'login'                 => "ورود",
-        'first_name'            => "نام",
-        'last_name'             => "نام خانوادگی",
-        'full_name'             => "نام کامل",
-        'email'                 => "پست الکترونیکی",
-        'groups'                => "گروه ها",
-        'groups_comment'        => "مختص گروهی که این شخص به آن تعلق دارد.",
-        'avatar'                => "نمایه",
-        'password'              => "کلمه عبور",
+        'name' => 'مدیریت',
+        'menu_label' => 'مدیران',
+        'menu_description' => 'مدیریت کاربران , گروه ها و دسترسی های مدیران.',
+        'list_title' => 'مدیریت مدیران',
+        'new' => 'مدیر جدید',
+        'login' => "ورود",
+        'first_name' => "نام",
+        'last_name' => "نام خانوادگی",
+        'full_name' => "نام کامل",
+        'email' => "پست الکترونیکی",
+        'groups' => "گروه ها",
+        'groups_comment' => "مختص گروهی که این شخص به آن تعلق دارد.",
+        'avatar' => "نمایه",
+        'password' => "کلمه عبور",
         'password_confirmation' => "تکرار کلمه عبور",
         'permissions' => 'مجوز های دسترسی',
         'account' => 'حساب کاربری',
-        'superuser'             => "کاربر ممتاز",
-        'superuser_comment'     => "اگر میخواهید این شخص به تمام قسمت ها دسترسی داشته باشد این گزینه را فعال نمایید.",
-        'send_invite'           => 'دعوت نامه توسط پست الکترونیکی ارسال شود',
-        'send_invite_comment'   => 'جهت ارسال دعوت نامه به پست الکترونیکی این شخص این گزینه را فعال نمایید',
-        'delete_confirm'        => 'آیا از حذف این مدیر اطمینان دارید؟',
-        'return'                => 'بازگشت به لیست مدیران',
-        'allow'                 => 'اجازه دسترسی',
-        'inherit'               => 'ارث بری',
-        'deny'                  => 'عدم دسترسی',
-        'group'                 => [
-            'name'           => 'گروه',
-            'name_field'     => 'نام',
+        'superuser' => "کاربر ممتاز",
+        'superuser_comment' => "اگر میخواهید این شخص به تمام قسمت ها دسترسی داشته باشد این گزینه را فعال نمایید.",
+        'send_invite' => 'دعوت نامه توسط پست الکترونیکی ارسال شود',
+        'send_invite_comment' => 'جهت ارسال دعوت نامه به پست الکترونیکی این شخص این گزینه را فعال نمایید',
+        'delete_confirm' => 'آیا از حذف این مدیر اطمینان دارید؟',
+        'return' => 'بازگشت به لیست مدیران',
+        'allow' => 'اجازه دسترسی',
+        'inherit' => 'ارث بری',
+        'deny' => 'عدم دسترسی',
+        'group' => [
+            'name' => 'گروه',
+            'name_field' => 'نام',
             'description_field' => 'توضیحات',
             'is_new_user_default_field' => 'بطور پیشفرض مدیران جدید را در این گروه ایجاد کن.',
             'code_field' => 'کد',
             'code_comment' => 'کد یکتایی را جهت دسترسی به آن توسط API وارد نمایید.',
             'menu_label' => 'گروه ها',
-            'list_title'     => 'مدیریت گروه ها',
-            'new'            => 'گروه مدیریت جدید',
+            'list_title' => 'مدیریت گروه ها',
+            'new' => 'گروه مدیریت جدید',
             'delete_confirm' => 'آیا از حذف این گروه از مدیران اطمینان دارید?',
-            'return'         => 'بازگشت به لیست گروه ها',
+            'return' => 'بازگشت به لیست گروه ها',
+            'users_count' => 'کاربران'
         ],
         'preferences' => [
             'not_authenticated' => 'هیچ کاربر ثبت شده ای جهت بارگذاری یا ذخیره تنظیمات وجود ندارد.'
         ]
     ],
     'list' => [
-        'default_title'           => 'لیست',
-        'search_prompt'           => 'جستجو...',
-        'no_records'              => 'چیزی یافت نشد.',
-        'missing_model'           => 'هیچ مدلی برای لیست استفاده شده در کلاس :class تعریف نشده است.',
-        'missing_column'          => 'ستونی برای :columns تعریف نشده است.',
-        'missing_columns'         => 'ستونی برای لیست عریف شده در :class موجود نیست.',
-        'missing_definition'      => "در لیست تعریف شده ستونی برای ':field' موجود نیست.",
-        'behavior_not_ready'      => 'لسیت مقدار دهی اولیه شده است ، لطفا بررسی نمایید که متد makeLists() در کنترلر خود فراخوانی کرده باشید.',
+        'default_title' => 'لیست',
+        'search_prompt' => 'جستجو...',
+        'no_records' => 'چیزی یافت نشد.',
+        'missing_model' => 'هیچ مدلی برای لیست استفاده شده در کلاس :class تعریف نشده است.',
+        'missing_column' => 'ستونی برای :columns تعریف نشده است.',
+        'missing_columns' => 'ستونی برای لیست عریف شده در :class موجود نیست.',
+        'missing_definition' => "در لیست تعریف شده ستونی برای ':field' موجود نیست.",
+        'behavior_not_ready' => 'لسیت مقدار دهی اولیه شده است ، لطفا بررسی نمایید که متد makeLists() در کنترلر خود فراخوانی کرده باشید.',
         'invalid_column_datetime' => "ستون ':column' از نوع شی تاریخ نمی باشد ، لطفا بررسی نمایید که این ستون در مدل از نوع تاریخ تعریف شده باشد.",
-        'pagination'              => 'نمایش :from تا :to از :total مورد',
-        'prev_page'               => 'صفحه قبل',
-        'next_page'               => 'صفحه بعد',
-        'loading'                 => 'در حال بارگذاری...',
-        'setup_title'             => 'راه اندازی لیست',
-        'setup_help'              => 'ستون هایی را که میخواهید مشاهده نمایید را انتخاب نمایید. میتوانید محل قرار گیری ستونها را با جابجا نمودن آنها به .',
-        'records_per_page'        => 'مورد در هر صفحه',
-        'records_per_page_help'   => 'تعداد موارد نمایش داده شده در هر صفحه را انتخاب نمایید. لطفا توجه نمایید نمایش تعداد زیادی از موارد در هر صفحه از کارایی سیستم میکاهد.',
-         'delete_selected' => 'حذف انتخاب شده ها',
+        'pagination' => 'نمایش :from تا :to از :total مورد',
+        'prev_page' => 'صفحه قبل',
+        'next_page' => 'صفحه بعد',
+        'loading' => 'در حال بارگذاری...',
+        'setup_title' => 'راه اندازی لیست',
+        'setup_help' => 'ستون هایی را که میخواهید مشاهده نمایید را انتخاب نمایید. میتوانید محل قرار گیری ستونها را با جابجا نمودن آنها به .',
+        'records_per_page' => 'مورد در هر صفحه',
+        'records_per_page_help' => 'تعداد موارد نمایش داده شده در هر صفحه را انتخاب نمایید. لطفا توجه نمایید نمایش تعداد زیادی از موارد در هر صفحه از کارایی سیستم میکاهد.',
+        'delete_selected' => 'حذف انتخاب شده ها',
         'delete_selected_empty' => 'مورد جهت حذف انتخاب نشده است.',
         'delete_selected_confirm' => 'آیا میخواهید موارد انتخابی را حذف کنید؟',
         'delete_selected_success' => 'حدف موارد انخابی انجام شد.',
     ],
     'fileupload' => [
-        'attachment'        => 'فایل ضمیمه',
-        'help'              => 'برای فایل ضمیمه عنوان و توضیح مختصری وارد نمایید.',
-        'title_label'       => 'عنوان',
-        'description_label' => 'توضیحات'
+        'attachment' => 'فایل ضمیمه',
+        'help' => 'برای فایل ضمیمه عنوان و توضیح مختصری وارد نمایید.',
+        'title_label' => 'عنوان',
+        'description_label' => 'توضیحات',
+        'default_prompt' => 'فایل  را جهت ارسال به این نقطه بکشید و یا %s را کلیک کنیید',
+        'attachment_url' => 'آدرس پیوست',
+        'upload_file' => 'ارسال فایل',
+        'upload_error' => 'خطا در ارسال فایل',
+        'remove_confirm' => 'آیا اطمینان دارید؟',
+        'remove_file' => 'حذف فایل'
     ],
     'form' => [
-        'create_title'                         => ":name جدید",
-        'update_title'                         => "ویرایش :name",
-        'preview_title'                        => "پیش نمایش :name",
-        'create_success'                       => ':name با موفقیت ایجاد شد.',
-        'update_success'                       => ':name با موفقیت به روز رسانی شد.',
-        'delete_success'                       => ':name با موفقیت حذف شد.',
-        'missing_id'                           => "رکورد مشخصه (ID) برای فرم انتخاب نشده است.",
-        'missing_model'                        => 'مدلی برای فرن تعریف شده در کلاس :class مشخص نشده است.',
-        'missing_definition'                   => "فرم مورد نظر شامل فیلدی برای ':field' نمی باشد.",
-        'not_found'                            => 'فرمی با مشخصه :id یافت نشد.',
-        'action_confirm'                       => "آیا اطمینان دارید؟",
-        'create'                               => 'ایجاد',
-        'create_and_close'                     => 'ایجاد و خروج',
-        'creating'                             => 'در حال ایجاد...',
-        'creating_name'                        => 'درحال ایجاد :name...',
-        'save'                                 => 'ذخیره',
-        'save_and_close'                       => 'ذخیره و خروج',
-        'saving'                               => 'در حال ذخیره...',
-        'saving_name'                          => 'درحال ذخیره :name...',
-        'delete'                               => 'حذف',
-        'deleting'                             => 'در حال حذف...',
-        'deleting_name'                        => 'درحال حذف :name...',
+        'create_title' => ":name جدید",
+        'update_title' => "ویرایش :name",
+        'preview_title' => "پیش نمایش :name",
+        'create_success' => ':name با موفقیت ایجاد شد.',
+        'update_success' => ':name با موفقیت به روز رسانی شد.',
+        'delete_success' => ':name با موفقیت حذف شد.',
+        'missing_id' => "رکورد مشخصه (ID) برای فرم انتخاب نشده است.",
+        'missing_model' => 'مدلی برای فرن تعریف شده در کلاس :class مشخص نشده است.',
+        'missing_definition' => "فرم مورد نظر شامل فیلدی برای ':field' نمی باشد.",
+        'not_found' => 'فرمی با مشخصه :id یافت نشد.',
+        'action_confirm' => "آیا اطمینان دارید؟",
+        'create' => 'ایجاد',
+        'create_and_close' => 'ایجاد و خروج',
+        'creating' => 'در حال ایجاد...',
+        'creating_name' => 'درحال ایجاد :name...',
+        'save' => 'ذخیره',
+        'save_and_close' => 'ذخیره و خروج',
+        'saving' => 'در حال ذخیره...',
+        'saving_name' => 'درحال ذخیره :name...',
+        'delete' => 'حذف',
+        'deleting' => 'در حال حذف...',
+        'deleting_name' => 'درحال حذف :name...',
         'reset_default' => 'بازگشت به پیش فرض',
         'resetting' => 'بازگذاری مجدد',
         'resetting_name' => 'بارگذاری :name',
-        'undefined_tab'                        => 'متفرقه',
-        'field_off'                            => 'خاموش',
-        'field_on'                             => 'روشن',
-        'add'                                  => 'افزودن',
-        'apply'                                => 'اعمال',
-        'cancel'                               => 'انصراف',
-        'close'                                => 'خروج',
-        'confirm'                              => 'تایید',
-        'reload'                               => 'بارگذاری مجدد',
-        'ok'                                   => 'تایید',
-        'or'                                   => 'یا',
-        'confirm_tab_close'                    => 'در صورت بستن این پنجره موارد ذخیره نشده از بین خواهند رفت. آیا از حذف شدن این پنجره اطمینان دارید؟',
-        'behavior_not_ready'                   => 'فرم مور نظر مقدار دهی اولیه نشده است ، بررسی کنید که متد initForm() در کنترلر فرتخوانی شده باشد.',
-        'preview_no_files_message'             => 'فایل ها ارسال نشدند',
-        'select'                               => 'انتخاب',
-        'select_all'                           => 'همه',
-        'select_none'                          => 'هیچ',
-        'select_placeholder'                   => 'لطفا انتخاب نمایید',
-        'insert_row'                           => 'افزودن سطر',
-        'delete_row'                           => 'حذف سطر',
-        'concurrency_file_changed_title'       => 'فایل تغییر کرد',
+        'undefined_tab' => 'متفرقه',
+        'field_off' => 'خاموش',
+        'field_on' => 'روشن',
+        'add' => 'افزودن',
+        'apply' => 'اعمال',
+        'cancel' => 'انصراف',
+        'close' => 'خروج',
+        'confirm' => 'تایید',
+        'reload' => 'بارگذاری مجدد',
+        'complete' => 'تکمیل',
+        'ok' => 'تایید',
+        'or' => 'یا',
+        'confirm_tab_close' => 'در صورت بستن این پنجره موارد ذخیره نشده از بین خواهند رفت. آیا از حذف شدن این پنجره اطمینان دارید؟',
+        'behavior_not_ready' => 'فرم مور نظر مقدار دهی اولیه نشده است ، بررسی کنید که متد initForm() در کنترلر فرتخوانی شده باشد.',
+        'preview_no_files_message' => 'فایلی جهت ارسال وجود ندارد',
+        'preview_no_record_message' => 'موردی انتخاب نشده است',
+        'select' => 'انتخاب',
+        'select_all' => 'همه',
+        'select_none' => 'هیچ',
+        'select_placeholder' => 'لطفا انتخاب نمایید',
+        'insert_row' => 'افزودن سطر',
+        'delete_row' => 'حذف سطر',
+        'concurrency_file_changed_title' => 'فایل تغییر کرد',
         'concurrency_file_changed_description' => 'فایلی که شما ویرایش کردید توسط کاربر دیگری تغییر یافته و ذخیره شده است. شما میتوانید فایل را مجددا بارگذاری نمایید و تغییراتی که اعمال کرده اید را از دست بدهید و یا تغییرات اعمال شده توسط آن کاربر را بین برده و فایل را بازنویسی نمایید.',
     ],
     'relation' => [
-        'missing_config' => "Relation behavior does not have any configuration for ':config'.",
-        'missing_definition'    => "در ارتباط مورد نظر فیلد ':field' وجود ندارد.",
-        'missing_model'         => "مدلی برای ارتباط موجود در :class وجود ندارد.",
+        'missing_config' => "کنترل کننده ارتباطات پایگاه داده شامل تعریفی برای ':config' نمی باشد.",
+        'missing_definition' => "در ارتباط مورد نظر فیلد ':field' وجود ندارد.",
+        'missing_model' => "مدلی برای ارتباط موجود در :class وجود ندارد.",
         'invalid_action_single' => "این عمل در ارتباط یک تعرفه نمبتواند اعمال شود.",
-        'invalid_action_multi'  => "این عمل در ارتباط چند طرفه نمیتواند اعمال شود.",
-        'help'                  => "بر روی یک گزینه کلیک کنید تا افزوده شود",
-        'related_data'          => "اعلاعات :name مرتبط",
-        'add'                   => "افزودن",
-        'add_selected'          => "افرودن انتخاب شده ها",
-        'add_a_new'             => ":name جدید",
+        'invalid_action_multi' => "این عمل در ارتباط چند طرفه نمیتواند اعمال شود.",
+        'help' => "بر روی یک گزینه کلیک کنید تا افزوده شود",
+        'related_data' => "اعلاعات :name مرتبط",
+        'add' => "افزودن",
+        'add_selected' => "افرودن انتخاب شده ها",
+        'add_a_new' => ":name جدید",
         'link_selected' => "لینک انتخاب شده ها",
         'link_a_new' => "لینک :name جدید",
-        'cancel'                => "انصراف",
+        'cancel' => "انصراف",
         'close' => "بستن",
-        'add_name'              => "افزودن :name",
-        'create'                => "ایجاد",
-        'create_name'           => "ایجاد :name",
-        'update'                => "بروز رسانی",
-        'update_name'           => "بروز رسانی :name",
+        'add_name' => "افزودن :name",
+        'create' => "ایجاد",
+        'create_name' => "ایجاد :name",
+        'update' => "بروز رسانی",
+        'update_name' => "بروز رسانی :name",
         'preview' => "پیش نمایش",
         'preview_name' => "پیش نمایش :name",
-        'remove'                => "حذف",
-        'remove_name'           => "حذف :name",
-        'delete'                => "حذف",
-        'delete_name'           => "حذف :name",
-        'delete_confirm'        => "آیا اطمینان دارید؟",
+        'remove' => "حذف",
+        'remove_name' => "حذف :name",
+        'delete' => "حذف",
+        'delete_name' => "حذف :name",
+        'delete_confirm' => "آیا اطمینان دارید؟",
         'link' => "لینک",
         'link_name' => "لینک :name",
         'unlink' => "حذف لینک",
         'unlink_name' => "حذف لینک :name",
         'unlink_confirm' => "آبا اطمینان دارید؟",
     ],
+    'reorder' => [
+        'default_title' => 'مرتب سازی موارد',
+        'no_records' => 'موردی جهت مرتب سازی یافت نشد.',
+    ],
     'model' => [
-        'name'                   => "مدل",
-        'not_found'              => "مدل ':class' با مشخصه ی :id یافت نشد",
-        'missing_id'             => "مشخصه ای برای مودل مورد نظر یافت نشد.",
-        'missing_relation'       => "مدل ':class' شامل تعریفی از ':relation'.",
+        'name' => "مدل",
+        'not_found' => "مدل ':class' با مشخصه ی :id یافت نشد",
+        'missing_id' => "مشخصه ای برای مودل مورد نظر یافت نشد.",
+        'missing_relation' => "مدل ':class' شامل تعریفی از ':relation'.",
         'missing_method' => "مدل ':class' متدی با نام ':method' ندارد.",
-        'invalid_class'          => "مدل :model استفاده شده در :class معتبر نمی باشد، این مدل باید از کلاس \Model ارث برده باشد.",
+        'invalid_class' => "مدل :model استفاده شده در :class معتبر نمی باشد، این مدل باید از کلاس \Model ارث برده باشد.",
         'mass_assignment_failed' => "Mass assignment failed for Model attribute ':attribute'.",
     ],
     'warnings' => [
-        'tips'             => 'راهنمایی پیکر بندی سیستم',
+        'tips' => 'راهنمایی پیکر بندی سیستم',
         'tips_description' => 'مشکلاتی در پیکربندی سیستم وجود دارد، شما باید تنظیمات زیر را بررسی نمایید.',
-        'permissions'      => 'پوشه :name یا یکی از زیر پوشه های آن برای PHP قابل نوشتن نیستند. لطفا تنظیمات این پوشه را تعییر دهید.',
-        'extension'        => 'افزونه PHP با نام :name نصب نشده است. لطفن این افزونه را نصب کرده و فعال نمایید.'
+        'permissions' => 'پوشه :name یا یکی از زیر پوشه های آن برای PHP قابل نوشتن نیستند. لطفا تنظیمات این پوشه را تعییر دهید.',
+        'extension' => 'افزونه PHP با نام :name نصب نشده است. لطفن این افزونه را نصب کرده و فعال نمایید.'
     ],
     'editor' => [
-        'menu_label'            => 'تنظیمات ویرایشگر کد',
-        'menu_description'      => 'سفارشی سازی ویرایشگر کد، مانند اندازه فونت و رنگ بندی آن.',
-        'font_size'             => 'اندازه فونت',
-        'tab_size'              => 'اندازه کاراکتر TAB',
-        'use_hard_tabs'         => 'فاصله گذاری با استفاده از TAB',
-        'code_folding'          => 'بلاک بندی کدها',
-        'word_wrap'             => 'چیدمان کلمات',
+        'menu_label' => 'تنظیمات ویرایشگر کد',
+        'menu_description' => 'سفارشی سازی ویرایشگر کد، مانند اندازه فونت و رنگ بندی آن.',
+        'font_size' => 'اندازه فونت',
+        'tab_size' => 'اندازه کاراکتر TAB',
+        'use_hard_tabs' => 'فاصله گذاری با استفاده از TAB',
+        'code_folding' => 'بلاک بندی کدها',
+        'word_wrap' => 'چیدمان کلمات',
         'highlight_active_line' => 'مشخص نودن خط فعال',
-        'show_invisibles'       => 'نمایش کاراکتر های مخفی',
-        'show_gutter'           => 'نمایش نشانگر',
-        'theme'                 => 'رنگ بندی',
+        'auto_closing' => 'نشانه ها و کاراکترهای خاص بصورت خودکار بسته شوند',
+        'show_invisibles' => 'نمایش کاراکتر های مخفی',
+        'show_gutter' => 'نمایش نشانگر',
+        'theme' => 'رنگ بندی',
     ],
     'tooltips' => [
         'preview_website' => 'پیش نماسش وب سایت'
     ],
     'mysettings' => [
-        'menu_label'       => 'تنظیمات من',
+        'menu_label' => 'تنظیمات من',
         'menu_description' => 'تنظیمات مربوط به حساب کاربری شما',
     ],
     'myaccount' => [
-        'menu_label'       => 'حساب کاربری من',
+        'menu_label' => 'حساب کاربری من',
         'menu_description' => 'به روز رسانی اطلاعات حساب کار بری شما مانند نام و کلمه عبور و ... .',
-        'menu_keywords'    => 'ورود امن'
+        'menu_keywords' => 'ورود امن'
     ],
     'branding' => [
-        'menu_label'       => 'شخصی سازی بخش مدیریت',
+        'menu_label' => 'شخصی سازی بخش مدیریت',
         'menu_description' => 'شخصی سازی بخش مدیریت مانند نام، رنگ ها  و لوگو.',
         'brand' => 'برند',
         'logo' => 'لوگو',
@@ -283,21 +300,21 @@ return [
         'custom_stylesheet' => 'شیوه نامه های سفارشی'
     ],
     'backend_preferences' => [
-        'menu_label'       => 'تنظیمات مدیریت',
+        'menu_label' => 'تنظیمات مدیریت',
         'menu_description' => 'تنظیمات مربوط به زبان مربوط به قسمت مدیریت.',
-        'locale'           => 'زبان',
-        'locale_comment'   => 'زبان مورد نظر خود را انتخاب نمایید.',
+        'locale' => 'زبان',
+        'locale_comment' => 'زبان مورد نظر خود را انتخاب نمایید.',
     ],
     'access_log' => [
-        'hint'             => 'این لیست نشاندهنده ورود کاربران مدیر به سیستم می باشد. موارد برای مدت :days روز نگهداری می شوند.',
-        'menu_label'       => 'ثبت دسترسی ها',
+        'hint' => 'این لیست نشاندهنده ورود کاربران مدیر به سیستم می باشد. موارد برای مدت :days روز نگهداری می شوند.',
+        'menu_label' => 'ثبت دسترسی ها',
         'menu_description' => 'نمایش لیست ورود موفقیت آمیز کاربران مدیر.',
-        'created_at'       => 'زمان و تاریخ',
-        'login'            => 'ورود',
-        'ip_address'       => 'آدرس آی پی',
-        'first_name'       => 'نام',
-        'last_name'        => 'نام خوانوادگی',
-        'email'            => 'پست الکترونیکی',
+        'created_at' => 'زمان و تاریخ',
+        'login' => 'ورود',
+        'ip_address' => 'آدرس آی پی',
+        'first_name' => 'نام',
+        'last_name' => 'نام خوانوادگی',
+        'email' => 'پست الکترونیکی',
     ],
     'filter' => [
         'all' => 'همه'
diff --git a/modules/cms/lang/fa/lang.php b/modules/cms/lang/fa/lang.php
index 8c027bc34..4aeb187ad 100644
--- a/modules/cms/lang/fa/lang.php
+++ b/modules/cms/lang/fa/lang.php
@@ -231,7 +231,11 @@ return [
         'manage_pages' => 'مدیریت صفحات',
         'manage_layouts' => 'مدیریت طرح بندی ها',
         'manage_partials' => 'مدیریت بخش ها',
-        'manage_themes' => 'مدیریت قالب ها'
+        'manage_themes' => 'مدیریت قالب ها',
+        'manage_media' => 'مدیریت چند رسانه ها'
+    ],
+    'mediafinder' => [
+        'default_prompt' => '%s را جهت انتخاب فایل چند رسانه ای انتخاب کنید'
     ],
     'media' => [
         'invalid_path' => "آدرس فایل ':path' معتبر نیست.",
diff --git a/modules/system/lang/fa/client.php b/modules/system/lang/fa/client.php
new file mode 100644
index 000000000..895e569d4
--- /dev/null
+++ b/modules/system/lang/fa/client.php
@@ -0,0 +1,57 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Client-side Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | These are messages made available to the client browser via JavaScript.
+    | To compile this file run: php artisan october:util compile lang
+    |
+    */
+
+    'markdowneditor' => [
+        'formatting' => 'قالب بندی',
+        'quote' => 'نقل قول',
+        'code' => 'کد',
+        'header1' => 'سرخط 1',
+        'header2' => 'سرخط 2',
+        'header3' => 'سرخط 3',
+        'header4' => 'سرخط 4',
+        'header5' => 'سرخط 5',
+        'header6' => 'سرخط 6',
+        'bold' => 'ظخیم',
+        'italic' => 'مورب',
+        'unorderedlist' => 'لیست بدون ترتیب',
+        'orderedlist' => 'لیست با ترتیب',
+        'video' => 'ویدیو',
+        'image' => 'تصویر',
+        'link' => 'لینک',
+        'horizontalrule' => 'درج خط افقی',
+        'fullscreen' => 'تمام صفحه',
+        'preview' => 'پیش نمایش',
+    ],
+
+    'mediamanager' => [
+        'insert_link' => "درج آدرس رسانه",
+        'insert_image' => "درج تصویر",
+        'insert_video' => "درج ویدیو",
+        'insert_audio' => "درج صوت",
+        'invalid_file_empty_insert' => "لطفا فایلی را جهت درج لینک آن وارد نمایید",
+        'invalid_file_single_insert' => "لطفا یک فایل را وارد نمایید",
+        'invalid_image_empty_insert' => "لطفا تصویر(ها) را جهت درج انتخاب نمایید",
+        'invalid_video_empty_insert' => "لطفا ویدیو را جهت درج انتخاب نمایید.",
+        'invalid_audio_empty_insert' => "لطفا فایل صوتی را جهت درج انتخاب نمایید",
+    ],
+
+    'alert' => [
+        'confirm_button_text' => 'تایید',
+        'cancel_button_text' => 'انصراف',
+    ],
+
+];
+
+
+
diff --git a/modules/system/lang/fa/lang.php b/modules/system/lang/fa/lang.php
index 7e264e9e0..a32e937f4 100644
--- a/modules/system/lang/fa/lang.php
+++ b/modules/system/lang/fa/lang.php
@@ -6,9 +6,10 @@ return [
         'tagline' => 'بازگشت به گذشته',
     ],
     'locale' => [
-        'cs' => 'Czech',
+        'cs' => 'چک اسلواکی',
         'en' => 'انگلیسی',
         'de' => 'آلمانی',
+        'el' => 'یونانی',
         'es' => 'اسپانیایی',
         'es-ar' => 'اسپانیایی (آرژانتین)',
         'fa' => 'فارسی',
@@ -58,6 +59,7 @@ return [
         ]
     ],
     'theme' => [
+        'label' => 'قالب',
         'unnamed' => 'قالب بدون نام',
         'name' => [
             'label' => 'نام قالب',
@@ -73,6 +75,7 @@ return [
         'remove_confirm' => 'آیا از حذف این قالب اطمینان دارید؟',
     ],
     'plugin' => [
+        'label' => 'افزونه',
         'unnamed' => 'افزونه بدون نام',
         'name' => [
             'label' => 'نام افزونه',
@@ -93,6 +96,8 @@ return [
         'refresh' => 'بارگذاری مجدد',
         'disabled_label' => 'غیر فعال',
         'disabled_help' => 'افزونه های غیر فعال توسط برنامه نادیده گرفته می شوند.',
+        'frozen_label' => 'قفل کردن به روز رسانی',
+        'frozen_help' => 'افزونه های قفل شده بهنگام به روز رسانی نادیده گرفته خواهند شد.',
         'selected_amount' => 'افزونه های انتخاب شده: :amount',
         'remove_confirm' => 'آیا از حذف این افزونه اطمینان دارید؟',
         'remove_success' => "افزونه ها با موفقیت از سیستم حذف شدند.",
@@ -142,8 +147,12 @@ return [
         'smtp_password' => 'کلمه عبور',
         'smtp_port' => 'درگاه SMTP',
         'smtp_ssl' => 'اتصال امن SSL مورد نیاز است',
+        'smtp_encryption' => 'پروتکل رمزگذاری SMTP',
+        'smtp_encryption_none' => 'بدون رمزگذاری',
+        'smtp_encryption_tls' => 'TLS',
+        'smtp_encryption_ssl' => 'SSL',
         'sendmail' => 'Sendmail',
-        'sendmail_path' => 'محل Sendmail',
+        'sendmail_path' => 'آدرس برنامه Sendmail',
         'sendmail_path_comment' => 'لطفا محل ذخیره نرم افزار sendmail را مشخص نمایید.',
         'mailgun' => 'Mailgun',
         'mailgun_domain' => 'دامنه ی Mailgun',
@@ -152,7 +161,9 @@ return [
         'mailgun_secret_comment' => 'کلید API ی مربوط به Mailgun را وارد نمایید.',
         'mandrill' => 'Mandrill',
         'mandrill_secret' => 'کلمه عبور Mandrill',
-        'mandrill_secret_comment' => 'کلید API ی Mandrill را وارد نمایید.'
+        'mandrill_secret_comment' => 'کلید API ی Mandrill را وارد نمایید.',
+        'drivers_hint_header' => 'درایور ها نصب نشده اند',
+        'drivers_hint_content' => 'این روش برای ارسال پست الکترونیکی به افزونه ":plugin" نیاز دارد. جهت استفاده از این روش لطفا افزونه مورد نیاز را نصب نمایید.'
     ],
     'mail_templates' => [
         'menu_label' => 'قالب های نامه الکترونیکی',
@@ -164,6 +175,7 @@ return [
         'menu_layouts_label' => 'طرح بندی نامه الکترونیکی',
         'layout' => 'طرح بندی',
         'layouts' => 'طرح بندی ها',
+        'no_layout' => '-- بدون طرح بندی --',
         'name' => 'نام',
         'name_comment' => 'نام یکتای مشخص کننده ی این قالی',
         'code' => 'کد',
@@ -176,7 +188,10 @@ return [
         'content_text' => 'متن معمولی',
         'test_send' => 'ارسال پیغام آزمایشی',
         'test_success' => 'پیغام آزمایشی ارسال شد.',
-        'return' => 'بازگشت به لیست قالب ها'
+        'return' => 'بازگشت به لیست قالب ها',
+        'test_confirm' => 'یک نامه الکترونیکی جهت آزمایش به :email ارسال شد. آیا میخواهید ادامه دهید؟',
+        'saving' => 'ذخیره سازی قالب...',
+        'sending' => 'ارسال نامه الکترونیکی آزمایشی...',
     ],
     'install' => [
         'project_label' => 'ضمیمه کردن به نرم افزار',
@@ -192,9 +207,11 @@ return [
         'name' => 'بروز رسانی نرم افزار',
         'menu_label' => 'بروز رسانی ها',
         'menu_description' => 'به روز رسانی ی سیستم، مدیریت افزونه ها و قالب های نصب شده.',
+        'return_link' => 'بازگشت به صفحه به روز رسانی ها',
         'check_label' => 'بررسی بروز رسانی',
         'retry_label' => 'تلاش مجدد',
         'plugin_name' => 'نام',
+        'plugin_code' => 'کد یکتا',
         'plugin_description' => 'توضیحات',
         'plugin_version' => 'نسخه',
         'plugin_author' => 'تولید کننده',
@@ -209,6 +226,7 @@ return [
         'plugin_downloading' => 'دریافت افزونه: :name',
         'plugin_extracting' => 'گشودن افزونه: :name',
         'plugin_version_none' => 'افزونه ی جدید',
+        'plugin_current_version' => 'نسخه کنونی',
         'theme_new_install' => 'قالب جدید نصب شد.',
         'theme_downloading' => 'دریافت قالب: :name',
         'theme_extracting' => 'گشودن قالب: :name',
@@ -225,7 +243,24 @@ return [
         'none' => [
             'label' => 'شما از آخرین نسخه استفاده می کنید',
             'help' => 'هیچ به روز رسانی یافت نشد.'
-        ]
+        ],
+        'important_action' => [
+            'empty' => 'اقدام مورد نظر را انتخاب کنید',
+            'confirm' => 'تایید به روز رسانی',
+            'skip' => 'این افزونه را به روز نکن (فقط یک بار)',
+            'ignore' => 'این افزونه را به روز نکن (همیشه)',
+        ],
+        'important_action_required' => 'انتخاب عملیات مورد نیاز است',
+        'important_view_guide' => 'نمایش راهنمای به روز رسانی',
+        'important_alert_text' => 'برخی از به روز رسانی ها به تایید شما نیاز دارند',
+        'details_title' => 'مشخصات افزونه',
+        'details_view_homepage' => 'نمایش صفحه اصلی',
+        'details_readme' => 'مستندات',
+        'details_readme_missing' => 'مستنداتی در دسترس نمی باشد',
+        'details_upgrades' => 'راهنمای به روز رسانی',
+        'details_upgrades_missing' => 'راهنمایی جهت به روز رسانی در دسترس نیست.',
+        'details_current_version' => 'نسخه کنونی',
+        'details_author' => 'نویسنده',
     ],
     'server' => [
         'connect_error' => 'خطا در برقراری ارتباط با سرور.',
diff --git a/modules/system/lang/fa/validation.php b/modules/system/lang/fa/validation.php
index 29b0d60a8..93cb78f28 100644
--- a/modules/system/lang/fa/validation.php
+++ b/modules/system/lang/fa/validation.php
@@ -1,6 +1,6 @@
 <?php
 
-return array(
+return [
 
     /*
     |--------------------------------------------------------------------------
@@ -21,12 +21,12 @@ return array(
     "alpha_num"        => ":attribute فقط میتواند شامل حروف انگلیسی و عدد باشد.",
     "array"            => ":attribute باید یک آرایه باشد.",
     "before"           => ":attribute باید تاریخی قبل از :date باشد.",
-    "between"          => array(
+    "between"          => [
         "numeric" => ":attribute میتواند مابین :min و :max باشد.",
         "file"    => "اندازه ی :attribute بای مابین :min و :max کیلوبایت باشد.",
         "string"  => ":attribute باید مابین :min و :max کاراکتر باشد.",
         "array"   => ":attribute باید شامل :min تا :max مورد باشد.",
-    ),
+    ],
     "confirmed"        => "مقداری :attribute با تاییدیه اش یکسان نیست.",
     "date"             => ":attribute تاریخ معتبری نیست.",
     "date_format"      => "مقدار :attribute در قالب :format نمی باشد.",
@@ -39,20 +39,20 @@ return array(
     "in"               => ":attribute انتخاب شده نا معتبر است.",
     "integer"          => ":attribute باید یک عدد صحیح باشد.",
     "ip"               => ":attribute حاوی یک آدرس آی پی معتبر نیست.",
-    "max"              => array(
+    "max"              => [
         "numeric" => ":attribute نباید بیشتر از :max باشد.",
         "file"    => ":attribute نباید بیش از :max کیلوبایت باشد.",
         "string"  => ":attribute نباید بیش از :max کاراکتر باشد.",
         "array"   => ":attribute نباید بیش تر از :max مورد داشته باشد.",
-    ),
+    ],
     "mimes"            => ":attribute باید فایلی از نوع :values باشد.",
     "extensions"       => "پسوند :attribute باید :values باشد.",
-    "min"              => array(
+    "min"              => [
         "numeric" => "مقدار :attribute باید حد اقل :min باشد.",
         "file"    => ":attribute باید حداقل :min کیلوبایت باشد.",
         "string"  => ":attribute باید شامل حداقل :min کاراکتر باشد.",
         "array"   => ":attribute باید شامل حد اقل :min مورد باشد.",
-    ),
+    ],
     "not_in"           => ":attribute انتخاب شده نا معتبر است.",
     "numeric"          =>  "مقدار :attribute باید یک مقدار عددی باشد.",
     "regex"            => "قالب :attribute نا معتبر است.",
@@ -61,12 +61,12 @@ return array(
     "required_with"    => "فیل :attribute در صورتی که :values موجود باشد مورد نیاز است.",
     "required_without" => "فیلد :attribute در صورتی که مقدار :values وجود نداشته باشد مورد نیاز است.",
     "same"             => ":attribute و :other باید مقدار یکسانی داشته باشند.",
-    "size"             => array(
+    "size"             => [
         "numeric" => ":attribute باید به اندازه ی :size باشد.",
         "file"    => ":attribute باید :size کیلوبایت باشد.",
         "string"  => ":attribute باید :size کاراکتر باشد.",
         "array"   => ":attribute باید شامل :size مورد باشد.",
-    ),
+    ],
     "unique"           => ":attribute استفاده شده تکراری می باشد.",
     "url"              => "قالب :attribute نا معتبر است.",
 
@@ -81,7 +81,7 @@ return array(
     |
     */
 
-    'custom' => array(),
+    'custom' => [],
 
     /*
     |--------------------------------------------------------------------------
@@ -94,6 +94,6 @@ return array(
     |
     */
 
-    'attributes' => array(),
+    'attributes' => [],
 
-);
+];

From 3ea76dd8172ea1ba73cbacff79a18a0186ad0f54 Mon Sep 17 00:00:00 2001
From: Vojta Svoboda <vojtasvoboda.cz@gmail.com>
Date: Sun, 4 Oct 2015 22:09:57 +0200
Subject: [PATCH 092/103] Remove duplicate array keys

---
 modules/cms/lang/de/lang.php       | 1 -
 modules/cms/lang/el/lang.php       | 1 -
 modules/cms/lang/en/lang.php       | 1 -
 modules/cms/lang/es/lang.php       | 1 -
 modules/cms/lang/fa/lang.php       | 1 -
 modules/cms/lang/fr/lang.php       | 1 -
 modules/cms/lang/hu/lang.php       | 1 -
 modules/cms/lang/it/lang.php       | 1 -
 modules/cms/lang/nb-no/lang.php    | 1 -
 modules/cms/lang/pl/lang.php       | 2 --
 modules/cms/lang/pt-br/lang.php    | 1 -
 modules/cms/lang/ru/lang.php       | 1 -
 modules/cms/lang/sv/lang.php       | 1 -
 modules/cms/lang/tr/lang.php       | 1 -
 modules/cms/lang/zh-cn/lang.php    | 1 -
 modules/cms/lang/zh-tw/lang.php    | 1 -
 modules/system/lang/id/lang.php    | 1 -
 modules/system/lang/ja/lang.php    | 1 -
 modules/system/lang/nb-no/lang.php | 1 -
 19 files changed, 20 deletions(-)

diff --git a/modules/cms/lang/de/lang.php b/modules/cms/lang/de/lang.php
index d78907db8..f7e2f094c 100644
--- a/modules/cms/lang/de/lang.php
+++ b/modules/cms/lang/de/lang.php
@@ -253,7 +253,6 @@ return [
         'uploading_file_num' => 'Lade :number Datei(en)...',
         'uploading_complete' => 'Upload vollständig',
         'order_by' => 'Sortieren nach',
-        'search' => 'Suchen',
         'folder' => 'Ordner',
         'no_files_found' => 'Keine entsprechenden Dateien gefunden.',
         'delete_empty' => 'Bitte Wählen Sie Dateien zum Löschen aus.',
diff --git a/modules/cms/lang/el/lang.php b/modules/cms/lang/el/lang.php
index 1f59269e8..c7e2d0401 100644
--- a/modules/cms/lang/el/lang.php
+++ b/modules/cms/lang/el/lang.php
@@ -263,7 +263,6 @@ return [
         'uploading_file_num' => 'Ανέβασμα :number αρχείων...',
         'uploading_complete' => 'Το ανέβασμα ολοκληρώθηκε',
         'order_by' => 'Ταξινόμηση κατά',
-        'search' => 'Αναζήτηση',
         'folder' => 'Κατάλογος',
         'no_files_found' => 'Δεν βρέθηκαν αρχεία από το αίτημα σας.',
         'delete_empty' => 'παρακαλούμε επιλέξτε αντικείμενά για να τα σβήσετε.',
diff --git a/modules/cms/lang/en/lang.php b/modules/cms/lang/en/lang.php
index 7b167775c..921aa68e4 100644
--- a/modules/cms/lang/en/lang.php
+++ b/modules/cms/lang/en/lang.php
@@ -266,7 +266,6 @@ return [
         'uploading_file_num' => 'Uploading :number file(s)...',
         'uploading_complete' => 'Upload complete',
         'order_by' => 'Order by',
-        'search' => 'Search',
         'folder' => 'Folder',
         'no_files_found' => 'No files found by your request.',
         'delete_empty' => 'Please select items to delete.',
diff --git a/modules/cms/lang/es/lang.php b/modules/cms/lang/es/lang.php
index 4bb82eefd..fe4d19c06 100644
--- a/modules/cms/lang/es/lang.php
+++ b/modules/cms/lang/es/lang.php
@@ -256,7 +256,6 @@ return [
         'uploading_file_num'         => 'Subiendo :number archivo(s)...',
         'uploading_complete'         => 'Subida completada',
         'order_by'                   => 'Ordenar por',
-        'search'                     => 'Buscar',
         'folder'                     => 'Carpeta',
         'no_files_found'             => 'No se han encontrado archivos.',
         'delete_empty'               => 'Por favor, selecciona los elementos que quieres eliminar.',
diff --git a/modules/cms/lang/fa/lang.php b/modules/cms/lang/fa/lang.php
index 8c027bc34..84b9c7f3f 100644
--- a/modules/cms/lang/fa/lang.php
+++ b/modules/cms/lang/fa/lang.php
@@ -262,7 +262,6 @@ return [
         'uploading_file_num' => 'ارسال :number فایل(ها)...',
         'uploading_complete' => 'ارسال انجام شد',
         'order_by' => 'مرتب سازی با',
-        'search' => 'جستجو',
         'folder' => 'پوشه',
         'no_files_found' => 'فایلی با درخواست شما یافت نشد',
         'delete_empty' => 'لطفا موارد را جهت حذف انتخاب نمایید',
diff --git a/modules/cms/lang/fr/lang.php b/modules/cms/lang/fr/lang.php
index f3382f6b8..d8a7f75d1 100644
--- a/modules/cms/lang/fr/lang.php
+++ b/modules/cms/lang/fr/lang.php
@@ -266,7 +266,6 @@ return [
         'uploading_file_num' => 'Téléchargement de :number fichier(s)…',
         'uploading_complete' => 'Téléchargement complet',
         'order_by' => 'Trier par',
-        'search' => 'Rechercher',
         'folder' => 'Répertoire',
         'no_files_found' => 'Aucun fichier trouvé.',
         'delete_empty' => 'Sélectionner les articles à supprimer.',
diff --git a/modules/cms/lang/hu/lang.php b/modules/cms/lang/hu/lang.php
index 5736c6e8c..74f8b12c3 100644
--- a/modules/cms/lang/hu/lang.php
+++ b/modules/cms/lang/hu/lang.php
@@ -266,7 +266,6 @@ return [
         'uploading_file_num' => 'Feltöltve :number fájl...',
         'uploading_complete' => 'Feltöltés sikeresen befejezve',
         'order_by' => 'Rendezés',
-        'search' => 'Keresés',
         'folder' => 'Könyvtárak',
         'no_files_found' => 'Nem található fájl a lekérésben.',
         'delete_empty' => 'Kérjük, válassza ki a törölni kívánt fájlokat.',
diff --git a/modules/cms/lang/it/lang.php b/modules/cms/lang/it/lang.php
index 741888081..9e7f570a6 100644
--- a/modules/cms/lang/it/lang.php
+++ b/modules/cms/lang/it/lang.php
@@ -266,7 +266,6 @@ return [
         'uploading_file_num' => 'Caricamento in corso di :number file(s)...',
         'uploading_complete' => 'Caricamento completato',
         'order_by' => 'Ordina per',
-        'search' => 'Cerca',
         'folder' => 'Cartella',
         'no_files_found' => 'Nessun file corrisponde alla tua richiesta.',
         'delete_empty' => 'Seleziona elementi da eliminare.',
diff --git a/modules/cms/lang/nb-no/lang.php b/modules/cms/lang/nb-no/lang.php
index e427c6572..1d9e461a3 100644
--- a/modules/cms/lang/nb-no/lang.php
+++ b/modules/cms/lang/nb-no/lang.php
@@ -258,7 +258,6 @@ return [
         'uploading_file_num' => 'Laster opp :number fil(er)...',
         'uploading_complete' => 'Opplasting fullført',
         'order_by' => 'Sorter etter',
-        'search' => 'Søk',
         'folder' => 'Mappe',
         'no_files_found' => 'Ingen filer ble funnet.',
         'delete_empty' => 'Ingen filer er valgt.',
diff --git a/modules/cms/lang/pl/lang.php b/modules/cms/lang/pl/lang.php
index ac9740586..fe63d40a8 100644
--- a/modules/cms/lang/pl/lang.php
+++ b/modules/cms/lang/pl/lang.php
@@ -65,7 +65,6 @@ return [
         'export_folders_comment' => 'Proszę zaznaczyć foldery do eksportu',
         'delete_button' => 'Usuń',
         'delete_confirm' => 'Czy na pewno usunąć ten motyw? Tej operacji nie można cofnąć!',
-        'delete_active_theme_failed' => 'Cannot delete the active theme, try making another theme active first.',
         'delete_active_theme_failed' => 'Nie można usunąć aktywnego motywu. Spróbuj zmienić aktywny motyw na inny.',
         'delete_theme_success' => 'Pomyślnie usunięto motyw!',
         'create_title' => 'Utwórz motyw',
@@ -266,7 +265,6 @@ return [
         'uploading_file_num' => 'Przesyłanie :number pliku(ów)...',
         'uploading_complete' => 'Przesyłanie zakończone',
         'order_by' => 'Sortowanie',
-        'search' => 'Szukaj',
         'folder' => 'Folder',
         'no_files_found' => 'Nie znaleziono żadnych pasujących elementów.',
         'delete_empty' => 'Wybierz elementy do usunięcia.',
diff --git a/modules/cms/lang/pt-br/lang.php b/modules/cms/lang/pt-br/lang.php
index cf7cb25f9..d4eae593a 100644
--- a/modules/cms/lang/pt-br/lang.php
+++ b/modules/cms/lang/pt-br/lang.php
@@ -266,7 +266,6 @@ return [
         'uploading_file_num' => 'Enviando :number arquivo(s)...',
         'uploading_complete' => 'Envio finalizado',
         'order_by' => 'Ordenar por',
-        'search' => 'Buscar',
         'folder' => 'Pasta',
         'no_files_found' => 'Nenhum arquivo encontrado.',
         'delete_empty' => 'Por favor, selecione um item para excluir.',
diff --git a/modules/cms/lang/ru/lang.php b/modules/cms/lang/ru/lang.php
index 672db1d43..037ba7775 100644
--- a/modules/cms/lang/ru/lang.php
+++ b/modules/cms/lang/ru/lang.php
@@ -266,7 +266,6 @@ return [
         'uploading_file_num' => 'Загрузка файлов: :number',
         'uploading_complete' => 'Загрузка файлов завершена!',
         'order_by' => 'Сортировать по',
-        'search' => 'Поиск',
         'folder' => 'Папка',
         'no_files_found' => 'Ни один из файлов не удовлетворяет вашему запросу.',
         'delete_empty' => 'Пожалуйста, выберите объекты для удаления.',
diff --git a/modules/cms/lang/sv/lang.php b/modules/cms/lang/sv/lang.php
index c395219f5..a37624fca 100644
--- a/modules/cms/lang/sv/lang.php
+++ b/modules/cms/lang/sv/lang.php
@@ -265,7 +265,6 @@ return [
         'uploading_file_num' => 'Laddar upp :number fil(er)...',
         'uploading_complete' => 'Uppladdning slutförd',
         'order_by' => 'Ordna efter',
-        'search' => 'Sök',
         'folder' => 'Mapp',
         'no_files_found' => 'Inga filer kunde hittas baserat på din sökning.',
         'delete_empty' => 'Vänligen välj föremål att radera.',
diff --git a/modules/cms/lang/tr/lang.php b/modules/cms/lang/tr/lang.php
index e7226ce14..821333af3 100644
--- a/modules/cms/lang/tr/lang.php
+++ b/modules/cms/lang/tr/lang.php
@@ -266,7 +266,6 @@ return [
         'uploading_file_num' => ':number adet dosya yükleniyor...',
         'uploading_complete' => 'Yükleme tamamlandı',
         'order_by' => 'Sırala',
-        'search' => 'Ara',
         'folder' => 'Klasör',
         'no_files_found' => 'İsteğiniz doğrultusunda hiçbir dosya bulunamadı.',
         'delete_empty' => 'Lütfen silinecek öğeleri seçiniz.',
diff --git a/modules/cms/lang/zh-cn/lang.php b/modules/cms/lang/zh-cn/lang.php
index 78634a5ed..2df542424 100644
--- a/modules/cms/lang/zh-cn/lang.php
+++ b/modules/cms/lang/zh-cn/lang.php
@@ -262,7 +262,6 @@ return [
         'uploading_file_num' => '上传 :number 文件...',
         'uploading_complete' => '上传完毕',
         'order_by' => '排序',
-        'search' => '搜索',
         'folder' => '文件夹',
         'no_files_found' => '没找到你请求的文件.',
         'delete_empty' => '请选择删除项.',
diff --git a/modules/cms/lang/zh-tw/lang.php b/modules/cms/lang/zh-tw/lang.php
index affc1b8e1..0e95e3c01 100644
--- a/modules/cms/lang/zh-tw/lang.php
+++ b/modules/cms/lang/zh-tw/lang.php
@@ -262,7 +262,6 @@ return [
         'uploading_file_num' => '上傳 :number 檔案...',
         'uploading_complete' => '上傳完畢',
         'order_by' => '排序',
-        'search' => '搜尋',
         'folder' => '檔案夾',
         'no_files_found' => '沒找到您請求的檔案.',
         'delete_empty' => '請選擇刪除項.',
diff --git a/modules/system/lang/id/lang.php b/modules/system/lang/id/lang.php
index 10f3b7e4d..fde8811ed 100644
--- a/modules/system/lang/id/lang.php
+++ b/modules/system/lang/id/lang.php
@@ -110,7 +110,6 @@ return [
         'sender_name' => 'Nama Pengirim',
         'sender_email' => 'Surel Pengirim',
         'php_mail' => 'PHP mail',
-        'sendmail' => 'Sendmail',
         'smtp' => 'SMTP',
         'smtp_address' => 'Alamat SMTP',
         'smtp_authorization' => 'Otorisasi SMTP diperlukan',
diff --git a/modules/system/lang/ja/lang.php b/modules/system/lang/ja/lang.php
index 1f606fd7e..00dfc4549 100644
--- a/modules/system/lang/ja/lang.php
+++ b/modules/system/lang/ja/lang.php
@@ -107,7 +107,6 @@ return [
         'sender_name' => '送信者名',
         'sender_email' => '送信者メール',
         'php_mail' => 'PHPメール',
-        'sendmail' => 'Sendmail',
         'smtp' => 'SMTP',
         'smtp_address' => 'SMTPアドレス',
         'smtp_authorization' => 'SMTP認証が必要',
diff --git a/modules/system/lang/nb-no/lang.php b/modules/system/lang/nb-no/lang.php
index 640405c7a..4607a2049 100644
--- a/modules/system/lang/nb-no/lang.php
+++ b/modules/system/lang/nb-no/lang.php
@@ -133,7 +133,6 @@ return [
         'sender_name' => 'Avsendernavn',
         'sender_email' => 'Avsenderens e-postadresse',
         'php_mail' => 'PHP mail',
-        'sendmail' => 'Sendmail',
         'smtp' => 'SMTP',
         'smtp_address' => 'SMTP-adresse',
         'smtp_authorization' => 'SMTP-autentisering kreves',

From 3a7e1d6d31913f595abd9cb5f0f9ca6720f45952 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Mon, 5 Oct 2015 12:11:25 +1100
Subject: [PATCH 093/103] Fixes #1480 - Allow postback key names to use dots

---
 modules/backend/widgets/Form.php | 65 +++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index a07e6d870..654e20c01 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -850,8 +850,7 @@ class Form extends WidgetBase
              * Handle HTML array, eg: item[key][another]
              */
             $parts = HtmlHelper::nameToArray($field->fieldName);
-            $dotted = implode('.', $parts);
-            if (($value = array_get($data, $dotted)) !== null) {
+            if (($value = $this->dataArrayGet($data, $parts)) !== null) {
 
                 /*
                  * Number fields should be converted to integers
@@ -860,7 +859,7 @@ class Form extends WidgetBase
                     $value = !strlen(trim($value)) ? null : (float) $value;
                 }
 
-                array_set($result, $dotted, $value);
+                $this->dataArraySet($result, $parts, $value);
             }
         }
 
@@ -869,10 +868,9 @@ class Form extends WidgetBase
          */
         foreach ($this->formWidgets as $field => $widget) {
             $parts = HtmlHelper::nameToArray($field);
-            $dotted = implode('.', $parts);
 
-            $widgetValue = $widget->getSaveValue(array_get($result, $dotted));
-            array_set($result, $dotted, $widgetValue);
+            $widgetValue = $widget->getSaveValue($this->dataArrayGet($result, $parts));
+            $this->dataArraySet($result, $parts, $widgetValue);
         }
 
         return $result;
@@ -979,4 +977,59 @@ class Form extends WidgetBase
 
         return method_exists($object, $method);
     }
+
+    /**
+     * Variant to array_get() but preserves dots in key names.
+     */
+    protected function dataArrayGet(array $array, array $parts, $default = null)
+    {
+        if (is_null($parts)) {
+            return $array;
+        }
+
+        if (count($parts) === 1) {
+            $key = array_shift($parts);
+            if (isset($array[$key])) {
+                return $array[$key];
+            }
+            else {
+                return $default;
+            }
+        }
+
+        foreach ($parts as $segment) {
+            if (!is_array($array) || !array_key_exists($segment, $array)) {
+                return $default;
+            }
+
+            $array = $array[$segment];
+        }
+
+        return $array;
+    }
+
+    /**
+     * Variant to array_set() but preserves dots in key names.
+     */
+    protected function dataArraySet(array &$array, array $parts, $value)
+    {
+        if (is_null($parts)) {
+            return $array = $value;
+        }
+
+        while (count($parts) > 1) {
+            $key = array_shift($parts);
+
+            if (!isset($array[$key]) || !is_array($array[$key])) {
+                $array[$key] = [];
+            }
+
+            $array =& $array[$key];
+        }
+
+        $array[array_shift($parts)] = $value;
+
+        return $array;
+    }
+
 }

From b7505a2cd767b1d1d8ce936811adfcfe5c65e6fc Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Mon, 5 Oct 2015 18:00:01 +1100
Subject: [PATCH 094/103] Returning save data now depends on form fields, so
 they should always be defined

---
 modules/backend/widgets/Form.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 654e20c01..f0d84e2d6 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -832,6 +832,8 @@ class Form extends WidgetBase
      */
     public function getSaveData()
     {
+        $this->defineFormFields();
+
         $result = [];
 
         /*

From 1774f12e6500e540be9962473bbaa10ccb382b56 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 7 Oct 2015 07:21:03 +1100
Subject: [PATCH 095/103] Minor styling fix

---
 .../componentlist/partials/_toolbar.htm       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/modules/cms/widgets/componentlist/partials/_toolbar.htm b/modules/cms/widgets/componentlist/partials/_toolbar.htm
index df06c51c8..66c1ef7bb 100644
--- a/modules/cms/widgets/componentlist/partials/_toolbar.htm
+++ b/modules/cms/widgets/componentlist/partials/_toolbar.htm
@@ -1,15 +1,16 @@
 <div class="layout-row min-size">
-    <div class="layout control-toolbar">
-        <div class="layout-cell">
-            <div class="relative toolbar-item loading-indicator-container size-input-text">
-                <input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
-                    class="form-control icon search" autocomplete="off"
-                    data-track-input
-                    data-load-indicator
-                    data-load-indicator-opaque
-                    data-request="<?= $this->getEventHandler('onSearch') ?>"
-                />
-            </div>
+    <div class="control-toolbar toolbar-padded">
+
+        <!-- Component Search -->
+        <div class="relative toolbar-item loading-indicator-container size-input-text">
+            <input placeholder="<?= e(trans('cms::lang.sidebar.search')) ?>" type="text" name="search" value="<?= e($this->getSearchTerm()) ?>" 
+                class="form-control icon search" autocomplete="off"
+                data-track-input
+                data-load-indicator
+                data-load-indicator-opaque
+                data-request="<?= $this->getEventHandler('onSearch') ?>"
+            />
         </div>
+
     </div>
-</div>
\ No newline at end of file
+</div>

From f99ff4a363b97e65b7eba2e78a4a293ffcf91f4d Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Wed, 7 Oct 2015 19:24:18 +1100
Subject: [PATCH 096/103] Prevent sorting of count column, fixes #1491

---
 modules/backend/models/usergroup/columns.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/backend/models/usergroup/columns.yaml b/modules/backend/models/usergroup/columns.yaml
index 2d9f6e0a2..0b8c3e878 100644
--- a/modules/backend/models/usergroup/columns.yaml
+++ b/modules/backend/models/usergroup/columns.yaml
@@ -16,3 +16,4 @@ columns:
         relation: users_count
         valueFrom: count
         default: 0
+        sortable: false

From 3531793ca3e47e660f85a8f13a05a53c71f243b1 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Thu, 8 Oct 2015 07:27:38 +1100
Subject: [PATCH 097/103] Add where and whereComponent to CMS objects

---
 modules/cms/classes/CmsObjectCollection.php   | 76 ++++++++++++++-
 modules/cms/classes/CmsObjectQuery.php        |  4 +
 tests/unit/cms/classes/CmsObjectQueryTest.php | 95 +++++++++++++++++++
 3 files changed, 171 insertions(+), 4 deletions(-)
 create mode 100644 tests/unit/cms/classes/CmsObjectQueryTest.php

diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php
index 6f2099eec..b89703d4d 100644
--- a/modules/cms/classes/CmsObjectCollection.php
+++ b/modules/cms/classes/CmsObjectCollection.php
@@ -16,14 +16,81 @@ class CmsObjectCollection extends CollectionBase
      * @param  string|array  $components
      * @return static
      */
-    public function withComponent($components)
+    public function withComponent($components, $callback = null)
     {
-        return $this->filter(function($object) use ($components) {
+        return $this->filter(function($object) use ($components, $callback) {
 
             $hasComponent = false;
 
-            foreach ((array) $components as $component) {
-                if ($object->hasComponent($component)) {
+            foreach ((array) $components as $componentName) {
+
+                if (!$callback && $object->hasComponent($componentName)) {
+                    $hasComponent = true;
+                }
+
+                if ($callback && ($component = $object->getComponent($componentName))) {
+                    $hasComponent = call_user_func($callback, $component) ?: $hasComponent;
+                }
+            }
+
+            return $hasComponent;
+        });
+    }
+
+    /**
+     * Returns objects whose properties match the supplied value.
+     * @param string $property
+     * @param string $value
+     * @return static
+     */
+    public function where($property, $value, $strict = true)
+    {
+        return $this->filter(function($object) use ($property, $value, $strict) {
+
+            if (!array_key_exists($property, $object->settings)) {
+                return false;
+            }
+
+            return $strict
+                ? $object->settings[$property] === $value
+                : $object->settings[$property] == $value;
+        });
+    }
+
+    /**
+     * Returns objects whose component properties match the supplied value.
+     * @param string $property
+     * @param string $value
+     * @return static
+     */
+    public function whereComponent($components, $property, $value, $strict = true)
+    {
+        return $this->filter(function($object) use ($components, $property, $value, $strict) {
+
+            $hasComponent = false;
+
+            foreach ((array) $components as $componentName) {
+
+                if (!$componentAlias = $object->hasComponent($componentName)) {
+                    continue;
+                }
+
+                $componentSettings = array_get($object->settings, 'components', []);
+
+                if (!array_key_exists($componentAlias, $componentSettings)) {
+                    continue;
+                }
+
+                $settings = $componentSettings[$componentAlias];
+
+                if (!array_key_exists($property, $settings)) {
+                    continue;
+                }
+
+                if (
+                    ($strict && $settings[$property] === $value) ||
+                    (!$strict && $settings[$property] == $value)
+                ) {
                     $hasComponent = true;
                 }
             }
@@ -31,4 +98,5 @@ class CmsObjectCollection extends CollectionBase
             return $hasComponent;
         });
     }
+
 }
diff --git a/modules/cms/classes/CmsObjectQuery.php b/modules/cms/classes/CmsObjectQuery.php
index a057c0d0c..e801bc059 100644
--- a/modules/cms/classes/CmsObjectQuery.php
+++ b/modules/cms/classes/CmsObjectQuery.php
@@ -40,6 +40,10 @@ class CmsObjectQuery
      */
     public function inTheme($theme)
     {
+        if (is_string($theme)) {
+            $theme = Theme::load($theme);
+        }
+
         $this->theme = $theme;
         return $this;
     }
diff --git a/tests/unit/cms/classes/CmsObjectQueryTest.php b/tests/unit/cms/classes/CmsObjectQueryTest.php
new file mode 100644
index 000000000..65ca650b3
--- /dev/null
+++ b/tests/unit/cms/classes/CmsObjectQueryTest.php
@@ -0,0 +1,95 @@
+<?php
+
+use Cms\Classes\Page;
+use Cms\Classes\Layout;
+
+class CmsObjectQueryTest extends TestCase
+{
+    public function testWhere()
+    {
+        $page = Page::where('layout', 'caramba')->first();
+        $this->assertEquals('/no-layout', $page->url);
+    }
+
+    public function testWhereComponent()
+    {
+        include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Archive.php';
+
+        $pages = Page::whereComponent('testArchive', 'posts-per-page', '6');
+        $this->assertCount(1, $pages->all());
+
+        $page = $pages->first();
+        $this->assertEquals('/with-components', $page->url);
+    }
+
+    public function testWithComponent()
+    {
+        $pages = Page::withComponent('testArchive')->all();
+        $this->assertCount(2, $pages);
+        foreach ($pages as $page) {
+            $this->assertTrue(!!$page->hasComponent('testArchive'));
+        }
+    }
+
+    public function testWithComponentCallback()
+    {
+        include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Archive.php';
+
+        $pages = Page::withComponent('testArchive', function($component) {
+            return $component->property('posts-per-page') == '69';
+        })->all();
+
+        $this->assertCount(1, $pages);
+    }
+
+    public function testLists()
+    {
+        // Default theme: test
+        $pages = Page::lists('baseFileName');
+        $this->assertEquals([
+            "404",
+            "a/a-page",
+            "ajax-test",
+            "authors",
+            "b/b-page",
+            "blog-archive",
+            "blog-post",
+            "code-namespaces",
+            "component-custom-render",
+            "component-partial-nesting",
+            "component-partial-override",
+            "component-partial",
+            "cycle-test",
+            "index",
+            "no-component-class",
+            "no-component",
+            "no-layout",
+            "no-partial",
+            "optional-full-php-tags",
+            "optional-short-php-tags",
+            "throw-php",
+            "with-component",
+            "with-components",
+            "with-content",
+            "with-layout",
+            "with-partials",
+            "with-placeholder",
+        ], $pages);
+
+        $layouts = Layout::lists('baseFileName');
+        $this->assertEquals([
+            "a/a-layout",
+            "ajax-test",
+            "content",
+            "cycle-test",
+            "no-php",
+            "partials",
+            "php-parser-test",
+            "placeholder",
+            "sidebar",
+        ], $layouts);
+
+        $pages = Page::inTheme('NON_EXISTENT_THEME')->lists('baseFileName');
+        $this->assertEmpty($pages);
+    }
+}

From 4b50f1cdb7f01c3b452c5b4fd863bc9f39abe89d Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 9 Oct 2015 05:31:50 +1100
Subject: [PATCH 098/103] Clearing compiled cache files should be part of
 clearing Cache Fixes #1501

---
 modules/system/helpers/Cache.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/system/helpers/Cache.php b/modules/system/helpers/Cache.php
index d2959ae09..139cced1b 100644
--- a/modules/system/helpers/Cache.php
+++ b/modules/system/helpers/Cache.php
@@ -1,5 +1,6 @@
 <?php namespace System\Helpers;
 
+use App;
 use File;
 use Config;
 
@@ -31,7 +32,6 @@ class Cache
         foreach (File::directories(storage_path().'/cms/combiner') as $directory) {
             File::deleteDirectory($directory);
         }
-
     }
 
     /*
@@ -60,5 +60,7 @@ class Cache
     public function clearMeta()
     {
         File::delete(storage_path().'/cms/disabled.json');
+        File::delete(App::getCachedCompilePath());
+        File::delete(App::getCachedServicesPath());
     }
 }

From 84a95af93b3e48371eac1eeacb91a57341ab367f Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 9 Oct 2015 05:32:24 +1100
Subject: [PATCH 099/103] whereComponent doesn't rely on the component object

---
 modules/cms/classes/CmsObjectCollection.php   | 2 +-
 tests/unit/cms/classes/CmsObjectQueryTest.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php
index b89703d4d..b79974ec1 100644
--- a/modules/cms/classes/CmsObjectCollection.php
+++ b/modules/cms/classes/CmsObjectCollection.php
@@ -63,7 +63,7 @@ class CmsObjectCollection extends CollectionBase
      * @param string $value
      * @return static
      */
-    public function whereComponent($components, $property, $value, $strict = true)
+    public function whereComponent($components, $property, $value, $strict = false)
     {
         return $this->filter(function($object) use ($components, $property, $value, $strict) {
 
diff --git a/tests/unit/cms/classes/CmsObjectQueryTest.php b/tests/unit/cms/classes/CmsObjectQueryTest.php
index 65ca650b3..ae4d5d8dd 100644
--- a/tests/unit/cms/classes/CmsObjectQueryTest.php
+++ b/tests/unit/cms/classes/CmsObjectQueryTest.php
@@ -13,8 +13,6 @@ class CmsObjectQueryTest extends TestCase
 
     public function testWhereComponent()
     {
-        include_once base_path() . '/tests/fixtures/plugins/october/tester/components/Archive.php';
-
         $pages = Page::whereComponent('testArchive', 'posts-per-page', '6');
         $this->assertCount(1, $pages->all());
 

From e4f28495d2b61d9f5772204f2cd5487e89c69052 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Fri, 9 Oct 2015 05:37:57 +1100
Subject: [PATCH 100/103] * Build 304

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39acb61fb..595ec50b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* **Build 304** (2015-10-09)
+  - Added new `where` and `whereComponent` methods for querying CMS template properties.
+
 * **Build 300** (2015-10-03)
   - **Happy 2nd Birthday October!**
   - Page settings now support infinite array nesting with October flavored INI syntax via `Ini::parse` and `Ini::render`.

From d4cf2f7178180a318607b2d7eb60f1b0e81af2ba Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 10 Oct 2015 09:09:40 +1100
Subject: [PATCH 101/103] Spaces in URLs break Markdown syntax Fixes
 https://github.com/rainlab/blog-plugin/issues/136 Recompile all assets

---
 .../formwidgets/markdowneditor/assets/js/markdowneditor.js     | 3 +++
 modules/system/assets/js/lang/lang.de.js                       | 2 +-
 modules/system/assets/js/lang/lang.fa.js                       | 2 +-
 modules/system/assets/js/lang/lang.sv.js                       | 2 +-
 modules/system/assets/ui/storm-min.js                          | 3 +--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js b/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js
index c4433e366..1969c1634 100644
--- a/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js
+++ b/modules/backend/formwidgets/markdowneditor/assets/js/markdowneditor.js
@@ -516,6 +516,9 @@
                     publicUrl = items[i].publicUrl
                 }
 
+                // Spaces in URLs break Markdown syntax
+                publicUrl = publicUrl.replace(/\s/g, '%20')
+
                 onSuccess(publicUrl)
 
                 this.hide()
diff --git a/modules/system/assets/js/lang/lang.de.js b/modules/system/assets/js/lang/lang.de.js
index a5a46a272..dc276b832 100644
--- a/modules/system/assets/js/lang/lang.de.js
+++ b/modules/system/assets/js/lang/lang.de.js
@@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
 $.oc.langMessages['de'] = $.extend(
     $.oc.langMessages['de'] || {},
-    {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel"}}
+    {"markdowneditor":{"formatting":"Formatierung","quote":"Zitat","code":"Code","header1":"\u00dcberschrift 1","header2":"\u00dcberschrift 2","header3":"\u00dcberschrift 3","header4":"\u00dcberschrift 4","header5":"\u00dcberschrift 5","header6":"\u00dcberschrift 6","bold":"Fett","italic":"Kursiv","unorderedlist":"Normale Liste","orderedlist":"Nummerierte Liste","video":"Video","image":"Bild","link":"Link","horizontalrule":"Horizontale Linie","fullscreen":"Vollbild","preview":"Vorschau"},"mediamanager":{"insert_link":"Link aus Medienbibliothek","insert_image":"Bild aus Medienbibliothek","insert_video":"Video aus Medienbibliothek","insert_audio":"Audio aus Medienbibliothek","invalid_file_empty_insert":"Bitte Datei ausw\u00e4hlen.","invalid_file_single_insert":"Bitte nur eine Datei w\u00e4hlen.","invalid_image_empty_insert":"Bitte ein Bild ausw\u00e4hlen.","invalid_video_empty_insert":"Bitte ein Video ausw\u00e4hlen.","invalid_audio_empty_insert":"Bitte eine Audiodatei ausw\u00e4hlen."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Abbrechen"}}
 );
\ No newline at end of file
diff --git a/modules/system/assets/js/lang/lang.fa.js b/modules/system/assets/js/lang/lang.fa.js
index 4799b4fa0..f5910b582 100644
--- a/modules/system/assets/js/lang/lang.fa.js
+++ b/modules/system/assets/js/lang/lang.fa.js
@@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
 $.oc.langMessages['fa'] = $.extend(
     $.oc.langMessages['fa'] || {},
-    {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel"}}
+    {"markdowneditor":{"formatting":"\u0642\u0627\u0644\u0628 \u0628\u0646\u062f\u06cc","quote":"\u0646\u0642\u0644 \u0642\u0648\u0644","code":"\u06a9\u062f","header1":"\u0633\u0631\u062e\u0637 1","header2":"\u0633\u0631\u062e\u0637 2","header3":"\u0633\u0631\u062e\u0637 3","header4":"\u0633\u0631\u062e\u0637 4","header5":"\u0633\u0631\u062e\u0637 5","header6":"\u0633\u0631\u062e\u0637 6","bold":"\u0638\u062e\u06cc\u0645","italic":"\u0645\u0648\u0631\u0628","unorderedlist":"\u0644\u06cc\u0633\u062a \u0628\u062f\u0648\u0646 \u062a\u0631\u062a\u06cc\u0628","orderedlist":"\u0644\u06cc\u0633\u062a \u0628\u0627 \u062a\u0631\u062a\u06cc\u0628","video":"\u0648\u06cc\u062f\u06cc\u0648","image":"\u062a\u0635\u0648\u06cc\u0631","link":"\u0644\u06cc\u0646\u06a9","horizontalrule":"\u062f\u0631\u062c \u062e\u0637 \u0627\u0641\u0642\u06cc","fullscreen":"\u062a\u0645\u0627\u0645 \u0635\u0641\u062d\u0647","preview":"\u067e\u06cc\u0634 \u0646\u0645\u0627\u06cc\u0634"},"mediamanager":{"insert_link":"\u062f\u0631\u062c \u0622\u062f\u0631\u0633 \u0631\u0633\u0627\u0646\u0647","insert_image":"\u062f\u0631\u062c \u062a\u0635\u0648\u06cc\u0631","insert_video":"\u062f\u0631\u062c \u0648\u06cc\u062f\u06cc\u0648","insert_audio":"\u062f\u0631\u062c \u0635\u0648\u062a","invalid_file_empty_insert":"\u0644\u0637\u0641\u0627 \u0641\u0627\u06cc\u0644\u06cc \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0644\u06cc\u0646\u06a9 \u0622\u0646 \u0648\u0627\u0631\u062f \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_file_single_insert":"\u0644\u0637\u0641\u0627 \u06cc\u06a9 \u0641\u0627\u06cc\u0644 \u0631\u0627 \u0648\u0627\u0631\u062f \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_image_empty_insert":"\u0644\u0637\u0641\u0627 \u062a\u0635\u0648\u06cc\u0631(\u0647\u0627) \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f","invalid_video_empty_insert":"\u0644\u0637\u0641\u0627 \u0648\u06cc\u062f\u06cc\u0648 \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f.","invalid_audio_empty_insert":"\u0644\u0637\u0641\u0627 \u0641\u0627\u06cc\u0644 \u0635\u0648\u062a\u06cc \u0631\u0627 \u062c\u0647\u062a \u062f\u0631\u062c \u0627\u0646\u062a\u062e\u0627\u0628 \u0646\u0645\u0627\u06cc\u06cc\u062f"},"alert":{"confirm_button_text":"\u062a\u0627\u06cc\u06cc\u062f","cancel_button_text":"\u0627\u0646\u0635\u0631\u0627\u0641"}}
 );
\ No newline at end of file
diff --git a/modules/system/assets/js/lang/lang.sv.js b/modules/system/assets/js/lang/lang.sv.js
index 6ebb84fa7..d9904e429 100644
--- a/modules/system/assets/js/lang/lang.sv.js
+++ b/modules/system/assets/js/lang/lang.sv.js
@@ -5,5 +5,5 @@ if ($.oc === undefined) $.oc = {}
 if ($.oc.langMessages === undefined) $.oc.langMessages = {}
 $.oc.langMessages['sv'] = $.extend(
     $.oc.langMessages['sv'] || {},
-    {"markdowneditor":{"formatting":"Formatting","quote":"Quote","code":"Code","header1":"Header 1","header2":"Header 2","header3":"Header 3","header4":"Header 4","header5":"Header 5","header6":"Header 6","bold":"Bold","italic":"Italic","unorderedlist":"Unordered List","orderedlist":"Ordered List","video":"Video","image":"Image","link":"Link","horizontalrule":"Insert Horizontal Rule","fullscreen":"Full screen","preview":"Preview"},"mediamanager":{"insert_link":"Insert Media Link","insert_image":"Insert Media Image","insert_video":"Insert Media Video","insert_audio":"Insert Media Audio","invalid_file_empty_insert":"Please select file to insert a links to.","invalid_file_single_insert":"Please select a single file.","invalid_image_empty_insert":"Please select image(s) to insert.","invalid_video_empty_insert":"Please select a video file to insert.","invalid_audio_empty_insert":"Please select an audio file to insert."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Cancel"}}
+    {"markdowneditor":{"formatting":"Formatering","quote":"Citat","code":"Kod","header1":"Rubrik 1","header2":"Rubrik 2","header3":"Rubrik 3","header4":"Rubrik 4","header5":"Rubrik 5","header6":"Rubrik 6","bold":"Fet","italic":"Kursiv","unorderedlist":"Oordnad lista","orderedlist":"Ordnad lista","video":"Video","image":"Bild","link":"L\u00e4nk","horizontalrule":"Infoga horisontiell linje","fullscreen":"Fullsk\u00e4rm","preview":"F\u00f6rhandsgranska"},"mediamanager":{"insert_link":"Infoga medial\u00e4nk","insert_image":"Infoga bild","insert_video":"Infoga video","insert_audio":"Infoga ljud","invalid_file_empty_insert":"V\u00e4nligen v\u00e4lj en fil att infoga till l\u00e4nken.","invalid_file_single_insert":"V\u00e4nligen v\u00e4lj en enskild fil.","invalid_image_empty_insert":"V\u00e4nligen v\u00e4lj bild(er) att infoga.","invalid_video_empty_insert":"V\u00e4nligen v\u00e4lj en video att infoga.","invalid_audio_empty_insert":"V\u00e4nligen v\u00e4lj en ljudfil att infoga."},"alert":{"confirm_button_text":"OK","cancel_button_text":"Avbryt"}}
 );
\ No newline at end of file
diff --git a/modules/system/assets/ui/storm-min.js b/modules/system/assets/ui/storm-min.js
index 84a8c9d96..7a3f60575 100644
--- a/modules/system/assets/ui/storm-min.js
+++ b/modules/system/assets/ui/storm-min.js
@@ -3411,8 +3411,7 @@ if(!data)$this.data('oc.inputPreset',(data=new InputPreset(this,options)))})}
 $.fn.inputPreset.Constructor=InputPreset
 $.fn.inputPreset.noConflict=function(){$.fn.inputPreset=old
 return this}
-$(document).render(function(){$('[data-input-preset]').inputPreset()})}(window.jQuery);+function($){"use strict";var TriggerOn=function(element,options){var $el=this.$el=$(element);this.options=options||{};if(this.options.triggerType!==false&&this.options.triggerAction===false)this.options.triggerAction=this.options.triggerType
-if(this.options.triggerCondition===false)
+$(document).render(function(){$('[data-input-preset]').inputPreset()})}(window.jQuery);+function($){"use strict";var TriggerOn=function(element,options){var $el=this.$el=$(element);this.options=options||{};if(this.options.triggerCondition===false)
 throw new Error('Trigger condition is not specified.')
 if(this.options.trigger===false)
 throw new Error('Trigger selector is not specified.')

From ddba926e2ae230819ba93ae621ee6ac738f22321 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 10 Oct 2015 20:36:37 +1100
Subject: [PATCH 102/103] Update redactor to latest

---
 .../richeditor/assets/css/richeditor.css      |   3 +-
 .../richeditor/assets/js/build-min.js         | 137 +++++----
 .../assets/vendor/redactor/redactor.css       |   7 +-
 .../assets/vendor/redactor/redactor.js        | 262 ++++++++++++------
 .../assets/vendor/redactor/redactor.less      |   7 +-
 5 files changed, 276 insertions(+), 140 deletions(-)

diff --git a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css
index 3c836b425..a6a9af91c 100755
--- a/modules/backend/formwidgets/richeditor/assets/css/richeditor.css
+++ b/modules/backend/formwidgets/richeditor/assets/css/richeditor.css
@@ -200,7 +200,8 @@ to{background-position:0 0}
 .redactor-editor video,.redactor-editor img{height:auto}
 .redactor-editor div,.redactor-editor p,.redactor-editor ul,.redactor-editor ol,.redactor-editor table,.redactor-editor dl,.redactor-editor figure,.redactor-editor blockquote,.redactor-editor pre{margin:0;margin-bottom:15px;border:none;background:none;box-shadow:none}
 .redactor-editor iframe,.redactor-editor object,.redactor-editor hr{margin-bottom:15px}
-.redactor-editor blockquote{margin-left:1.6em !important;padding-left:0;color:#777;font-style:italic}
+.redactor-editor blockquote{margin-left:1.6em !important;padding:0;text-align:left;color:#777;font-style:italic}
+.redactor-editor blockquote:before,.redactor-editor blockquote:after{content:''}
 .redactor-editor ul,.redactor-editor ol{padding-left:2em}
 .redactor-editor ul ul,.redactor-editor ol ol,.redactor-editor ul ol,.redactor-editor ol ul{margin:2px;padding:0;padding-left:2em;border:none}
 .redactor-editor ol ol li{list-style-type:lower-alpha}
diff --git a/modules/backend/formwidgets/richeditor/assets/js/build-min.js b/modules/backend/formwidgets/richeditor/assets/js/build-min.js
index 3ffc38e8d..3802c73de 100755
--- a/modules/backend/formwidgets/richeditor/assets/js/build-min.js
+++ b/modules/backend/formwidgets/richeditor/assets/js/build-min.js
@@ -22,7 +22,7 @@ else
 {$.data(this,'redactor',{});$.data(this,'redactor',Redactor(this,options));});}
 if(val.length===0)return this;else if(val.length===1)return val[0];else return val;};function Redactor(el,options)
 {return new Redactor.prototype.init(el,options);}
-$.Redactor=Redactor;$.Redactor.VERSION='10.2.2';$.Redactor.modules=['alignment','autosave','block','buffer','build','button','caret','clean','code','core','dropdown','file','focus','image','indent','inline','insert','keydown','keyup','lang','line','link','linkify','list','modal','observe','paragraphize','paste','placeholder','progress','selection','shortcuts','tabifier','tidy','toolbar','upload','utils'];$.Redactor.opts={lang:'en',direction:'ltr',plugins:false,focus:false,focusEnd:false,placeholder:false,visual:true,tabindex:false,minHeight:false,maxHeight:false,linebreaks:false,replaceDivs:true,paragraphize:true,cleanStyleOnEnter:false,enterKey:true,cleanOnPaste:true,cleanSpaces:true,pastePlainText:false,autosave:false,autosaveName:false,autosaveInterval:60,autosaveOnChange:false,autosaveFields:false,linkTooltip:true,linkProtocol:'http',linkNofollow:false,linkSize:50,imageEditable:true,imageLink:true,imagePosition:true,imageFloatMargin:'10px',imageResizable:true,imageUpload:null,imageUploadParam:'file',uploadImageField:false,dragImageUpload:true,fileUpload:null,fileUploadParam:'file',dragFileUpload:true,s3:false,convertLinks:true,convertUrlLinks:true,convertImageLinks:true,convertVideoLinks:true,preSpaces:4,tabAsSpaces:false,tabKey:true,scrollTarget:false,toolbar:true,toolbarFixed:true,toolbarFixedTarget:document,toolbarFixedTopOffset:0,toolbarExternal:false,toolbarOverflow:false,source:true,buttons:['html','formatting','bold','italic','deleted','unorderedlist','orderedlist','outdent','indent','image','file','link','alignment','horizontalrule'],buttonsHide:[],buttonsHideOnMobile:[],formatting:['p','blockquote','pre','h1','h2','h3','h4','h5','h6'],formattingAdd:false,tabifier:true,deniedTags:['script','style'],allowedTags:false,paragraphizeBlocks:['table','div','pre','form','ul','ol','h1','h2','h3','h4','h5','h6','dl','blockquote','figcaption','address','section','header','footer','aside','article','object','style','script','iframe','select','input','textarea','button','option','map','area','math','hr','fieldset','legend','hgroup','nav','figure','details','menu','summary','p'],removeComments:false,replaceTags:[['strike','del'],['b','strong']],replaceStyles:[['font-weight:\\s?bold',"strong"],['font-style:\\s?italic',"em"],['text-decoration:\\s?underline',"u"],['text-decoration:\\s?line-through','del']],removeDataAttr:false,removeAttr:false,allowedAttr:false,removeWithoutAttr:['span'],removeEmpty:['p'],activeButtons:['deleted','italic','bold','underline','unorderedlist','orderedlist','alignleft','aligncenter','alignright','justify'],activeButtonsStates:{b:'bold',strong:'bold',i:'italic',em:'italic',del:'deleted',strike:'deleted',ul:'unorderedlist',ol:'orderedlist',u:'underline'},shortcuts:{'ctrl+shift+m, meta+shift+m':{func:'inline.removeFormat'},'ctrl+b, meta+b':{func:'inline.format',params:['bold']},'ctrl+i, meta+i':{func:'inline.format',params:['italic']},'ctrl+h, meta+h':{func:'inline.format',params:['superscript']},'ctrl+l, meta+l':{func:'inline.format',params:['subscript']},'ctrl+k, meta+k':{func:'link.show'},'ctrl+shift+7':{func:'list.toggle',params:['orderedlist']},'ctrl+shift+8':{func:'list.toggle',params:['unorderedlist']}},shortcutsAdd:false,buffer:[],rebuffer:[],emptyHtml:'<p>&#x200b;</p>',invisibleSpace:'&#x200b;',imageTypes:['image/png','image/jpeg','image/gif'],indentValue:20,verifiedTags:['a','img','b','strong','sub','sup','i','em','u','small','strike','del','cite','ul','ol','li'],inlineTags:['strong','b','u','em','i','code','del','ins','samp','kbd','sup','sub','mark','var','cite','small'],alignmentTags:['P','H1','H2','H3','H4','H5','H6','DL','DT','DD','DIV','TD','BLOCKQUOTE','OUTPUT','FIGCAPTION','ADDRESS','SECTION','HEADER','FOOTER','ASIDE','ARTICLE'],blockLevelElements:['PRE','UL','OL','LI'],highContrast:false,observe:{dropdowns:[]},langs:{en:{html:'HTML',video:'Insert Video',image:'Insert Image',table:'Table',link:'Link',link_insert:'Insert link',link_edit:'Edit link',unlink:'Unlink',formatting:'Formatting',paragraph:'Normal text',quote:'Quote',code:'Code',header1:'Header 1',header2:'Header 2',header3:'Header 3',header4:'Header 4',header5:'Header 5',bold:'Bold',italic:'Italic',fontcolor:'Font Color',backcolor:'Back Color',unorderedlist:'Unordered List',orderedlist:'Ordered List',outdent:'Outdent',indent:'Indent',cancel:'Cancel',insert:'Insert',save:'Save',_delete:'Delete',insert_table:'Insert Table',insert_row_above:'Add Row Above',insert_row_below:'Add Row Below',insert_column_left:'Add Column Left',insert_column_right:'Add Column Right',delete_column:'Delete Column',delete_row:'Delete Row',delete_table:'Delete Table',rows:'Rows',columns:'Columns',add_head:'Add Head',delete_head:'Delete Head',title:'Title',image_position:'Position',none:'None',left:'Left',right:'Right',center:'Center',image_web_link:'Image Web Link',text:'Text',mailto:'Email',web:'URL',video_html_code:'Video Embed Code or Youtube/Vimeo Link',file:'Insert File',upload:'Upload',download:'Download',choose:'Choose',or_choose:'Or choose',drop_file_here:'Drop file here',align_left:'Align text to the left',align_center:'Center text',align_right:'Align text to the right',align_justify:'Justify text',horizontalrule:'Insert Horizontal Rule',deleted:'Deleted',anchor:'Anchor',link_new_tab:'Open link in new tab',underline:'Underline',alignment:'Alignment',filename:'Name (optional)',edit:'Edit',upload_label:'Drop file here or '}},linkify:{regexps:{youtube:/https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.\-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig,vimeo:/https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/,image:/((https?|www)[^\s]+\.)(jpe?g|png|gif)(\?[^\s-]+)?/ig,url:/(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/ig,}},codemirror:false};Redactor.fn=$.Redactor.prototype={keyCode:{BACKSPACE:8,DELETE:46,UP:38,DOWN:40,ENTER:13,SPACE:32,ESC:27,TAB:9,CTRL:17,META:91,SHIFT:16,ALT:18,RIGHT:39,LEFT:37,LEFT_WIN:91},init:function(el,options)
+$.Redactor=Redactor;$.Redactor.VERSION='10.2.5';$.Redactor.modules=['alignment','autosave','block','buffer','build','button','caret','clean','code','core','dropdown','file','focus','image','indent','inline','insert','keydown','keyup','lang','line','link','linkify','list','modal','observe','paragraphize','paste','placeholder','progress','selection','shortcuts','tabifier','tidy','toolbar','upload','utils'];$.Redactor.opts={lang:'en',direction:'ltr',plugins:false,focus:false,focusEnd:false,placeholder:false,visual:true,tabindex:false,minHeight:false,maxHeight:false,linebreaks:false,replaceDivs:true,paragraphize:true,cleanStyleOnEnter:false,enterKey:true,cleanOnPaste:true,cleanSpaces:true,pastePlainText:false,autosave:false,autosaveName:false,autosaveInterval:60,autosaveOnChange:false,autosaveFields:false,linkTooltip:true,linkProtocol:'http',linkNofollow:false,linkSize:50,imageEditable:true,imageLink:true,imagePosition:true,imageFloatMargin:'10px',imageResizable:true,imageUpload:null,imageUploadParam:'file',uploadImageField:false,dragImageUpload:true,fileUpload:null,fileUploadParam:'file',dragFileUpload:true,s3:false,convertLinks:true,convertUrlLinks:true,convertImageLinks:true,convertVideoLinks:true,preSpaces:4,tabAsSpaces:false,tabKey:true,scrollTarget:false,toolbar:true,toolbarFixed:true,toolbarFixedTarget:document,toolbarFixedTopOffset:0,toolbarExternal:false,toolbarOverflow:false,source:true,buttons:['html','formatting','bold','italic','deleted','unorderedlist','orderedlist','outdent','indent','image','file','link','alignment','horizontalrule'],buttonsHide:[],buttonsHideOnMobile:[],formatting:['p','blockquote','pre','h1','h2','h3','h4','h5','h6'],formattingAdd:false,tabifier:true,deniedTags:['script','style'],allowedTags:false,paragraphizeBlocks:['table','div','pre','form','ul','ol','h1','h2','h3','h4','h5','h6','dl','blockquote','figcaption','address','section','header','footer','aside','article','object','style','script','iframe','select','input','textarea','button','option','map','area','math','hr','fieldset','legend','hgroup','nav','figure','details','menu','summary','p'],removeComments:false,replaceTags:[['strike','del'],['b','strong']],replaceStyles:[['font-weight:\\s?bold',"strong"],['font-style:\\s?italic',"em"],['text-decoration:\\s?underline',"u"],['text-decoration:\\s?line-through','del']],removeDataAttr:false,removeAttr:false,allowedAttr:false,removeWithoutAttr:['span'],removeEmpty:['p'],activeButtons:['deleted','italic','bold','underline','unorderedlist','orderedlist','alignleft','aligncenter','alignright','justify'],activeButtonsStates:{b:'bold',strong:'bold',i:'italic',em:'italic',del:'deleted',strike:'deleted',ul:'unorderedlist',ol:'orderedlist',u:'underline'},shortcuts:{'ctrl+shift+m, meta+shift+m':{func:'inline.removeFormat'},'ctrl+b, meta+b':{func:'inline.format',params:['bold']},'ctrl+i, meta+i':{func:'inline.format',params:['italic']},'ctrl+h, meta+h':{func:'inline.format',params:['superscript']},'ctrl+l, meta+l':{func:'inline.format',params:['subscript']},'ctrl+k, meta+k':{func:'link.show'},'ctrl+shift+7':{func:'list.toggle',params:['orderedlist']},'ctrl+shift+8':{func:'list.toggle',params:['unorderedlist']}},shortcutsAdd:false,buffer:[],rebuffer:[],emptyHtml:'<p>&#x200b;</p>',invisibleSpace:'&#x200b;',imageTypes:['image/png','image/jpeg','image/gif'],indentValue:20,verifiedTags:['a','img','b','strong','sub','sup','i','em','u','small','strike','del','cite','ul','ol','li'],inlineTags:['strong','b','u','em','i','code','del','ins','samp','kbd','sup','sub','mark','var','cite','small'],alignmentTags:['P','H1','H2','H3','H4','H5','H6','DL','DT','DD','DIV','TD','BLOCKQUOTE','OUTPUT','FIGCAPTION','ADDRESS','SECTION','HEADER','FOOTER','ASIDE','ARTICLE'],blockLevelElements:['PRE','UL','OL','LI'],highContrast:false,observe:{dropdowns:[]},langs:{en:{html:'HTML',video:'Insert Video',image:'Insert Image',table:'Table',link:'Link',link_insert:'Insert link',link_edit:'Edit link',unlink:'Unlink',formatting:'Formatting',paragraph:'Normal text',quote:'Quote',code:'Code',header1:'Header 1',header2:'Header 2',header3:'Header 3',header4:'Header 4',header5:'Header 5',bold:'Bold',italic:'Italic',fontcolor:'Font Color',backcolor:'Back Color',unorderedlist:'Unordered List',orderedlist:'Ordered List',outdent:'Outdent',indent:'Indent',cancel:'Cancel',insert:'Insert',save:'Save',_delete:'Delete',insert_table:'Insert Table',insert_row_above:'Add Row Above',insert_row_below:'Add Row Below',insert_column_left:'Add Column Left',insert_column_right:'Add Column Right',delete_column:'Delete Column',delete_row:'Delete Row',delete_table:'Delete Table',rows:'Rows',columns:'Columns',add_head:'Add Head',delete_head:'Delete Head',title:'Title',image_position:'Position',none:'None',left:'Left',right:'Right',center:'Center',image_web_link:'Image Web Link',text:'Text',mailto:'Email',web:'URL',video_html_code:'Video Embed Code or Youtube/Vimeo Link',file:'Insert File',upload:'Upload',download:'Download',choose:'Choose',or_choose:'Or choose',drop_file_here:'Drop file here',align_left:'Align text to the left',align_center:'Center text',align_right:'Align text to the right',align_justify:'Justify text',horizontalrule:'Insert Horizontal Rule',deleted:'Deleted',anchor:'Anchor',link_new_tab:'Open link in new tab',underline:'Underline',alignment:'Alignment',filename:'Name (optional)',edit:'Edit',upload_label:'Drop file here or '}},linkify:{regexps:{youtube:/https?:\/\/(?:[0-9A-Z-]+\.)?(?:youtu\.be\/|youtube\.com\S*[^\w\-\s])([\w\-]{11})(?=[^\w\-]|$)(?![?=&+%\w.\-]*(?:['"][^<>]*>|<\/a>))[?=&+%\w.-]*/ig,vimeo:/https?:\/\/(www\.)?vimeo.com\/(\d+)($|\/)/,image:/((https?|www)[^\s]+\.)(jpe?g|png|gif)(\?[^\s-]+)?/ig,url:/(https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}|www\.[^\s]+\.[^\s]{2,})/ig,}},codemirror:false};Redactor.fn=$.Redactor.prototype={keyCode:{BACKSPACE:8,DELETE:46,UP:38,DOWN:40,ENTER:13,SPACE:32,ESC:27,TAB:9,CTRL:17,META:91,SHIFT:16,ALT:18,RIGHT:39,LEFT:37,LEFT_WIN:91},init:function(el,options)
 {this.$element=$(el);this.uuid=uuid++;this.rtePaste=false;this.$pasteBox=false;this.loadOptions(options);this.loadModules();this.formatting={};$.merge(this.opts.blockLevelElements,this.opts.alignmentTags);this.reIsBlock=new RegExp('^('+this.opts.blockLevelElements.join('|')+')$','i');this.tidy.setupAllowed();if(this.opts.deniedTags!==false)
 {var tags=['html','head','link','body','meta','applet'];for(var i=0;i<tags.length;i++)
 {this.opts.deniedTags.push(tags[i]);}}
@@ -39,7 +39,9 @@ this.lang.load();$.extend(this.opts.shortcuts,this.opts.shortcutsAdd);this.core.
 {this.alignment.set('right');},center:function()
 {this.alignment.set('center');},justify:function()
 {this.alignment.set('justify');},set:function(type)
-{if(!this.utils.browser('msie'))this.$editor.focus();this.buffer.set();this.selection.save();this.alignment.blocks=this.selection.getBlocks();this.alignment.type=type;if(this.alignment.isLinebreaksOrNoBlocks())
+{if(!this.utils.browser('msie')&&!this.opts.linebreaks)
+{this.$editor.focus();}
+this.alignment.blocks=this.selection.getBlocks();this.alignment.type=type;this.buffer.set();this.selection.save();if(this.alignment.isLinebreaksOrNoBlocks())
 {this.alignment.setText();}
 else
 {this.alignment.setBlocks();}
@@ -57,7 +59,7 @@ else
 {return{html:false,enable:function()
 {if(!this.opts.autosave)return;this.autosave.name=(this.opts.autosaveName)?this.opts.autosaveName:this.$textarea.attr('name');if(this.opts.autosaveOnChange)return;this.autosaveInterval=setInterval(this.autosave.load,this.opts.autosaveInterval*1000);},onChange:function()
 {if(!this.opts.autosaveOnChange)return;this.autosave.load();},load:function()
-{this.autosave.source=this.code.get();if(this.autosave.html===this.autosave.source)return;var data={};data['name']=this.autosave.name;data[this.autosave.name]=this.autosave.source;data=this.autosave.getHiddenFields(data);var jsxhr=$.ajax({url:this.opts.autosave,type:'post',data:data});jsxhr.done(this.autosave.success);},getHiddenFields:function(data)
+{if(!this.opts.autosave)return;this.autosave.source=this.code.get();if(this.autosave.html===this.autosave.source)return;var data={};data['name']=this.autosave.name;data[this.autosave.name]=this.autosave.source;data=this.autosave.getHiddenFields(data);var jsxhr=$.ajax({url:this.opts.autosave,type:'post',data:data});jsxhr.done(this.autosave.success);},getHiddenFields:function(data)
 {if(this.opts.autosaveFields===false||typeof this.opts.autosaveFields!=='object')
 {return data;}
 $.each(this.opts.autosaveFields,$.proxy(function(k,v)
@@ -213,7 +215,7 @@ else
 {this.opts.buffer.push(this.$editor.html());},undo:function()
 {if(this.opts.buffer.length===0)return;this.buffer.set('redo');this.buffer.getUndo();this.selection.restore();setTimeout($.proxy(this.observe.load,this),50);},redo:function()
 {if(this.opts.rebuffer.length===0)return;this.buffer.set('undo');this.buffer.getRedo();this.selection.restore();setTimeout($.proxy(this.observe.load,this),50);}};},build:function()
-{return{run:function()
+{return{focused:false,blured:true,run:function()
 {this.build.createContainerBox();this.build.loadContent();this.build.loadEditor();this.build.enableEditor();this.build.setCodeAndCall();},isTextarea:function()
 {return(this.$element[0].tagName==='TEXTAREA');},createContainerBox:function()
 {this.$box=$('<div class="redactor-box" role="application" />');},createTextarea:function()
@@ -231,7 +233,8 @@ this.modal.loadTemplates();this.build.plugins();setTimeout($.proxy(this.observe.
 {$(this.$textarea).attr('dir',this.opts.direction);if(this.opts.linebreaks)this.$editor.addClass('redactor-linebreaks');if(this.opts.tabindex)this.$editor.attr('tabindex',this.opts.tabindex);if(this.opts.minHeight)this.$editor.css('minHeight',this.opts.minHeight);if(this.opts.maxHeight)this.$editor.css('maxHeight',this.opts.maxHeight);},setEventDropUpload:function(e)
 {e.preventDefault();if(!this.opts.dragImageUpload||!this.opts.dragFileUpload)return;var files=e.dataTransfer.files;this.upload.directUpload(files[0],e);},setEventDrop:function(e)
 {this.code.sync();setTimeout(this.clean.clearUnverified,1);this.core.setCallback('drop',e);},setEvents:function()
-{this.$editor.on('drop.redactor',$.proxy(function(e)
+{this.$editor.on('dragover.redactor dragenter.redactor',function(e)
+{e.preventDefault();e.stopPropagation();});this.$editor.on('drop.redactor',$.proxy(function(e)
 {e=e.originalEvent||e;if(window.FormData===undefined||!e.dataTransfer)return true;if(e.dataTransfer.files.length===0)
 {return this.build.setEventDrop(e);}
 else
@@ -241,11 +244,16 @@ setTimeout(this.clean.clearUnverified,1);this.core.setCallback('drop',e);},this)
 {this.$textarea.on('keydown.redactor-textarea',$.proxy(this.opts.codeKeydownCallback,this));}
 if($.isFunction(this.opts.codeKeyupCallback))
 {this.$textarea.on('keyup.redactor-textarea',$.proxy(this.opts.codeKeyupCallback,this));}
-if($.isFunction(this.opts.focusCallback))
-{this.$editor.on('focus.redactor',$.proxy(this.opts.focusCallback,this));}
-$(document).on('mousedown.redactor.'+this.uuid,$.proxy(function(e){this.blurClickedElement=e.target;},this));this.$editor.on('blur.redactor',$.proxy(function(e)
-{if(this.start)return;if(this.rtePaste)return;if(!this.build.isBlured())return;this.utils.disableSelectAll();if($.isFunction(this.opts.blurCallback))this.core.setCallback('blur',e);},this));},isBlured:function()
-{if(this.blurClickedElement===true)return true;var $el=$(this.blurClickedElement);return(!$el.hasClass('redactor-toolbar, redactor-dropdown')&&!$el.is('#redactor-modal')&&$el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').length===0);},setHelpers:function()
+this.$editor.on('focus.redactor',$.proxy(function(e)
+{if($.isFunction(this.opts.focusCallback))
+{this.core.setCallback('focus',e);}
+this.build.focused=true;this.build.blured=false;if(this.selection.getCurrent()===false)
+{this.selection.get();this.range.setStart(this.$editor[0],0);this.range.setEnd(this.$editor[0],0);this.selection.addRange();}},this));$(document).on('mousedown.redactor-blur.'+this.uuid,$.proxy(function(e)
+{if(this.start)return;if(this.rtePaste)return;if($(e.target).closest('.redactor-editor, .redactor-toolbar, .redactor-dropdown').size()!==0)
+{return;}
+this.utils.disableSelectAll();if(!this.build.blured&&$.isFunction(this.opts.blurCallback))
+{this.core.setCallback('blur',e);}
+this.build.focused=false;this.build.blured=true;},this));},setHelpers:function()
 {if(this.linkify.isEnabled())
 {this.linkify.format();}
 this.placeholder.enable();if(this.opts.focus)setTimeout(this.focus.setStart,100);if(this.opts.focusEnd)setTimeout(this.focus.setEnd,100);},plugins:function()
@@ -273,10 +281,12 @@ else if(btnObject.dropdown)
 {type='dropdown';callback=false;}
 this.button.onClick(e,btnName,type,callback);},this));},createTooltip:function($button,name,title)
 {var $tooltip=$('<span>').addClass('redactor-toolbar-tooltip redactor-toolbar-tooltip-'+this.uuid+' redactor-toolbar-tooltip-'+name).hide().html(title);$tooltip.appendTo('body');$button.on('mouseover',function()
-{if($(this).hasClass('redactor-button-disabled'))return;var pos=$button.offset();$tooltip.show();$tooltip.css({top:(pos.top+$button.innerHeight())+'px',left:(pos.left+$button.innerWidth()/2-$tooltip.innerWidth()/2)+'px'});});$button.on('mouseout',function()
+{if($(this).hasClass('redactor-button-disabled'))
+{return;}
+var pos=$button.offset();$tooltip.css({top:(pos.top+$button.innerHeight())+'px',left:(pos.left+$button.innerWidth()/2-$tooltip.innerWidth()/2)+'px'});$tooltip.show();});$button.on('mouseout',function()
 {$tooltip.hide();});},onClick:function(e,btnName,type,callback)
-{this.button.caretOffset=this.caret.getOffset();e.preventDefault();if(this.utils.browser('msie'))e.returnValue=false;if(type=='command')this.inline.format(callback);else if(type=='dropdown')this.dropdown.show(e,btnName);else this.button.onClickCallback(e,callback,btnName);},onClickCallback:function(e,callback,btnName)
-{var func;this.blurClickedElement=true;if($.isFunction(callback))callback.call(this,btnName);else if(callback.search(/\./)!='-1')
+{this.button.caretOffset=this.caret.getOffset();e.preventDefault();$(document).find('.redactor-toolbar-tooltip').hide();if(this.utils.browser('msie'))e.returnValue=false;if(type=='command')this.inline.format(callback);else if(type=='dropdown')this.dropdown.show(e,btnName);else this.button.onClickCallback(e,callback,btnName);},onClickCallback:function(e,callback,btnName)
+{var func;if($.isFunction(callback))callback.call(this,btnName);else if(callback.search(/\./)!='-1')
 {func=callback.split('.');if(typeof this[func[0]]=='undefined')return;this[func[0]][func[1]](btnName);}
 else this[callback](btnName);this.observe.buttons(e,btnName);},get:function(key)
 {return this.$toolbar.find('a.re-'+key);},setActive:function(key)
@@ -341,7 +351,7 @@ this.range.collapse(false);this.selection.addRange();},getOffsetOfElement:functi
 {var offset=0;var sel=window.getSelection();if(sel.rangeCount>0)
 {var range=window.getSelection().getRangeAt(0);var caretRange=range.cloneRange();caretRange.selectNodeContents(this.$editor[0]);caretRange.setEnd(range.endContainer,range.endOffset);offset=caretRange.toString().length;}
 return offset;},setOffset:function(start,end)
-{if(typeof end=='undefined')end=start;if(!this.focus.isFocused())this.focus.setStart();var sel=this.selection.get();var node,offset=0;var walker=document.createTreeWalker(this.$editor[0],NodeFilter.SHOW_TEXT,null,null);while(node==walker.nextNode())
+{if(typeof end=='undefined')end=start;if(!this.focus.isFocused())this.focus.setStart();var sel=this.selection.get();var node,offset=0;var walker=document.createTreeWalker(this.$editor[0],NodeFilter.SHOW_TEXT,null,null);while(node=walker.nextNode())
 {offset+=node.nodeValue.length;if(offset>start)
 {this.range.setStart(node,node.nodeValue.length+start-offset);start=Infinity;}
 if(offset>=end)
@@ -350,10 +360,10 @@ this.range.collapse(false);this.selection.addRange();},setToPoint:function(start
 {this.caret.setOffset(start,end);},getCoords:function()
 {return this.caret.getOffset();}};},clean:function()
 {return{onSet:function(html)
-{html=html.replace(/<script(.*?[^>]?)>([\w\W]*?)<\/script>/gi,'<pre class="redactor-script-tag" style="display: none;" $1>$2</pre>');html=html.replace(/\$/g,'&#36;');html=html.replace(/<a href="(.*?[^>]?)®(.*?[^>]?)">/gi,'<a href="$1&reg$2">');if(this.opts.replaceDivs)html=this.clean.replaceDivs(html);if(this.opts.linebreaks)html=this.clean.replaceParagraphsToBr(html);html=this.clean.saveFormTags(html);var $div=$('<div>');$div.html(html);var fonts=$div.find('font[style]');if(fonts.length!==0)
+{html=this.clean.savePreCode(html);html=html.replace(/<script(.*?[^>]?)>([\w\W]*?)<\/script>/gi,'<pre class="redactor-script-tag" style="display: none;" $1>$2</pre>');html=html.replace(/\$/g,'&#36;');html=html.replace(/<a href="(.*?[^>]?)®(.*?[^>]?)">/gi,'<a href="$1&reg$2">');if(this.opts.replaceDivs&&!this.opts.linebreaks)html=this.clean.replaceDivs(html);if(this.opts.linebreaks)html=this.clean.replaceParagraphsToBr(html);html=this.clean.saveFormTags(html);var $div=$('<div>');$div.html(html);var fonts=$div.find('font[style]');if(fonts.length!==0)
 {fonts.replaceWith(function()
 {var $el=$(this);var $span=$('<span>').attr('style',$el.attr('style'));return $span.append($el.contents());});html=$div.html();}
-$div.remove();html=html.replace(/<font(.*?[^<])>/gi,'');html=html.replace(/<\/font>/gi,'');html=this.tidy.load(html);if(this.opts.paragraphize)html=this.paragraphize.load(html);html=this.clean.setVerified(html);html=this.clean.convertInline(html);html=html.replace(/&amp;/g,'&');return html;},onSync:function(html)
+$div.remove();html=html.replace(/<font(.*?)>/gi,'');html=html.replace(/<\/font>/gi,'');html=this.tidy.load(html);if(this.opts.paragraphize)html=this.paragraphize.load(html);html=this.clean.setVerified(html);html=this.clean.convertInline(html);html=html.replace(/&amp;/g,'&');return html;},onSync:function(html)
 {html=html.replace(/\u200B/g,'');html=html.replace(/&#x200b;/gi,'');if(this.opts.cleanSpaces)
 {html=html.replace(/&nbsp;/gi,' ');}
 if(html.search(/^<p>(||\s||<br\s?\/?>||&nbsp;)<\/p>$/i)!=-1)
@@ -361,8 +371,8 @@ if(html.search(/^<p>(||\s||<br\s?\/?>||&nbsp;)<\/p>$/i)!=-1)
 html=html.replace(/<pre class="redactor-script-tag" style="display: none;"(.*?[^>]?)>([\w\W]*?)<\/pre>/gi,'<script$1>$2</script>');html=this.clean.restoreFormTags(html);var chars={'\u2122':'&trade;','\u00a9':'&copy;','\u2026':'&hellip;','\u2014':'&mdash;','\u2010':'&dash;'};$.each(chars,function(i,s)
 {html=html.replace(new RegExp(i,'g'),s);});if(this.utils.browser('mozilla'))
 {html=html.replace(/<br\s?\/?>$/gi,'');}
-html=html.replace(new RegExp('<br\\s?/?></li>','gi'),'</li>');html=html.replace(new RegExp('</li><br\\s?/?>','gi'),'</li>');html=html.replace(/<(.*?)rel="\s*?"(.*?[^>]?)>/gi,'<$1$2">');html=html.replace(/<(.*?)style="\s*?"(.*?[^>]?)>/gi,'<$1$2">');html=html.replace(/="">/gi,'>');html=html.replace(/""">/gi,'">');html=html.replace(/"">/gi,'">');html=html.replace(/<div(.*?[^>]) data-tagblock="redactor"(.*?[^>])>/gi,'<div$1$2>');html=html.replace(/<(.*?) data-verified="redactor"(.*?[^>])>/gi,'<$1$2>');var $div=$("<div/>").html($.parseHTML(html,document,true));$div.find("span").removeAttr("rel");$div.find('pre .redactor-invisible-space').each(function()
-{$(this).contents().unwrap();});html=$div.html();html=html.replace(/<img(.*?[^>])rel="(.*?[^>])"(.*?[^>])>/gi,'<img$1$3>');html=html.replace(/<span class="redactor-invisible-space">(.*?)<\/span>/gi,'$1');html=html.replace(/ data-save-url="(.*?[^>])"/gi,'');html=html.replace(/<span(.*?)id="redactor-image-box"(.*?[^>])>([\w\W]*?)<img(.*?)><\/span>/gi,'$3<img$4>');html=html.replace(/<span(.*?)id="redactor-image-resizer"(.*?[^>])>(.*?)<\/span>/gi,'');html=html.replace(/<span(.*?)id="redactor-image-editter"(.*?[^>])>(.*?)<\/span>/gi,'');html=html.replace(/<font(.*?[^<])>/gi,'');html=html.replace(/<\/font>/gi,'');html=this.tidy.load(html);if(this.opts.linkNofollow)
+html=html.replace(new RegExp('<br\\s?/?></li>','gi'),'</li>');html=html.replace(new RegExp('</li><br\\s?/?>','gi'),'</li>');html=html.replace(/<(.*?)rel="\s*?"(.*?[^>]?)>/gi,'<$1$2">');html=html.replace(/<(.*?)style="\s*?"(.*?[^>]?)>/gi,'<$1$2">');html=html.replace(/="">/gi,'>');html=html.replace(/""">/gi,'">');html=html.replace(/"">/gi,'">');html=html.replace(/<div(.*?)data-tagblock="redactor"(.*?[^>])>/gi,'<div$1$2>');html=html.replace(/<(.*?) data-verified="redactor"(.*?[^>])>/gi,'<$1$2>');var $div=$("<div/>").html($.parseHTML(html,document,true));$div.find("span").removeAttr("rel");$div.find('pre .redactor-invisible-space').each(function()
+{$(this).contents().unwrap();});html=$div.html();html=html.replace(/<img(.*?[^>])rel="(.*?[^>])"(.*?[^>])>/gi,'<img$1$3>');html=html.replace(/<span class="redactor-invisible-space">(.*?)<\/span>/gi,'$1');html=html.replace(/ data-save-url="(.*?[^>])"/gi,'');html=html.replace(/<span(.*?)id="redactor-image-box"(.*?[^>])>([\w\W]*?)<img(.*?)><\/span>/gi,'$3<img$4>');html=html.replace(/<span(.*?)id="redactor-image-resizer"(.*?[^>])>(.*?)<\/span>/gi,'');html=html.replace(/<span(.*?)id="redactor-image-editter"(.*?[^>])>(.*?)<\/span>/gi,'');html=html.replace(/<font(.*?)>/gi,'');html=html.replace(/<\/font>/gi,'');html=this.tidy.load(html);if(this.opts.linkNofollow)
 {html=html.replace(/<a(.*?)rel="nofollow"(.*?[^>])>/gi,'<a$1$2>');html=html.replace(/<a(.*?[^>])>/gi,'<a$1 rel="nofollow">');}
 html=html.replace(/\sdata-redactor-(tag|class|style)="(.*?[^>])"/gi,'');html=html.replace(new RegExp('<(.*?) data-verified="redactor"(.*?[^>])>','gi'),'<$1$2>');html=html.replace(new RegExp('<(.*?) data-verified="redactor">','gi'),'<$1>');html=html.replace(/&amp;/g,'&');return html;},onPaste:function(html,setMode)
 {html=$.trim(html);html=html.replace(/\$/g,'&#36;');html=html.replace(/<span class="s[0-9]">/gi,'<span>');html=html.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi,' ');html=html.replace(/<span class="Apple-tab-span"[^>]*>\t<\/span>/gi,'\t');html=html.replace(/<span[^>]*>(\s|&nbsp;)<\/span>/gi,' ');if(this.opts.pastePlainText)
@@ -434,7 +444,7 @@ return html;},saveCodeFormatting:function(html)
 return html;},restoreSelectionMarker:function(html)
 {html=html.replace(/&lt;span id=&quot;selection-marker-([0-9])&quot; class=&quot;redactor-selection-marker&quot; data-verified=&quot;redactor&quot;&gt;​&lt;\/span&gt;/g,'<span id="selection-marker-$1" class="redactor-selection-marker" data-verified="redactor">​</span>');return html;},getTextFromHtml:function(html)
 {html=html.replace(/<br\s?\/?>|<\/H[1-6]>|<\/p>|<\/div>|<\/li>|<\/td>/gi,'\n');var tmp=document.createElement('div');tmp.innerHTML=html;html=tmp.textContent||tmp.innerText;return $.trim(html);},getPlainText:function(html,paragraphize)
-{html=this.clean.getTextFromHtml(html);html=html.replace(/\n/g,'<br />');if(this.opts.paragraphize&&typeof paragraphize=='undefined'&&!this.utils.browser('mozilla'))
+{html=this.clean.getTextFromHtml(html);html=html.replace(/\n\s*\n/g,"\n");html=html.replace(/\n\n/g,"\n");html=html.replace(/\n/g,'<br />');if(this.opts.paragraphize&&typeof paragraphize=='undefined'&&!this.utils.browser('mozilla'))
 {html=this.paragraphize.load(html);}
 return html;},getPreCode:function(html)
 {html=html.replace(/<img(.*?) style="(.*?)"(.*?[^>])>/gi,'<img$1$3>');html=html.replace(/<img(.*?)>/gi,'&lt;img$1&gt;');html=this.clean.getTextFromHtml(html);if(this.opts.preSpaces)
@@ -471,11 +481,11 @@ html=html.replace(/<div(.*?[^>])>/gi,'');html=html.replace(/<\/div>/gi,'');retur
 {return html.replace(/<section(.*?) rel="redactor-form-tag"(.*?)>([\w\W]*?)<\/section>/gi,'<form$1$2>$3</form>');}};},code:function()
 {return{set:function(html)
 {html=$.trim(html.toString());html=this.clean.onSet(html);if(this.utils.browser('msie'))
-{html=html.replace(/<span(.*?)id="selection-marker-(1|2)"(.*?)><\/span>;/gi,'');}
+{html=html.replace(/<span(.*?)id="selection-marker-(1|2)"(.*?)><\/span>/gi,'');}
 this.$editor.html(html);this.code.sync();if(html!=='')this.placeholder.remove();setTimeout($.proxy(this.buffer.add,this),15);if(this.start===false)this.observe.load();},get:function()
 {var code=this.$textarea.val();if(this.opts.replaceDivs)code=this.clean.replaceDivs(code);if(this.opts.linebreaks)code=this.clean.replaceParagraphsToBr(code);code=this.tabifier.get(code);return code;},sync:function()
 {setTimeout($.proxy(this.code.startSync,this),10);},startSync:function()
-{var html=this.$editor.html();if(this.code.syncCode&&this.code.syncCode==html)
+{var html=this.$editor.html();if(this.code.syncCode&&this.code.syncCode==html||(this.start&&html==''))
 {return;}
 this.code.syncCode=html;html=this.core.setCallback('syncBefore',html);html=this.clean.onSync(html);this.$textarea.val(html);this.core.setCallback('sync',html);if(this.start===false)
 {this.core.setCallback('change',html);}
@@ -551,7 +561,7 @@ if($.isFunction(callback))
 {return(typeof data=='undefined')?callback.call(this,e):callback.call(this,e,data);}
 else
 {return(typeof data=='undefined')?e:data;}},destroy:function()
-{this.opts.destroyed=true;this.core.setCallback('destroy');this.$element.off('.redactor').removeData('redactor');this.$editor.off('.redactor');$(document).off('mousedown.redactor.'+this.uuid);$(document).off('click.redactor-image-delete.'+this.uuid);$(document).off('click.redactor-image-resize-hide.'+this.uuid);$(document).off('touchstart.redactor.'+this.uuid+' click.redactor.'+this.uuid);$("body").off('scroll.redactor.'+this.uuid);$(this.opts.toolbarFixedTarget).off('scroll.redactor.'+this.uuid);this.$editor.removeClass('redactor-editor redactor-linebreaks redactor-placeholder');this.$editor.removeAttr('contenteditable');var html=this.code.get();if(this.opts.toolbar)
+{this.opts.destroyed=true;this.core.setCallback('destroy');this.$element.off('.redactor').removeData('redactor');this.$editor.off('.redactor');$(document).off('mousedown.redactor-blur.'+this.uuid);$(document).off('mousedown.redactor.'+this.uuid);$(document).off('click.redactor-image-delete.'+this.uuid);$(document).off('click.redactor-image-resize-hide.'+this.uuid);$(document).off('touchstart.redactor.'+this.uuid+' click.redactor.'+this.uuid);$("body").off('scroll.redactor.'+this.uuid);$(this.opts.toolbarFixedTarget).off('scroll.redactor.'+this.uuid);this.$editor.removeClass('redactor-editor redactor-linebreaks redactor-placeholder');this.$editor.removeAttr('contenteditable');var html=this.code.get();if(this.opts.toolbar)
 {this.$toolbar.find('a').each(function()
 {var $el=$(this);if($el.data('dropdown'))
 {$el.data('dropdown').remove();$el.data('dropdown',{});}});}
@@ -598,7 +608,9 @@ $(document).one('click.redactor-dropdown',$.proxy(this.dropdown.hide,this));this
 {this.$toolbar.find('a.dropact').removeClass('redactor-act').removeClass('dropact');this.utils.enableBodyScroll();$('.redactor-dropdown-'+this.uuid).hide();$('.redactor-dropdown-link-selected').removeClass('redactor-dropdown-link-selected');if(this.$dropdown)
 {this.$dropdown.off('.redactor-dropdown');this.core.setCallback('dropdownHide',this.$dropdown);this.$dropdown=false;}},hide:function(e)
 {var $dropdown=$(e.target);if(!$dropdown.hasClass('dropact')&&!$dropdown.hasClass('redactor-dropdown-link-inactive'))
-{$dropdown.removeClass('dropact');$dropdown.off('mouseover mouseout');this.dropdown.hideAll();}}};},file:function()
+{if($dropdown.hasClass('redactor-dropdown'))
+{$dropdown.removeClass('dropact');$dropdown.off('mouseover mouseout');}
+this.dropdown.hideAll();}}};},file:function()
 {return{show:function()
 {this.modal.load('file',this.lang.get('file'),700);this.upload.init('#redactor-modal-file-upload',this.opts.fileUpload,this.file.insert);this.selection.save();this.selection.get();var text=this.sel.toString();$('#redactor-filename').val(text);this.modal.show();},insert:function(json,direct,e)
 {if(typeof json.error!='undefined')
@@ -627,7 +639,7 @@ this.caret.setStart(first);},setEnd:function()
 {this.selection.get();this.range.collapse(true);this.range.setStartAfter(last[0]);this.range.setEnd(last[0],0);this.selection.addRange();}
 else
 {this.selection.get();this.range.selectNodeContents(last[0]);this.range.collapse(false);this.selection.addRange();}},isFocused:function()
-{var focusNode=document.getSelection().focusNode;if(focusNode===null)return false;if(this.opts.linebreaks&&$(focusNode.parentNode).hasClass('redactor-linebreaks'))return true;else if(!this.utils.isRedactorParent(focusNode.parentNode))return false;return this.$editor.is(':focus');}};},image:function()
+{return this.$editor[0]===document.activeElement;}};},image:function()
 {return{show:function()
 {this.modal.load('image',this.lang.get('image'),700);this.upload.init('#redactor-modal-image-droparea',this.opts.imageUpload,this.image.insert);this.selection.save();this.modal.show();},showEdit:function($image)
 {var $link=$image.closest('a',this.$editor[0]);this.modal.load('imageEdit',this.lang.get('edit'),705);this.modal.createCancelButton();this.image.buttonDelete=this.modal.createDeleteButton(this.lang.get('_delete'));this.image.buttonSave=this.modal.createActionButton(this.lang.get('save'));this.image.buttonDelete.on('click',$.proxy(function()
@@ -756,13 +768,13 @@ else
 {var $block=$(block);$block.find('span').not('.redactor-selection-marker').contents().unwrap();$block.append('<br>');}}};},inline:function()
 {return{formatting:function(name)
 {var type,value;if(typeof this.formatting[name].style!='undefined')type='style';else if(typeof this.formatting[name]['class']!='undefined')type='class';if(type)value=this.formatting[name][type];this.inline.format(this.formatting[name].tag,type,value);},format:function(tag,type,value)
-{var current=this.selection.getCurrent();if(current&&current.tagName==='TR')return;this.blurClickedElement=true;if(this.utils.isCurrentOrParent('PRE')||this.utils.isCurrentOrParentHeader())return;var tags=['b','bold','i','italic','underline','strikethrough','deleted','superscript','subscript'];var replaced=['strong','strong','em','em','u','del','del','sup','sub'];for(var i=0;i<tags.length;i++)
+{var current=this.selection.getCurrent();if(current&&current.tagName==='TR')return;if(this.utils.isCurrentOrParent('PRE')||this.utils.isCurrentOrParentHeader())return;var tags=['b','bold','i','italic','underline','strikethrough','deleted','superscript','subscript'];var replaced=['strong','strong','em','em','u','del','del','sup','sub'];for(var i=0;i<tags.length;i++)
 {if(tag==tags[i])tag=replaced[i];}
 if(this.opts.allowedTags)
 {if($.inArray(tag,this.opts.allowedTags)==-1)return;}
 else
 {if($.inArray(tag,this.opts.deniedTags)!==-1)return;}
-this.inline.type=type||false;this.inline.value=value||false;this.buffer.set();if(!this.utils.browser('msie'))
+this.inline.type=type||false;this.inline.value=value||false;this.buffer.set();if(!this.utils.browser('msie')&&!this.opts.linebreaks)
 {this.$editor.focus();}
 this.selection.get();if(this.range.collapsed)
 {this.inline.formatCollapsed(tag);}
@@ -780,7 +792,7 @@ var node=$('<'+tag+'>').attr('data-verified','redactor').attr('data-redactor-tag
 {$span=$('<span>').attr('data-redactor-tag',tag).attr('data-verified','redactor');$span=this.inline.setFormat($span);}
 else
 {$span=$('<'+tag+'>').attr('data-redactor-tag',tag).attr('data-verified','redactor');}
-$el.replaceWith($span.html($el.contents()));var $parent=$span.parent();if($parent&&$parent[0].tagName==='U')
+$el.replaceWith($span.html($el.contents()));var $parent=$span.parent();if($span[0].tagName==='A'&&$parent&&$parent[0].tagName==='U')
 {$span.parent().replaceWith($span);}
 if(tag=='span')
 {if($parent&&$parent[0].tagName==='SPAN'&&this.inline.type==='style')
@@ -795,6 +807,9 @@ var property=$el.css('text-decoration');if(property==='line-through')
 if(tag!='del')
 {var _this=this;this.$editor.find('inline').each(function(i,s)
 {_this.utils.replaceToTag(s,'del');});}
+if(tag!='u')
+{var _this=this;this.$editor.find('unline').each(function(i,s)
+{_this.utils.replaceToTag(s,'u');});}
 this.selection.restore();this.code.sync();},formatRemoveSameChildren:function($el,tag)
 {var self=this;$el.children(tag).each(function()
 {var $child=$(this);if(!$child.hasClass('redactor-selection-marker'))
@@ -809,6 +824,9 @@ else
 var self=this;if(tag!='del')
 {this.$editor.find('del').each(function(i,s)
 {self.utils.replaceToTag(s,'inline');});}
+if(tag!='u')
+{this.$editor.find('u').each(function(i,s)
+{self.utils.replaceToTag(s,'unline');});}
 if(tag!='span')
 {this.$editor.find(tag).each(function()
 {var $el=$(this);$el.replaceWith($('<strike />').html($el.contents()));});}
@@ -856,7 +874,9 @@ this.range.insertNode(frag);if(lastNode)
 {var range=this.range.cloneRange();range.setStartAfter(lastNode);range.collapse(true);this.sel.removeAllRanges();this.sel.addRange(range);}}
 this.code.sync();this.clean.clearUnverified();},htmlWithoutClean:function(html)
 {this.insert.html(html,false);},html:function(html,clean)
-{this.placeholder.remove();if(typeof clean=='undefined')clean=true;this.$editor.focus();html=this.clean.setVerified(html);if(clean)
+{this.placeholder.remove();if(typeof clean=='undefined')clean=true;if(!this.opts.linebreaks)
+{this.$editor.focus();}
+html=this.clean.setVerified(html);if(clean)
 {html=this.clean.onPaste(html);}
 if(this.utils.browser('msie'))
 {this.insert.htmlIe(html);}
@@ -874,11 +894,11 @@ document.selection.createRange().pasteHTML(html);},execHtml:function(html)
 {html=this.clean.setVerified(html);this.selection.get();this.range.deleteContents();var el=document.createElement('div');el.innerHTML=html;var frag=document.createDocumentFragment(),node,lastNode;while((node=el.firstChild))
 {lastNode=frag.appendChild(node);}
 this.range.insertNode(frag);this.range.collapse(true);this.caret.setAfter(lastNode);},node:function(node,deleteContents)
-{node=node[0]||node;var html=this.utils.getOuterHtml(node);html=this.clean.setVerified(html);if(html.match(/</g)!==null)
+{node=node[0]||node;var offset=this.caret.getOffset();var html=this.utils.getOuterHtml(node);html=this.clean.setVerified(html);if(html.match(/</g)!==null)
 {node=$(html)[0];}
 this.selection.get();if(deleteContents!==false)
 {this.range.deleteContents();}
-this.range.insertNode(node);this.range.collapse(false);this.selection.addRange();return node;},nodeToPoint:function(node,x,y)
+this.range.insertNode(node);this.range.collapse(false);this.selection.addRange();this.caret.setOffset(offset);return node;},nodeToPoint:function(node,x,y)
 {node=node[0]||node;this.selection.get();var range;if(document.caretPositionFromPoint)
 {var pos=document.caretPositionFromPoint(x,y);this.range.setStart(pos.offsetNode,pos.offset);this.range.collapse(true);this.range.insertNode(node);}
 else if(document.caretRangeFromPoint)
@@ -967,7 +987,7 @@ this.code.sync();},checkEvents:function(arrow,key)
 {if(!arrow&&(this.core.getEvent()=='click'||this.core.getEvent()=='arrow'))
 {this.core.addEvent(false);if(this.keydown.checkKeyEvents(key))
 {this.buffer.set();}}},checkKeyEvents:function(key)
-{var k=this.keyCode;var keys=[k.BACKSPACE,k.DELETE,k.ENTER,k.SPACE,k.ESC,k.TAB,k.CTRL,k.META,k.ALT,k.SHIFT];return($.inArray(key,keys)==-1)?true:false;},addArrowsEvent:function(arrow)
+{var k=this.keyCode;var keys=[k.BACKSPACE,k.DELETE,k.ENTER,k.ESC,k.TAB,k.CTRL,k.META,k.ALT,k.SHIFT];return($.inArray(key,keys)==-1)?true:false;},addArrowsEvent:function(arrow)
 {if(!arrow)return;if((this.core.getEvent()=='click'||this.core.getEvent()=='arrow'))
 {this.core.addEvent(false);return;}
 this.core.addEvent('arrow');},setupBuffer:function(e,key)
@@ -976,7 +996,7 @@ this.core.addEvent('arrow');},setupBuffer:function(e,key)
 else if(this.keydown.ctrl&&key===90&&e.shiftKey&&!e.altKey&&this.opts.rebuffer.length!==0)
 {e.preventDefault();this.buffer.redo();return;}
 else if(!this.keydown.ctrl)
-{if(key==this.keyCode.BACKSPACE||key==this.keyCode.DELETE||(key==this.keyCode.ENTER&&!e.ctrlKey&&!e.shiftKey)||key==this.keyCode.SPACE)
+{if(key==this.keyCode.BACKSPACE||key==this.keyCode.DELETE||(key==this.keyCode.ENTER&&!e.ctrlKey&&!e.shiftKey))
 {this.buffer.set();}}},setupSelectAll:function(e,key)
 {if(this.keydown.ctrl&&key===65)
 {this.utils.enableSelectAll();}
@@ -1030,7 +1050,7 @@ if(dbl===true)
 var br2=document.createElement('br');this.range.insertNode(br2);this.caret.setAfter(br2);}
 else
 {if(this.utils.browser('msie'))
-{var space=document.createElement('span');space.innerHTML='&#x200b;';$(br1).after(space);this.caret.setAfter(space);$(space).remove();}
+{var space=document.createElement('span');space.innerHTML='&#x200b;';$(br1).after(space);this.range.setStartAfter(space);this.range.setEndAfter(space);$(space).remove();}
 else
 {var range=document.createRange();range.setStartAfter(br1);range.collapse(true);var selection=window.getSelection();selection.removeAllRanges();selection.addRange(range);}}
 this.code.sync();return false;},removeInvisibleSpace:function()
@@ -1041,7 +1061,7 @@ this.code.sync();return false;},removeInvisibleSpace:function()
 {return{init:function(e)
 {if(this.rtePaste)return;var key=e.which;this.keyup.current=this.selection.getCurrent();this.keyup.parent=this.selection.getParent();var $parent=this.utils.isRedactorParent($(this.keyup.parent).parent());var keyupStop=this.core.setCallback('keyup',e);if(keyupStop===false)
 {e.preventDefault();return false;}
-if(!this.opts.linebreaks&&this.keyup.current.nodeType==3&&this.keyup.current.length<=1&&(this.keyup.parent===false||this.keyup.parent.tagName=='BODY'))
+if(!this.opts.linebreaks&&this.keyup.current.nodeType===3&&this.keyup.current.length<=1&&(this.keyup.parent===false||this.keyup.parent.tagName=='BODY'))
 {this.keyup.replaceToParagraph();}
 if(!this.opts.linebreaks&&this.utils.isRedactorParent(this.keyup.current)&&this.keyup.current.tagName==='DIV')
 {this.keyup.replaceToParagraph(false);}
@@ -1056,14 +1076,17 @@ this.clean.clearUnverified();if(this.observe.image)
 this.$editor.find('p').each($.proxy(function(i,s)
 {this.utils.removeEmpty(i,$(s).html());},this));if(this.opts.linebreaks&&this.keyup.current&&this.keyup.current.tagName=='DIV'&&this.utils.isEmpty(this.keyup.current.innerHTML))
 {$(this.keyup.current).after(this.selection.getMarkerAsHtml());this.selection.restore();$(this.keyup.current).remove();}
-return this.keyup.formatEmpty(e);}},replaceToParagraph:function(clone)
+this.keyup.removeEmptyLists();return this.keyup.formatEmpty(e);}},replaceToParagraph:function(clone)
 {var $current=$(this.keyup.current);var node;if(clone===false)
 {node=$('<p>').append($current.html());}
 else
 {node=$('<p>').append($current.clone());}
 $current.replaceWith(node);var next=$(node).next();if(typeof(next[0])!=='undefined'&&next[0].tagName=='BR')
 {next.remove();}
-this.caret.setEnd(node);},formatEmpty:function(e)
+this.caret.setEnd(node);},removeEmptyLists:function()
+{var removeIt=function()
+{var html=$.trim(this.innerHTML).replace(/\/t\/n/g,'');if(html==='')
+{$(this).remove();}};this.$editor.find('li').each(removeIt);this.$editor.find('ul, ol').each(removeIt);},formatEmpty:function(e)
 {var html=$.trim(this.$editor.html());if(!this.utils.isEmpty(html))return;e.preventDefault();if(this.opts.linebreaks)
 {this.$editor.html(this.selection.getMarkerAsHtml());this.selection.restore();}
 else
@@ -1108,7 +1131,7 @@ else
 {this.link.$inputUrl.addClass('redactor-input-error').on('keyup',function()
 {$(this).removeClass('redactor-input-error');$(this).off('keyup');});return;}
 if(link.search('@')!=-1&&/(http|ftp|https):\/\//i.test(link)===false)
-{link='mailto:'+link;}
+{link=link.replace('mailto:','');link='mailto:'+link;}
 else if(link.search('#')!==0)
 {if($('#redactor-link-blank').prop('checked'))
 {target='_blank';}
@@ -1129,7 +1152,9 @@ else
 this.selection.selectElement($link);this.code.sync();}
 else
 {if(this.utils.browser('mozilla')&&this.link.text==='')
-{var $a=$('<a />').attr('href',link).text(text);if(target!=='')$a.attr('target',target);this.insert.node($a);this.selection.selectElement($a);}
+{var $a=$('<a />').attr('href',link).text(text);if(target!=='')$a.attr('target',target);$a=$(this.insert.node($a));if(this.opts.linebreaks)
+{$a.after('&nbsp;');}
+this.selection.selectElement($a);}
 else
 {var $a;if(this.utils.browser('msie'))
 {$a=$('<a href="'+link+'">').text(text);if(target!=='')$a.attr('target',target);$a=$(this.insert.node($a));if(this.selection.getText().match(/\s$/))
@@ -1143,6 +1168,8 @@ if(target!=='')$a.attr('target',target);$a.removeAttr('style').removeAttr('_moz_
 if(this.link.text!==''||this.link.text!=text)
 {if(!this.opts.linebreaks&&blocks&&blocks.length<=1)
 {$a.text(text);}
+else if(this.opts.linebreaks)
+{$a.text(text);}
 this.selection.selectElement($a);}}}
 this.code.sync();this.core.setCallback('insertedLink',$a);}
 setTimeout($.proxy(function()
@@ -1171,7 +1198,8 @@ else if(opts.convertImageLinks&&html.match(opts.linkify.regexps.image))
 else if(opts.convertUrlLinks)
 {html=linkify.convertLinks(html);}
 $(this).before(text.replace(text,html)).remove();});var objects=this.$editor.find('.redactor-linkify-object').each(function()
-{var $el=$(this);$el.removeClass('redactor-linkify-object');if($el.attr('class')==='')$el.removeAttr('class');return $el[0];});this.core.setCallback('linkify',objects);this.code.sync();},convertVideoLinks:function(html)
+{var $el=$(this);$el.removeClass('redactor-linkify-object');if($el.attr('class')==='')$el.removeAttr('class');return $el[0];});setTimeout($.proxy(function()
+{this.observe.load();this.core.setCallback('linkify',objects);},this),100);this.code.sync();},convertVideoLinks:function(html)
 {var iframeStart='<iframe class="redactor-linkify-object" width="500" height="281" src="',iframeEnd='" frameborder="0" allowfullscreen></iframe>';if(html.match(this.opts.linkify.regexps.youtube))
 {html=html.replace(this.opts.linkify.regexps.youtube,iframeStart+'//www.youtube.com/embed/$1'+iframeEnd);}
 if(html.match(this.opts.linkify.regexps.vimeo))
@@ -1189,12 +1217,16 @@ return html;},convertLinks:function(html)
 {linkProtocol="";}
 if(text.length>this.opts.linkSize)
 {text=text.substring(0,this.opts.linkSize)+'...';}
-text=decodeURIComponent(text);var regexB="\\b";if($.inArray(href.slice(-1),["/","&","="])!=-1)
+if(text.search('%')===-1)
+{text=decodeURIComponent(text);}
+var regexB="\\b";if($.inArray(href.slice(-1),["/","&","="])!=-1)
 {regexB="";}
 var regexp=new RegExp('('+href.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")+regexB+')','g');html=html.replace(regexp,'<a href="'+linkProtocol+$.trim(href)+'" class="redactor-linkify-object">'+$.trim(text)+'</a>');}}
 return html;}};},list:function()
 {return{toggle:function(cmd)
-{this.placeholder.remove();if(!this.utils.browser('msie'))this.$editor.focus();this.buffer.set();this.selection.save();var parent=this.selection.getParent();var $list=$(parent).closest('ol, ul',this.$editor[0]);if(!this.utils.isRedactorParent($list)&&$list.length!==0)
+{this.placeholder.remove();if(!this.utils.browser('msie')&&!this.opts.linebreaks)
+{this.$editor.focus();}
+this.buffer.set();this.selection.save();var parent=this.selection.getParent();var $list=$(parent).closest('ol, ul',this.$editor[0]);if(!this.utils.isRedactorParent($list)&&$list.length!==0)
 {$list=false;}
 var isUnorderedCmdOrdered,isOrderedCmdUnordered;var remove=false;if($list&&$list.length)
 {remove=true;var listTag=$list[0].tagName;isUnorderedCmdOrdered=(cmd==='orderedlist'&&listTag==='UL');isOrderedCmdUnordered=(cmd==='unorderedlist'&&listTag==='OL');}
@@ -1407,15 +1439,15 @@ return html;},replaceBreaksToNewLines:function(html)
 this.rtePaste=true;this.buffer.set();this.selection.save();this.utils.saveScroll();this.paste.createPasteBox();$(window).on('scroll.redactor-freeze',$.proxy(function()
 {$(window).scrollTop(this.saveBodyScroll);},this));setTimeout($.proxy(function()
 {var html=this.$pasteBox.html();this.$pasteBox.remove();this.selection.restore();this.utils.restoreScroll();this.paste.insert(html);$(window).off('scroll.redactor-freeze');if(this.linkify.isEnabled())
-this.linkify.format();},this),1);},createPasteBox:function()
+{this.linkify.format();}},this),1);},createPasteBox:function()
 {this.$pasteBox=$('<div>').html('').attr('contenteditable','true').css({position:'fixed',width:0,top:0,left:'-9999px'});if(this.utils.browser('msie'))
 {this.$box.append(this.$pasteBox);}
 else
-{if($('.modal-body').length>0)
-{$('.modal-body').append(this.$pasteBox);}
+{var $visibleModals=$('.modal-body:visible');if($visibleModals.length>0)
+{$visibleModals.append(this.$pasteBox);}
 else
 {$('body').append(this.$pasteBox);}}
-this.$pasteBox.focus();},insert:function(html)
+this.$pasteBox.get(0).focus();},insert:function(html)
 {html=this.core.setCallback('pasteBefore',html);html=(this.utils.isSelectAll())?this.clean.onPaste(html,false):this.clean.onPaste(html);html=this.core.setCallback('paste',html);if(this.utils.isSelectAll())
 {this.insert.set(html,false);}
 else
@@ -1473,7 +1505,7 @@ var inlines=[];var nodes=this.selection.getNodes();$.each(nodes,$.proxy(function
 {return[this.selection.getBlock()];}
 var blocks=[];nodes=(typeof nodes=='undefined')?this.selection.getNodes():nodes;$.each(nodes,$.proxy(function(i,node)
 {if(this.utils.isBlock(node))
-{this.selection.lastBlock=node;blocks.push(node);}},this));return(blocks.length===0)?[this.selection.getBlock()]:blocks;},getLastBlock:function()
+{blocks.push(node);}},this));return(blocks.length===0)?[this.selection.getBlock()]:blocks;},getLastBlock:function()
 {return this.selection.lastBlock;},getNodes:function()
 {this.selection.get();var startNode=this.selection.getNodesMarker(1);var endNode=this.selection.getNodesMarker(2);if(this.range.collapsed===false)
 {if(window.getSelection){var sel=window.getSelection();if(sel.rangeCount>0){var range=sel.getRangeAt(0);var startPointNode=range.startContainer,startOffset=range.startOffset;var boundaryRange=range.cloneRange();boundaryRange.collapse(false);boundaryRange.insertNode(endNode);boundaryRange.setStart(startPointNode,startOffset);boundaryRange.collapse(true);boundaryRange.insertNode(startNode);range.setStartAfter(startNode);range.setEndBefore(endNode);sel.removeAllRanges();sel.addRange(range);}}}
@@ -1602,7 +1634,9 @@ if(nl&&'/'==tag.charAt(1))this.tabifier.cleanlevel--;if('\n'==out.charAt(out.len
 {out=out.replace(/ *$/,'');}
 return out;}};},tidy:function()
 {return{setupAllowed:function()
-{if(this.opts.allowedTags)this.opts.deniedTags=false;if(this.opts.allowedAttr)this.opts.removeAttr=false;if(this.opts.linebreaks)return;var tags=['p','section'];if(this.opts.allowedTags)this.tidy.addToAllowed(tags);if(this.opts.deniedTags)this.tidy.removeFromDenied(tags);},addToAllowed:function(tags)
+{var index=$.inArray('span',this.opts.removeEmpty);if(index!==-1)
+{this.opts.removeEmpty.splice(index,1);}
+if(this.opts.allowedTags)this.opts.deniedTags=false;if(this.opts.allowedAttr)this.opts.removeAttr=false;if(this.opts.linebreaks)return;var tags=['p','section'];if(this.opts.allowedTags)this.tidy.addToAllowed(tags);if(this.opts.deniedTags)this.tidy.removeFromDenied(tags);},addToAllowed:function(tags)
 {var len=tags.length;for(var i=0;i<len;i++)
 {if($.inArray(tags[i],this.opts.allowedTags)==-1)
 {this.opts.allowedTags.push(tags[i]);}}},removeFromDenied:function(tags)
@@ -1742,7 +1776,7 @@ this.upload.callback(json,this.upload.direct,e);}},this);xhr.send(formData);},on
 {delete this.upload.fileFields[name];},s3uploadFile:function(file)
 {this.upload.s3executeOnSignedUrl(file,$.proxy(function(signedURL)
 {this.upload.s3uploadToS3(file,signedURL);},this));},s3executeOnSignedUrl:function(file,callback)
-{var xhr=new XMLHttpRequest();var mark='?';if(this.opts.s3.search(/\?/)!='-1')mark='&';xhr.open('GET',this.opts.s3+mark+'name='+file.name+'&type='+file.type,true);if(xhr.overrideMimeType)xhr.overrideMimeType('text/plain; charset=x-user-defined');var that=this;xhr.onreadystatechange=function(e)
+{var xhr=new XMLHttpRequest();var mark=(this.opts.s3.search(/\?/)!=='-1')?'?':'&';xhr.open('GET',this.opts.s3+mark+'name='+file.name+'&type='+file.type,true);if(xhr.overrideMimeType)xhr.overrideMimeType('text/plain; charset=x-user-defined');var that=this;xhr.onreadystatechange=function(e)
 {if(this.readyState==4&&this.status==200)
 {that.progress.show();callback(decodeURIComponent(this.responseText));}
 else if(this.readyState==4&&this.status!=200)
@@ -1767,9 +1801,7 @@ var json={filelink:s3file[0]};if(this.upload.type=='file')
 {var arr=s3file[0].split('/');json.filename=arr[arr.length-1];}
 this.upload.callback(json,this.upload.direct,false);}
 else
-{}},this);xhr.onerror=function()
-{};xhr.upload.onprogress=function(e)
-{};xhr.setRequestHeader('Content-Type',file.type);xhr.setRequestHeader('x-amz-acl','public-read');xhr.send(file);}}};},utils:function()
+{}},this);xhr.onerror=function(){};xhr.upload.onprogress=function(e){};xhr.setRequestHeader('Content-Type',file.type);xhr.setRequestHeader('x-amz-acl','public-read');xhr.send(file);}}};},utils:function()
 {return{isMobile:function()
 {return/(iPhone|iPod|BlackBerry|Android)/.test(navigator.userAgent);},isDesktop:function()
 {return!/(iPhone|iPod|iPad|BlackBerry|Android)/.test(navigator.userAgent);},isString:function(obj)
@@ -1805,7 +1837,8 @@ if(removeInlineTags===true)self.utils.removeInlineTags(replacement);return repla
 {var block=this.selection.getBlock();if(!block)return false;var offset=this.caret.getOffsetOfElement(block);return(offset===0)?true:false;},isEndOfElement:function(element)
 {if(typeof element=='undefined')
 {var element=this.selection.getBlock();if(!element)return false;}
-var offset=this.caret.getOffsetOfElement(element);var text=$.trim($(element).text()).replace(/\n\r\n/g,'');return(offset==text.length)?true:false;},isEndOfEditor:function()
+var offset=this.caret.getOffsetOfElement(element);var text=$.trim($(element).text()).replace(/\n\r\n/g,'');return(offset==text.length)?true:false;},isStartOfEditor:function()
+{var offset=this.caret.getOffsetOfElement(this.$editor[0]);return(offset===0)?true:false;},isEndOfEditor:function()
 {var block=this.$editor[0];var offset=this.caret.getOffsetOfElement(block);var text=$.trim($(block).html().replace(/(<([^>]+)>)/gi,''));return(offset==text.length)?true:false;},isBlock:function(block)
 {block=block[0]||block;return block&&this.utils.isBlockTag(block.tagName);},isBlockTag:function(tag)
 {if(typeof tag=='undefined')return false;return this.reIsBlock.test(tag);},isTag:function(current,tag)
diff --git a/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.css b/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.css
index b04a3fcb5..03fd6bf0d 100755
--- a/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.css
+++ b/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.css
@@ -841,10 +841,15 @@ body .redactor-box-fullscreen {
 }
 .redactor-editor blockquote {
   margin-left: 1.6em !important;
-  padding-left: 0;
+  padding: 0;
+  text-align: left;
   color: #777;
   font-style: italic;
 }
+.redactor-editor blockquote:before,
+.redactor-editor blockquote:after {
+  content: '';
+}
 .redactor-editor ul,
 .redactor-editor ol {
   padding-left: 2em;
diff --git a/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.js b/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.js
index e1210d276..d65e5a06e 100755
--- a/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.js
+++ b/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.js
@@ -1,6 +1,6 @@
 /*
-	Redactor 10.2.2
-	Updated: July 15, 2015
+	Redactor 10.2.5
+	Updated: October 1, 2015
 
 	http://imperavi.com/redactor/
 
@@ -92,7 +92,7 @@
 
 	// Functionality
 	$.Redactor = Redactor;
-	$.Redactor.VERSION = '10.2.2';
+	$.Redactor.VERSION = '10.2.5';
 	$.Redactor.modules = ['alignment', 'autosave', 'block', 'buffer', 'build', 'button',
 						  'caret', 'clean', 'code', 'core', 'dropdown', 'file', 'focus',
 						  'image', 'indent', 'inline', 'insert', 'keydown', 'keyup',
@@ -477,15 +477,18 @@
 				set: function(type)
 				{
 					// focus
-					if (!this.utils.browser('msie')) this.$editor.focus();
-
-					this.buffer.set();
-					this.selection.save();
+					if (!this.utils.browser('msie') && !this.opts.linebreaks)
+					{
+						this.$editor.focus();
+					}
 
 					// get blocks
 					this.alignment.blocks = this.selection.getBlocks();
 					this.alignment.type = type;
 
+					this.buffer.set();
+					this.selection.save();
+
 					// set alignment
 					if (this.alignment.isLinebreaksOrNoBlocks())
 					{
@@ -562,6 +565,8 @@
 				},
 				load: function()
 				{
+					if (!this.opts.autosave) return;
+
 					this.autosave.source = this.code.get();
 
 					if (this.autosave.html === this.autosave.source) return;
@@ -715,7 +720,6 @@
 						return;
 					}
 
-
 					var block = this.block.blocks[0];
 					if (block === false) return;
 
@@ -784,6 +788,7 @@
 				setMultiple: function(tag)
 				{
 					var block = this.block.blocks[0];
+
 					var isContainerTable = (this.block.containerTag  == 'TD' || this.block.containerTag  == 'TH');
 
 					if (block !== false && this.block.blocksSize === 1)
@@ -1236,6 +1241,8 @@
 		build: function()
 		{
 			return {
+				focused: false,
+				blured: true,
 				run: function()
 				{
 					this.build.createContainerBox();
@@ -1361,6 +1368,12 @@
 				setEvents: function()
 				{
 					// drop
+					this.$editor.on('dragover.redactor dragenter.redactor', function(e)
+					{
+						e.preventDefault();
+						e.stopPropagation();
+				    });
+
 					this.$editor.on('drop.redactor', $.proxy(function(e)
 					{
 						e = e.originalEvent || e;
@@ -1419,33 +1432,50 @@
 					}
 
 					// focus
-					if ($.isFunction(this.opts.focusCallback))
+					this.$editor.on('focus.redactor', $.proxy(function(e)
 					{
-						this.$editor.on('focus.redactor', $.proxy(this.opts.focusCallback, this));
-					}
+						if ($.isFunction(this.opts.focusCallback))
+						{
+							this.core.setCallback('focus', e);
+						}
 
-					$(document).on('mousedown.redactor.' + this.uuid, $.proxy(function(e) { this.blurClickedElement = e.target; }, this));
+						this.build.focused = true;
+						this.build.blured = false;
+
+						if (this.selection.getCurrent() === false)
+						{
+							this.selection.get();
+							this.range.setStart(this.$editor[0], 0);
+							this.range.setEnd(this.$editor[0], 0);
+							this.selection.addRange();
+						}
+
+
+					}, this));
 
 
 					// blur
-					this.$editor.on('blur.redactor', $.proxy(function(e)
+					$(document).on('mousedown.redactor-blur.' + this.uuid, $.proxy(function(e)
 					{
 						if (this.start) return;
 						if (this.rtePaste) return;
-						if (!this.build.isBlured()) return;
+
+						if ($(e.target).closest('.redactor-editor, .redactor-toolbar, .redactor-dropdown').size() !== 0)
+						{
+							return;
+						}
 
 						this.utils.disableSelectAll();
-						if ($.isFunction(this.opts.blurCallback)) this.core.setCallback('blur', e);
+						if (!this.build.blured && $.isFunction(this.opts.blurCallback))
+						{
+							this.core.setCallback('blur', e);
+						}
+
+						this.build.focused = false;
+						this.build.blured = true;
 
 					}, this));
-				},
-				isBlured: function()
-				{
-					if (this.blurClickedElement === true) return true;
 
-					var $el = $(this.blurClickedElement);
-
-					return (!$el.hasClass('redactor-toolbar, redactor-dropdown') && !$el.is('#redactor-modal') && $el.parents('.redactor-toolbar, .redactor-dropdown, #redactor-modal').length === 0);
 				},
 				setHelpers: function()
 				{
@@ -1578,15 +1608,19 @@
 
 					$button.on('mouseover', function()
 					{
-						if ($(this).hasClass('redactor-button-disabled')) return;
+						if ($(this).hasClass('redactor-button-disabled'))
+						{
+							return;
+						}
 
 						var pos = $button.offset();
 
-						$tooltip.show();
 						$tooltip.css({
 							top: (pos.top + $button.innerHeight()) + 'px',
 							left: (pos.left + $button.innerWidth()/2 - $tooltip.innerWidth()/2) + 'px'
 						});
+						$tooltip.show();
+
 					});
 
 					$button.on('mouseout', function()
@@ -1601,6 +1635,8 @@
 
 					e.preventDefault();
 
+					$(document).find('.redactor-toolbar-tooltip').hide();
+
 					if (this.utils.browser('msie')) e.returnValue = false;
 
 					if (type == 'command') this.inline.format(callback);
@@ -1611,9 +1647,6 @@
 				{
 					var func;
 
-					// blur
-					this.blurClickedElement = true;
-
 					if ($.isFunction(callback)) callback.call(this, btnName);
 					else if (callback.search(/\./) != '-1')
 					{
@@ -1939,7 +1972,7 @@
 					var node, offset = 0;
 					var walker = document.createTreeWalker(this.$editor[0], NodeFilter.SHOW_TEXT, null, null);
 
-					while (node == walker.nextNode())
+					while (node = walker.nextNode())
 					{
 						offset += node.nodeValue.length;
 						if (offset > start)
@@ -1974,7 +2007,7 @@
 			return {
 				onSet: function(html)
 				{
-					//html = this.clean.savePreCode(html);
+					html = this.clean.savePreCode(html);
 
 					// convert script tag
 					html = html.replace(/<script(.*?[^>]?)>([\w\W]*?)<\/script>/gi, '<pre class="redactor-script-tag" style="display: none;" $1>$2</pre>');
@@ -1985,7 +2018,7 @@
 					// replace special characters in links
 					html = html.replace(/<a href="(.*?[^>]?)®(.*?[^>]?)">/gi, '<a href="$1&reg$2">');
 
-					if (this.opts.replaceDivs) html = this.clean.replaceDivs(html);
+					if (this.opts.replaceDivs && !this.opts.linebreaks) html = this.clean.replaceDivs(html);
 					if (this.opts.linebreaks)  html = this.clean.replaceParagraphsToBr(html);
 
 					// save form tag
@@ -2010,7 +2043,7 @@
 					$div.remove();
 
 					// remove font tag
-					html = html.replace(/<font(.*?[^<])>/gi, '');
+					html = html.replace(/<font(.*?)>/gi, '');
 					html = html.replace(/<\/font>/gi, '');
 
 					// tidy html
@@ -2070,7 +2103,7 @@
 						html = html.replace(/<br\s?\/?>$/gi, '');
 					}
 
-					// remove br in the of li
+					// remove br in|of li tags
 					html = html.replace(new RegExp('<br\\s?/?></li>', 'gi'), '</li>');
 					html = html.replace(new RegExp('</li><br\\s?/?>', 'gi'), '</li>');
 
@@ -2082,7 +2115,7 @@
 					html = html.replace(/"">/gi, '">');
 
 					// remove verified
-					html = html.replace(/<div(.*?[^>]) data-tagblock="redactor"(.*?[^>])>/gi, '<div$1$2>');
+					html = html.replace(/<div(.*?)data-tagblock="redactor"(.*?[^>])>/gi, '<div$1$2>');
 					html = html.replace(/<(.*?) data-verified="redactor"(.*?[^>])>/gi, '<$1$2>');
 
 					var $div = $("<div/>").html($.parseHTML(html, document, true));
@@ -2107,7 +2140,7 @@
 					html = html.replace(/<span(.*?)id="redactor-image-editter"(.*?[^>])>(.*?)<\/span>/gi, '');
 
 					// remove font tag
-					html = html.replace(/<font(.*?[^<])>/gi, '');
+					html = html.replace(/<font(.*?)>/gi, '');
 					html = html.replace(/<\/font>/gi, '');
 
 					// tidy html
@@ -2602,6 +2635,8 @@
 				getPlainText: function(html, paragraphize)
 				{
 					html = this.clean.getTextFromHtml(html);
+					html = html.replace(/\n\s*\n/g, "\n");
+					html = html.replace(/\n\n/g, "\n");
 					html = html.replace(/\n/g, '<br />');
 
 					if (this.opts.paragraphize && typeof paragraphize == 'undefined' && !this.utils.browser('mozilla'))
@@ -2831,7 +2866,7 @@
 
 					if (this.utils.browser('msie'))
 					{
-						html = html.replace(/<span(.*?)id="selection-marker-(1|2)"(.*?)><\/span>;/gi, '');
+						html = html.replace(/<span(.*?)id="selection-marker-(1|2)"(.*?)><\/span>/gi, '');
 					}
 
 					this.$editor.html(html);
@@ -2864,7 +2899,7 @@
 					var html = this.$editor.html();
 
 					// is there a need to synchronize
-					if (this.code.syncCode && this.code.syncCode == html)
+					if (this.code.syncCode && this.code.syncCode == html || (this.start && html == '' ))
 					{
 						// do not sync
 						return;
@@ -3213,6 +3248,7 @@
 					this.$element.off('.redactor').removeData('redactor');
 					this.$editor.off('.redactor');
 
+					$(document).off('mousedown.redactor-blur.' + this.uuid);
 					$(document).off('mousedown.redactor.' + this.uuid);
 					$(document).off('click.redactor-image-delete.' + this.uuid);
 					$(document).off('click.redactor-image-resize-hide.' + this.uuid);
@@ -3425,7 +3461,6 @@
 					// disable scroll whan dropdown scroll
 					$dropdown.on('mouseover.redactor-dropdown', $.proxy(this.utils.disableBodyScroll, this)).on('mouseout.redactor-dropdown', $.proxy(this.utils.enableBodyScroll, this));
 
-
 					e.stopPropagation();
 				},
 				closeHandler: function(e)
@@ -3459,8 +3494,11 @@
 
 					if (!$dropdown.hasClass('dropact') && !$dropdown.hasClass('redactor-dropdown-link-inactive'))
 					{
-						$dropdown.removeClass('dropact');
-						$dropdown.off('mouseover mouseout');
+						if ($dropdown.hasClass('redactor-dropdown'))
+						{
+							$dropdown.removeClass('dropact');
+							$dropdown.off('mouseover mouseout');
+						}
 
 						this.dropdown.hideAll();
 					}
@@ -3603,13 +3641,7 @@
 				},
 				isFocused: function()
 				{
-					var focusNode = document.getSelection().focusNode;
-					if (focusNode === null) return false;
-
-					if (this.opts.linebreaks && $(focusNode.parentNode).hasClass('redactor-linebreaks')) return true;
-					else if (!this.utils.isRedactorParent(focusNode.parentNode)) return false;
-
-					return this.$editor.is(':focus');
+					return this.$editor[0] === document.activeElement;
 				}
 			};
 		},
@@ -4255,9 +4287,6 @@
 					var current = this.selection.getCurrent();
 					if (current && current.tagName === 'TR') return;
 
-					// blur
-					this.blurClickedElement = true;
-
 					// Stop formatting pre and headers
 					if (this.utils.isCurrentOrParent('PRE') || this.utils.isCurrentOrParentHeader()) return;
 
@@ -4284,7 +4313,7 @@
 
 					this.buffer.set();
 
-					if (!this.utils.browser('msie'))
+					if (!this.utils.browser('msie') && !this.opts.linebreaks)
 					{
 						this.$editor.focus();
 					}
@@ -4363,7 +4392,7 @@
 						var $parent = $span.parent();
 
 						// remove U tag if selected link + node
-						if ($parent && $parent[0].tagName === 'U')
+						if ($span[0].tagName === 'A' && $parent && $parent[0].tagName === 'U')
 						{
 							$span.parent().replaceWith($span);
 						}
@@ -4424,6 +4453,15 @@
 						});
 					}
 
+					if (tag != 'u')
+					{
+						var _this = this;
+						this.$editor.find('unline').each(function(i,s)
+						{
+							_this.utils.replaceToTag(s, 'u');
+						});
+					}
+
 					this.selection.restore();
 					this.code.sync();
 
@@ -4483,6 +4521,14 @@
 						});
 					}
 
+					if (tag != 'u')
+					{
+						this.$editor.find('u').each(function(i,s)
+						{
+							self.utils.replaceToTag(s, 'unline');
+						});
+					}
+
 					if (tag != 'span')
 					{
 						this.$editor.find(tag).each(function()
@@ -4722,7 +4768,10 @@
 
 					if (typeof clean == 'undefined') clean = true;
 
-					this.$editor.focus();
+					if (!this.opts.linebreaks)
+					{
+						this.$editor.focus();
+					}
 
 					html = this.clean.setVerified(html);
 
@@ -4817,6 +4866,7 @@
 				{
 					node = node[0] || node;
 
+					var offset = this.caret.getOffset();
 					var html = this.utils.getOuterHtml(node);
 					html = this.clean.setVerified(html);
 
@@ -4836,6 +4886,8 @@
 					this.range.collapse(false);
 					this.selection.addRange();
 
+					this.caret.setOffset(offset);
+
 					return node;
 				},
 				nodeToPoint: function(node, x, y)
@@ -5175,7 +5227,6 @@
 							return;
 						}
 
-
 						// remove hr in FF
 						if (this.utils.browser('mozilla'))
 						{
@@ -5206,7 +5257,7 @@
 				checkKeyEvents: function(key)
 				{
 					var k = this.keyCode;
-					var keys = [k.BACKSPACE, k.DELETE, k.ENTER, k.SPACE, k.ESC, k.TAB, k.CTRL, k.META, k.ALT, k.SHIFT];
+					var keys = [k.BACKSPACE, k.DELETE, k.ENTER, k.ESC, k.TAB, k.CTRL, k.META, k.ALT, k.SHIFT];
 
 					return ($.inArray(key, keys) == -1) ? true : false;
 
@@ -5240,7 +5291,7 @@
 					}
 					else if (!this.keydown.ctrl)
 					{
-						if (key == this.keyCode.BACKSPACE || key == this.keyCode.DELETE || (key == this.keyCode.ENTER && !e.ctrlKey && !e.shiftKey) || key == this.keyCode.SPACE)
+						if (key == this.keyCode.BACKSPACE || key == this.keyCode.DELETE || (key == this.keyCode.ENTER && !e.ctrlKey && !e.shiftKey))
 						{
 							this.buffer.set();
 						}
@@ -5506,7 +5557,9 @@
 							space.innerHTML = '&#x200b;';
 
 							$(br1).after(space);
-							this.caret.setAfter(space);
+
+							this.range.setStartAfter(space);
+							this.range.setEndAfter(space);
 							$(space).remove();
 						}
 						else
@@ -5517,7 +5570,6 @@
 							var selection = window.getSelection();
 							selection.removeAllRanges();
 							selection.addRange(range);
-
 						}
 					}
 
@@ -5557,6 +5609,7 @@
 			return {
 				init: function(e)
 				{
+
 					if (this.rtePaste) return;
 
 					var key = e.which;
@@ -5574,7 +5627,7 @@
 					}
 
 					// replace to p before / after the table or body
-					if (!this.opts.linebreaks && this.keyup.current.nodeType == 3 && this.keyup.current.length <= 1 && (this.keyup.parent === false || this.keyup.parent.tagName == 'BODY'))
+					if (!this.opts.linebreaks && this.keyup.current.nodeType === 3 && this.keyup.current.length <= 1 && (this.keyup.parent === false || this.keyup.parent.tagName == 'BODY'))
 					{
 						this.keyup.replaceToParagraph();
 					}
@@ -5637,6 +5690,8 @@
 							$(this.keyup.current).remove();
 						}
 
+						this.keyup.removeEmptyLists();
+
 						// if empty
 						return this.keyup.formatEmpty(e);
 					}
@@ -5664,6 +5719,20 @@
 
 					this.caret.setEnd(node);
 				},
+				removeEmptyLists: function()
+				{
+					var removeIt = function()
+					{
+						var html = $.trim(this.innerHTML).replace(/\/t\/n/g, '');
+						if (html === '')
+						{
+							$(this).remove();
+						}
+					};
+
+					this.$editor.find('li').each(removeIt);
+					this.$editor.find('ul, ol').each(removeIt);
+				},
 				formatEmpty: function(e)
 				{
 					var html = $.trim(this.$editor.html());
@@ -5915,6 +5984,7 @@
 					// mailto
 					if (link.search('@') != -1 && /(http|ftp|https):\/\//i.test(link) === false)
 					{
+						link = link.replace('mailto:', '');
 						link = 'mailto:' + link;
 					}
 					// url, not anchor
@@ -5993,7 +6063,13 @@
 							var $a = $('<a />').attr('href', link).text(text);
 							if (target !== '') $a.attr('target', target);
 
-							this.insert.node($a);
+							$a = $(this.insert.node($a));
+
+							if (this.opts.linebreaks)
+							{
+								$a.after('&nbsp;');
+							}
+
 							this.selection.selectElement($a);
 						}
 						else
@@ -6037,6 +6113,10 @@
 									{
 										$a.text(text);
 									}
+									else if (this.opts.linebreaks)
+									{
+										$a.text(text);
+									}
 
 									this.selection.selectElement($a);
 								}
@@ -6170,7 +6250,11 @@
 					});
 
 					// callback
-					this.core.setCallback('linkify', objects);
+					setTimeout($.proxy(function()
+					{
+						this.observe.load();
+						this.core.setCallback('linkify', objects);
+					}, this), 100);
 
 					// sync
 					this.code.sync();
@@ -6239,7 +6323,10 @@
 								text = text.substring(0, this.opts.linkSize) + '...';
 							}
 
-							text = decodeURIComponent(text);
+							if (text.search('%') === -1)
+							{
+								text = decodeURIComponent(text);
+							}
 
 							var regexB = "\\b";
 
@@ -6265,7 +6352,11 @@
 				toggle: function(cmd)
 				{
 					this.placeholder.remove();
-					if (!this.utils.browser('msie')) this.$editor.focus();
+
+					if (!this.utils.browser('msie') && !this.opts.linebreaks)
+					{
+						this.$editor.focus();
+					}
 
 					this.buffer.set();
 					this.selection.save();
@@ -6335,6 +6426,7 @@
 						$td.after(newTd).remove('');
 					}
 
+
 					if (this.utils.isEmpty($list.find('li').text()))
 					{
 						var $children = $list.children('li');
@@ -7198,7 +7290,9 @@
 						$(window).off('scroll.redactor-freeze');
 
 						if (this.linkify.isEnabled())
+						{
 							this.linkify.format();
+						}
 
 					}, this), 1);
 				},
@@ -7213,18 +7307,18 @@
 					else
 					{
 						// bootstrap modal
-						if ($('.modal-body').length > 0)
+						var $visibleModals = $('.modal-body:visible');
+						if ($visibleModals.length > 0)
 						{
-							$('.modal-body').append(this.$pasteBox);
+							$visibleModals.append(this.$pasteBox);
 						}
 						else
 						{
 							$('body').append(this.$pasteBox);
 						}
-
 					}
 
-					this.$pasteBox.focus();
+					this.$pasteBox.get(0).focus();
 				},
 				insert: function(html)
 				{
@@ -7261,6 +7355,7 @@
 						});
 
 					}, this), 10);
+
 				}
 			};
 		},
@@ -7457,11 +7552,11 @@
 
 					var blocks = [];
 					nodes = (typeof nodes == 'undefined') ? this.selection.getNodes() : nodes;
+
 					$.each(nodes, $.proxy(function(i,node)
 					{
 						if (this.utils.isBlock(node))
 						{
-							this.selection.lastBlock = node;
 							blocks.push(node);
 						}
 
@@ -7626,7 +7721,6 @@
 				{
 					this.selection.get();
 
-
 					var node1 = this.selection.getMarker(1);
 
 					this.selection.setMarker(this.range, node1, true);
@@ -8064,6 +8158,12 @@
 			return {
 				setupAllowed: function()
 				{
+					var index = $.inArray('span', this.opts.removeEmpty);
+					if (index !== -1)
+					{
+						this.opts.removeEmpty.splice(index, 1);
+					}
+
 					if (this.opts.allowedTags) this.opts.deniedTags = false;
 					if (this.opts.allowedAttr) this.opts.removeAttr = false;
 
@@ -8950,9 +9050,7 @@
 				s3executeOnSignedUrl: function(file, callback)
 				{
 					var xhr = new XMLHttpRequest();
-
-					var mark = '?';
-					if (this.opts.s3.search(/\?/) != '-1') mark = '&';
+					var mark = (this.opts.s3.search(/\?/) !== '-1') ? '?' : '&';
 
 					xhr.open('GET', this.opts.s3 + mark + 'name=' + file.name + '&type=' + file.type, true);
 
@@ -9042,21 +9140,9 @@
 							}
 						}, this);
 
-						xhr.onerror = function()
-						{
-							//setProgress(0, 'XHR error.');
-						};
+						xhr.onerror = function() {};
 
-						xhr.upload.onprogress = function(e)
-						{
-							/*
-							if (e.lengthComputable)
-							{
-								var percentLoaded = Math.round((e.loaded / e.total) * 100);
-								setProgress(percentLoaded, percentLoaded == 100 ? 'Finalizing.' : 'Uploading.');
-							}
-							*/
-						};
+						xhr.upload.onprogress = function(e) {};
 
 						xhr.setRequestHeader('Content-Type', file.type);
 						xhr.setRequestHeader('x-amz-acl', 'public-read');
@@ -9261,6 +9347,12 @@
 
 					return (offset == text.length) ? true : false;
 				},
+				isStartOfEditor: function()
+				{
+					var offset = this.caret.getOffsetOfElement(this.$editor[0]);
+
+					return (offset === 0) ? true : false;
+				},
 				isEndOfEditor: function()
 				{
 					var block = this.$editor[0];
diff --git a/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.less b/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.less
index 9979b71be..c13c94b90 100755
--- a/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.less
+++ b/modules/backend/formwidgets/richeditor/assets/vendor/redactor/redactor.less
@@ -898,9 +898,14 @@ body .redactor-box-fullscreen {
 	}
 	blockquote {
 	  margin-left: 1.6em !important;
-	  padding-left: 0;
+	  padding: 0;
+	  text-align: left;
 	  color: #777;
 	  font-style: italic;
+	  &:before,
+	  &:after {
+		  content: '';
+	  }
 	}
 	ul,
 	ol {

From 5713dfbf86ae8fdba0f20a547d80bc5dd9f3384b Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 10 Oct 2015 20:45:09 +1100
Subject: [PATCH 103/103] Disable fixed toolbar - fixes #1463

---
 modules/backend/formwidgets/richeditor/assets/js/build-min.js  | 2 +-
 modules/backend/formwidgets/richeditor/assets/js/richeditor.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/backend/formwidgets/richeditor/assets/js/build-min.js b/modules/backend/formwidgets/richeditor/assets/js/build-min.js
index 3802c73de..138bf87c0 100755
--- a/modules/backend/formwidgets/richeditor/assets/js/build-min.js
+++ b/modules/backend/formwidgets/richeditor/assets/js/build-min.js
@@ -2066,7 +2066,7 @@ RichEditor.prototype.init=function(){var self=this;this.$el.one('dispose-control
 if(this.options.dataLocker){this.$dataLocker=$(this.options.dataLocker)
 this.$textarea.val(this.$dataLocker.val())}
 if(!this.$textarea.attr('id')){this.$textarea.attr('id','element-'+Math.random().toString(36).substring(7))}
-var redactorOptions={imageEditable:true,imageResizable:true,buttonSource:true,removeDataAttr:false,syncBeforeCallback:this.proxy(this.onSyncBefore),focusCallback:this.proxy(this.onFocus),blurCallback:this.proxy(this.onBlur),keydownCallback:this.proxy(this.onKeydown),enterCallback:this.proxy(this.onEnter),changeCallback:this.proxy(this.onChange),pageLinksHandler:this.options.linksHandler,initCallback:function(){self.build(this)}}
+var redactorOptions={imageEditable:true,imageResizable:true,buttonSource:true,removeDataAttr:false,toolbarFixed:false,syncBeforeCallback:this.proxy(this.onSyncBefore),focusCallback:this.proxy(this.onFocus),blurCallback:this.proxy(this.onBlur),keydownCallback:this.proxy(this.onKeydown),enterCallback:this.proxy(this.onEnter),changeCallback:this.proxy(this.onChange),pageLinksHandler:this.options.linksHandler,initCallback:function(){self.build(this)}}
 if(this.options.fullpage){redactorOptions.fullpage=true}
 redactorOptions.plugins=['fullscreen','figure','table','pagelinks','mediamanager']
 redactorOptions.buttons=['html','formatting','bold','italic','unorderedlist','orderedlist','link','horizontalrule'],this.$textarea.redactor(redactorOptions)
diff --git a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
index bc25afd18..6e5765e3f 100755
--- a/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
+++ b/modules/backend/formwidgets/richeditor/assets/js/richeditor.js
@@ -72,6 +72,7 @@
             imageResizable: true,
             buttonSource: true,
             removeDataAttr: false,
+            toolbarFixed: false,
             syncBeforeCallback: this.proxy(this.onSyncBefore),
             focusCallback: this.proxy(this.onFocus),
             blurCallback: this.proxy(this.onBlur),