fix warning 2

fix warning
gruntfile fix
2015-11-09 17:07:56 +02:00 · 2015-11-09 17:06:19 +02:00 · 2015-11-09 15:59:37 +02:00 · 2015-11-09 12:20:09 +02:00 · 2015-11-09 11:38:07 +02:00 · 2015-11-06 11:36:53 +02:00
1127 changed files with 12449 additions and 1649 deletions
@@ -46,7 +46,7 @@ module.exports = function (grunt) {
        mkdir: {
            tmp: {
                options: {
-                    mode: 0775,
+                    mode: 0755,
                    create: [
                        'build/tmp',
                    ]
@@ -188,6 +188,16 @@ module.exports = function (grunt) {
                    'build/EspoCRM-<%= pkg.version %>/**/*.html',
                    'build/EspoCRM-<%= pkg.version %>/**/*.txt',
                ]
+            },
+            folders: {
+                options: {
+                    mode: '755'
+                },
+                src: [
+                    'build/EspoCRM-<%= pkg.version %>/install',
+                    'build/EspoCRM-<%= pkg.version %>/api',
+                    'build/EspoCRM-<%= pkg.version %>/api/v1',
+                ]
            }
        },
        replace: {
@@ -631,29 +631,29 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.

-    EspoCRM - Open Source CRM
-    Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>

-    EspoCRM is free software: you can redistribute it and/or modify
+    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

-    EspoCRM is distributed in the hope that it will be useful,
+    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with EspoCRM.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

  If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:

-    EspoCRM  Copyright (C) 2014  Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
-    EspoCRM comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

@@ -40,6 +40,10 @@ You need to have nodejs and Grunt CLI installed.

 The build will be created in the `build` directory.

+### How to contribute
+
+Before we can merge your pull request you need to accept our CLA [here](https://github.com/espocrm/cla). It's very simple to do.
+
 ### How to make a translation

 Build po file with command:
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 require_once('../../bootstrap.php');
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Acl;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Acl;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -29,7 +36,7 @@ class GlobalSearch extends \Espo\Core\Controllers\Base
 {
    public function actionSearch($params, $data, $request)
    {
-        $query = $params['query'];
+        $query = $request->get('q');

        $offset = intval($request->get('offset'));
        $maxSize = intval($request->get('maxSize'));
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -145,5 +152,14 @@ class Import extends \Espo\Core\Controllers\Record

        return $this->getService('Import')->import($data['entityType'], $data['fields'], $attachmentId, $importParams);
    }
+
+    public function postActionUnmarkAsDuplicate($params, $data)
+    {
+        if (empty($data['id']) || empty($data['entityType']) || empty($data['entityId'])) {
+            throw new BadRequest();
+        }
+        $this->getService('Import')->unmarkAsDuplicate($data['id'], $data['entityType'], $data['entityId']);
+        return true;
+    }
 }

@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Controllers;
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
-
 use \Espo\Core\Exceptions\Error;
 use \Espo\Core\Exceptions\Forbidden;
 use \Espo\Core\Exceptions\BadRequest;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -26,7 +33,7 @@ use \Espo\Core\Exceptions\Error;

 class Stream extends \Espo\Core\Controllers\Base
 {
-    const MAX_SIZE_LIMIT = 400;
+    const MAX_SIZE_LIMIT = 200;

    public static $defaultAction = 'list';

@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Controllers;
@@ -18,17 +18,27 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;

+use \Espo\ORM\Entity;
+use \Espo\Entities\User;
+
 class Acl
 {
    private $user;

    private $aclManager;

-    public function __construct(AclManager $aclManager, \Espo\Entities\User $user)
+    public function __construct(AclManager $aclManager, User $user)
    {
        $this->aclManager = $aclManager;
        $this->user = $user;
@@ -78,5 +88,10 @@ class Acl
    {
        return $this->getAclManager()->checkScope($this->getUser(), $scope, $action, $isOwner, $inTeam, $entity) ;
    }
+
+    public function checkPermission($permission, User $entity)
+    {
+        return $this->getAclManager()->checkPermission($this->getUser(), $permission, $entity);
+    }
 }

@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Acl;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Acl;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
@@ -177,5 +184,34 @@ class AclManager
        $data = $this->getTable($user)->getScopeData($scope);
        return $this->getImplementation($scope)->checkScope($user, $data, $scope, $action, $isOwner, $inTeam, $entity);
    }
+
+    public function checkPermission(User $user, $permission, User $entity)
+    {
+        if ($user->isAdmin()) {
+            return true;
+        }
+        if ($this->get($user, $permission) === 'no') {
+            if ($entity->id !== $user->id) {
+                return false;
+            }
+        } else if ($this->get($user, $permission) === 'team') {
+            if ($entity->id != $user->id) {
+                $teamIdList1 = $user->getTeamIdList();
+                $teamIdList2 = $entity->getTeamIdList();
+
+                $inTeam = false;
+                foreach ($teamIdList1 as $id) {
+                    if (in_array($id, $teamIdList2)) {
+                        $inTeam = true;
+                        break;
+                    }
+                }
+                if (!$inTeam) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }

@@ -18,11 +18,17 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;

-
 class Application
 {
    private $metadata;
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
-
 class Container
 {

@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Controllers;
-
 use \Espo\Core\Container;
 use \Espo\Core\ServiceFactory;
 use \Espo\Core\Utils\Util;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Controllers;
@@ -170,6 +177,7 @@ class Record extends Base
        $asc = $request->get('asc') === 'true';
        $sortBy = $request->get('sortBy');
        $q = $request->get('q');
+        $textFilter = $request->get('textFilter');

        if (empty($maxSize)) {
            $maxSize = self::MAX_SIZE_LIMIT;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Controllers;
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
-
 use \PDO;
 use Espo\Core\Utils\Json;
 use Espo\Core\Exceptions\NotFound;
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
-
 class DataManager
 {
    private $container;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Entities;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Entities;
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core;
-
 use \Espo\Core\Exceptions\NotFound,
    \Espo\Core\Utils\Util;

@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\EntryPoints;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Exceptions;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Exceptions;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Exceptions;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Exceptions;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Exceptions;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Exceptions;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Exceptions;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ExternalAccount;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ExternalAccount\Clients;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ExternalAccount\Clients;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ExternalAccount\Clients;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ExternalAccount\OAuth2;
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
-
 use \Espo\Core\Exceptions\Error,
    \Espo\Core\Utils\Util;

@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Hooks;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Htmlizer;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/ 

 namespace Espo\Core\Interfaces;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Interfaces;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Jobs;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Loaders;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Loaders;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Loaders;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Mail;
@@ -36,7 +43,7 @@ class FiltersMatcher
    {
        foreach ($filterList as $filter) {
            if ($filter->get('from')) {
-                if (strtolower($filter->get('from')) === strtolower($email->get('from'))) {
+                if ($this->matchString(strtolower($filter->get('from')), strtolower($email->get('from')))) {
                    return true;
                }
            }
@@ -44,7 +51,7 @@ class FiltersMatcher
                if ($email->get('to')) {
                    $toArr = explode(';', $email->get('to'));
                    foreach ($toArr as $to) {
-                        if (strtolower($to) === strtolower($filter->get('to'))) {
+                        if ($this->matchString(strtolower($filter->get('to')), strtolower($to))) {
                            return true;
                        }
                    }
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Mail;
@@ -194,6 +201,28 @@ class Importer
                $n = sscanf($reference, '%s %s %d %d espo', $parentType, $parentId, $emailSent, $number);
                if ($n == 4 && $emailSent < time()) {
                    if (!empty($parentType) && !empty($parentId)) {
+                        if ($parentType == 'Lead') {
+                            $parent = $this->getEntityManager()->getEntity('Lead', $parentId);
+                            if ($parent && $parent->get('status') == 'Converted') {
+                                if ($parent->get('createdAccountId')) {
+                                    $account = $this->getEntityManager()->getEntity('Account', $parent->get('createdAccountId'));
+                                    if ($account) {
+                                        $parentType = 'Account';
+                                        $parentId = $account->id;
+                                    }
+                                } else {
+                                    if ($this->getConfig()->get('b2cMode')) {
+                                        if ($parent->get('createdContactId')) {
+                                            $contact = $this->getEntityManager()->getEntity('Contact', $parent->get('createdContactId'));
+                                            if ($contact) {
+                                                $parentType = 'Contact';
+                                                $parentId = $contact->id;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
                        $email->set('parentType', $parentType);
                        $email->set('parentId', $parentId);
                        $parentFound = true;
@@ -1,4 +1,37 @@
-<?php
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
 /**
 * Zend Framework (http://framework.zend.com/)
 *
@@ -1,4 +1,38 @@
-<?php
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2015 Yuri Kuznetsov, Taras Machyshyn, Oleksiy Avramenko
+ * Website: http://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/

 namespace Espo\Core\Mail\Mail;

@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Mail\Mail\Storage;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Mail\Mail\Storage;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Mail;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Notificators;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ORM;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ORM;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ORM\Repositories;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ORM;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\ORM;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Pdf;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Repositories;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\SelectManagers;
@@ -242,15 +249,15 @@ class Base

                if ($defs['type'] == 'manyMany') {

-                    if (!empty($defs['relationName']) && !empty($defs['midKeys'])) {
+                    if (!empty($defs['midKeys'])) {
                        $result['distinct'] = true;
                        $result['joins'][] = $link;
                        $key = $defs['midKeys'][1];

-                        $relationName = lcfirst($defs['relationName']);
+                        $middleName = $link . 'Middle';

                        $result['customJoin'] .= "
-                            JOIN " . $query->toDb($pathName) . " AS `{$pathName}` ON {$pathName}.descendor_id = ".$query->sanitize($relationName) . "." . $query->toDb($key) . "
+                            JOIN " . $query->toDb($pathName) . " AS `{$pathName}` ON {$pathName}.descendor_id = ".$query->sanitize($middleName) . "." . $query->toDb($key) . "
                        ";
                        $part[$pathName . '.ascendorId'] = $val;
                    }
@@ -309,6 +316,12 @@ class Base
        if (empty($result['customJoin'])) {
            $result['customJoin'] = '';
        }
+        if (empty($result['additionalSelectColumns'])) {
+            $result['additionalSelectColumns'] = array();
+        }
+        if (empty($result['joinConditions'])) {
+            $result['joinConditions'] = array();
+        }
    }

    protected function access(&$result)
@@ -795,7 +808,7 @@ class Base

        foreach ($fieldList as $field) {
            if (
-                strlen($item['value']) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH
+                strlen($textFilter) >= self::MIN_LENGTH_FOR_CONTENT_SEARCH
                &&
                !empty($fieldDefs[$field]['type']) && $fieldDefs[$field]['type'] == 'text'
            ) {
@@ -18,10 +18,16 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core;
-
 use \Espo\Core\Exceptions\Error;

 use \Espo\Core\Utils\Util;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Services;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Templates\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Templates\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Templates\Controllers;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Templates\Entities;
@@ -18,6 +18,13 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
 ************************************************************************/

 namespace Espo\Core\Templates\Entities;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yuri	67857ef93c	fix warning 2	2015-11-09 17:07:56 +02:00
yuri	f93cc5b472	fix warning	2015-11-09 17:06:19 +02:00
yuri	e9df433b27	gruntfile fix	2015-11-09 15:59:37 +02:00
yuri	dc300dbbe0	mass email schedule each hour	2015-11-09 12:20:09 +02:00
yuri	c6b905d503	fix import rn	2015-11-09 11:38:07 +02:00
yuri	73c1cc40eb	version	2015-11-06 11:36:53 +02:00
yuri	38cf2d8500	email: change row-action	2015-11-05 17:20:39 +02:00
yuri	747c7742da	email improvements: isUsers field	2015-11-05 16:57:08 +02:00
yuri	5365818d82	fix show/hide fields	2015-11-05 16:07:18 +02:00
yuri	eddc32ebd7	fix bad comments	2015-11-05 16:01:40 +02:00
yuri	7ae41e414b	email selectManager changes	2015-11-05 15:56:42 +02:00
yuri	6572d2a998	no disconnect for smtp	2015-11-05 11:39:43 +02:00
yuri	6a2314060f	force to close sockets for emails	2015-11-05 11:20:24 +02:00
yuri	6a5e22eaa0	cleanup	2015-11-04 17:10:47 +02:00
yuri	98f77041e8	cleanup	2015-11-04 17:09:11 +02:00
yuri	5fb0ddb1d2	fix in export	2015-11-04 16:24:52 +02:00
yuri	7bfedff3c8	export refactor	2015-11-04 16:23:48 +02:00
yuri	cc364bc088	summernote insertText	2015-11-04 15:25:51 +02:00
yuri	81fd286834	trim	2015-11-04 12:05:52 +02:00
yuri	7d3af14f4d	date sent for inbound email	2015-11-04 11:41:39 +02:00
yuri	37f5244790	fix warning in language	2015-11-04 11:02:54 +02:00
yuri	61fd827dca	email template label fix	2015-11-04 10:58:44 +02:00
yuri	de68abfbb4	license	2015-11-04 10:56:15 +02:00
yuri	03ecfdb805	fix lang	2015-11-04 10:55:22 +02:00
yuri	2061bf68af	Merge branch 'master' of https://github.com/espocrm/espocrm	2015-11-03 17:25:09 +02:00
yuri	79f9aae744	Merge branch 'hotfix/3.7.5'	2015-11-03 17:24:43 +02:00
yuri	d6fe7b59eb	fix campaign statistics	2015-11-03 17:24:37 +02:00
yuri	7287854cc0	silent and noStream	2015-11-03 15:43:44 +02:00
Yuri Kuznetsov	dd5a395061	Merge pull request #64 from PanuWeb/translateES Updated Spanish translation	2015-11-03 10:21:33 +02:00
PanuWeb	da1b92fdd4	Complete missing translations.	2015-11-02 18:48:38 -03:00
PanuWeb	f1f23b37c4	Improved some translations.	2015-11-02 18:30:58 -03:00
yuri	fea5669078	improve navigate	2015-10-30 17:57:56 +02:00
yuri	9fb88a6b92	changes for navigation buttons	2015-10-30 17:48:48 +02:00
yuri	3eb6648d2b	prevNextButtons in detail view	2015-10-30 17:30:01 +02:00
yuri	7e8f0db610	change lang	2015-10-30 12:26:51 +02:00
yuri	6c57d9c658	fix calendar ratio	2015-10-30 12:24:47 +02:00
yuri	bc3e873ef7	upgrade fullcalendar	2015-10-30 12:00:10 +02:00
yuri	50105087cc	stream filters and panel filters	2015-10-30 11:41:29 +02:00
yuri	f3406f1fcd	stream filters	2015-10-30 11:17:29 +02:00
yuri	8e105205a4	fix small	2015-10-29 16:43:42 +02:00
yuri	6a496be1fa	exportSkipFieldList	2015-10-29 15:50:24 +02:00
yuri	ecc6e9f4ec	restrict access to mention	2015-10-29 15:20:55 +02:00
yuri	deee30eb3e	entity manager: no stream for user	2015-10-29 11:26:50 +02:00
yuri	c92ba7f8f6	stream tab	2015-10-29 11:20:47 +02:00
yuri	5f46b2f74a	user stream	2015-10-29 11:03:32 +02:00
yuri	5c642f93e9	notifications about post to all	2015-10-28 17:33:52 +02:00
yuri	915c58e9ab	revert comment	2015-10-28 17:28:19 +02:00
yuri	ff437c204f	notifications about post	2015-10-28 17:27:42 +02:00
yuri	e25bfbf1d7	license fix	2015-10-28 16:39:05 +02:00
yuri	ab4e16e9e7	post to users	2015-10-28 16:22:07 +02:00
yuri	d60d8bdcae	user stream	2015-10-28 12:19:49 +02:00
yuri	a1f641af7a	stream post for user	2015-10-28 11:17:38 +02:00
yuri	5cae8f359a	fix installer jquery	2015-10-27 17:39:26 +02:00
yuri	19e10aa748	stream post	2015-10-27 17:12:27 +02:00
yuri	0e24774fb9	stream post	2015-10-27 16:14:46 +02:00
yuri	31d31fca73	fix strem acl	2015-10-27 12:48:59 +02:00
yuri	f874aed44f	stream post client	2015-10-27 12:37:58 +02:00
yuri	04ce825191	stream post 2	2015-10-26 17:14:33 +02:00
yuri	516f2218d4	stream post	2015-10-26 12:54:59 +02:00
yuri	3cbf1447c9	Merge branch 'hotfix/3.7.5'	2015-10-26 11:10:22 +02:00
yuri	1c3ca4aa5a	fix vertical navbar scroll	2015-10-26 11:09:57 +02:00
yuri	143ab06a74	error messages	2015-10-26 10:44:38 +02:00
yuri	c9609bf707	stream internal posts 3	2015-10-23 16:28:28 +03:00
yuri	291380c6b4	stream internal posts 2	2015-10-23 15:55:49 +03:00
yuri	74edceaf67	stream internal posts 1	2015-10-23 14:59:22 +03:00
yuri	84754077c5	calendar scope list configuranle	2015-10-22 17:12:34 +03:00
yuri	e2dae62fa9	fix panel filters	2015-10-22 15:50:37 +03:00
yuri	e0d475e2da	fix panel filters	2015-10-22 15:50:09 +03:00
yuri	02cdf522f6	campaign tooltips 2	2015-10-22 15:01:00 +03:00
yuri	8345307760	campaign tooltips	2015-10-22 14:59:36 +03:00
yuri	888bb9d3db	Merge branch 'hotfix/3.7.4'	2015-10-22 11:35:50 +03:00
yuri	0a0f8da2f4	fix auth for 5.5	2015-10-22 10:41:07 +03:00
yuri	bb5d5a0ccf	text filter default search by email address	2015-10-21 17:14:57 +03:00
yuri	1bd5eac103	ver	2015-10-21 10:09:21 +03:00
yuri	61957e628b	fix optOut	2015-10-21 10:07:15 +03:00
yuri	97aab07d77	merge	2015-10-20 17:55:54 +03:00
yuri	c5296bf906	typo	2015-10-20 17:52:26 +03:00
yuri	707f1a0b5c	fix typo	2015-10-20 17:48:41 +03:00
yuri	5ffa68bee1	Merge branch 'hotfix/3.7.4'	2015-10-20 17:38:11 +03:00
yuri	a16919f10b	fix typo	2015-10-20 17:38:04 +03:00
yuri	7050757e4e	fix campaign type	2015-10-20 17:22:52 +03:00
yuri	cbd7ef4737	merge	2015-10-20 15:48:48 +03:00
yuri	d27e9c91e7	import: dont import if no fields	2015-10-20 15:47:42 +03:00
yuri	5e1c7bce33	leads actual filter	2015-10-20 15:38:25 +03:00
yuri	a23ac54da0	email template: translate enum	2015-10-20 15:32:01 +03:00
yuri	260c050f36	fix email address 2	2015-10-20 13:01:14 +03:00
yuri	fc5c07927f	fix email address case	2015-10-20 12:57:42 +03:00
yuri	d321f0d701	email invitees duplicates	2015-10-20 12:32:50 +03:00
yuri	dddedcf088	Merge branch 'hotfix/3.7.4'	2015-10-20 12:27:13 +03:00
yuri	95cbc138f7	meeting/call/task and converted leads	2015-10-20 12:27:05 +03:00
yuri	395063ea35	order global search	2015-10-20 11:42:16 +03:00
yuri	835f95eb52	email template list layout	2015-10-20 11:29:05 +03:00
yuri	c0f6c91a0e	fix email draft	2015-10-20 11:26:09 +03:00
yuri	b410d0e66f	todays task	2015-10-19 17:43:32 +03:00
yuri	52853a4dc4	Merge branch 'stable'	2015-10-19 16:18:24 +03:00
yuri	d04f72cfd8	vers	2015-10-19 16:14:44 +03:00
yuri	a9203b8e22	fix global search	2015-10-19 16:13:52 +03:00
yuri	31c7fdcfa6	manual merge	2015-10-19 15:37:41 +03:00
yuri	e89c7c9328	email filter improvement	2015-10-19 15:36:22 +03:00
yuri	7808865080	import csv label	2015-10-19 15:27:09 +03:00
yuri	5283d1b6ae	Merge branch 'master' of https://github.com/espocrm/espocrm	2015-10-16 17:20:47 +03:00
yuri	da6546779a	Merge branch 'hotfix/3.7.3'	2015-10-16 17:20:25 +03:00
yuri	404e2de3b6	fix email isRead	2015-10-16 17:19:51 +03:00
Yuri Kuznetsov	9ba2611f3f	Update README.md	2015-10-16 14:22:49 +03:00
yuri	f02dabc540	industry list	2015-10-16 13:50:42 +03:00
yuri	c29da46a97	fix client side access denied	2015-10-16 13:07:37 +03:00
yuri	b7702d2418	order fields in entity manager	2015-10-16 12:40:15 +03:00
yuri	2bc56db4c6	fix edit view link to detail	2015-10-16 12:33:59 +03:00
yuri	dd0ef5455e	fix	2015-10-16 10:40:45 +03:00
Yuri Kuznetsov	7cffefff1c	Update README.md	2015-10-15 12:50:19 +03:00
yuri	a8396df12a	Merge branch 'hotfix/3.7.2'	2015-10-15 12:06:44 +03:00
yuri	901bee6d3f	fix campaign	2015-10-15 11:52:25 +03:00
yuri	3375eff719	Merge branch 'hotfix/3.7.2'	2015-10-14 15:13:59 +03:00
yuri	72a0415207	fix orderBy by alias	2015-10-14 13:03:08 +03:00
yuri	de69652137	fix id in model.set	2015-10-14 11:35:21 +03:00
yuri	f6b696aad6	Merge branch 'master' of https://github.com/espocrm/espocrm	2015-10-13 15:57:43 +03:00
yuri	e7018965c9	ajaxCall and Import not Duplicate	2015-10-13 15:57:30 +03:00
Yuri Kuznetsov	126eaed2ca	Merge pull request #62 from PanuWeb/translateES Spanish translations - es_ES (Complete)	2015-10-12 16:40:59 +03:00
yuri	8916b5eca8	Merge branch 'hotfix/3.7.2'	2015-10-12 15:17:43 +03:00
yuri	dda34dce5f	notImportable linkMultiple	2015-10-12 10:45:33 +03:00
yuri	1cd2d6b35e	target lists field not importable	2015-10-12 10:43:50 +03:00
yuri	9888ec8a6f	fix global searct	2015-10-12 10:30:16 +03:00
PanuWeb	e2d5592d0a	Spanish translations - es_ES (Complete)	2015-10-10 14:37:31 -03:00
PanuWeb	242d1fcfe5	Spanish translations - es_ES (90/100)	2015-10-10 13:32:46 -03:00
PanuWeb	77b0ebfa76	Spanish translations - es_ES (80/100)	2015-10-09 22:24:24 -03:00
yuri	ea5321577a	fix target list import	2015-10-08 17:55:48 +03:00
yuri	89508ccc3e	change email labels	2015-10-08 10:54:33 +03:00
yuri	24d80f86e5	Merge branch 'hotfix/3.7.2'	2015-10-07 16:53:34 +03:00
yuri	23c772e029	fix config	2015-10-07 16:53:22 +03:00
yuri	e0b6c2cf6f	Merge branch 'hotfix/3.7.2'	2015-10-07 15:00:31 +03:00
yuri	e67387d9ea	additionalSelectColumns	2015-10-07 15:00:03 +03:00
yuri	aac356d2a3	Merge branch 'hotfix/3.7.2'	2015-10-07 12:22:21 +03:00
yuri	2156094407	cleanup	2015-10-07 12:21:59 +03:00
yuri	54a6bc9c87	Merge branch 'hotfix/3.7.2'	2015-10-07 12:18:10 +03:00
yuri	03d5bf1ef2	tree impr	2015-10-07 12:18:01 +03:00
yuri	b12b3895ec	Merge branch 'hotfix/3.7.2'	2015-10-07 12:08:21 +03:00
yuri	42f57409c8	list tree imp	2015-10-07 12:08:11 +03:00
yuri	69d7ce408d	fix preferences layout	2015-10-07 11:24:52 +03:00
yuri	15b3c0440c	lead converted panel change	2015-10-07 10:56:56 +03:00
yuri	e1f0715c4d	email import: relate to converted entity if lead is converted	2015-10-07 10:35:07 +03:00
yuri	15aec72e97	fix double quick view	2015-10-07 10:33:47 +03:00
yuri	66eade5db7	v	2015-10-07 10:20:37 +03:00
yuri	ea733bb48e	versuin	2015-10-07 10:05:31 +03:00
yuri	83d9d1d924	campaign statystic percentage	2015-10-06 13:19:30 +03:00
yuri	5935bb012d	stream entity type capitalized	2015-10-06 12:05:34 +03:00
yuri	48139b2be8	fix nl_NL	2015-10-06 11:52:36 +03:00
yuri	415babde64	excluding target list	2015-10-06 11:28:57 +03:00
yuri	f5f5f46c75	unsubscribe entirely	2015-10-05 14:58:45 +03:00
yuri	3d89e25349	label	2015-10-05 14:36:52 +03:00
yuri	1f57a01d5d	linkMultiple field for search	2015-10-05 14:34:16 +03:00
yuri	7c890aa83a	fix empty tablist	2015-10-02 17:23:02 +03:00
yuri	62a29c86ab	fix record controller	2015-10-02 15:27:34 +03:00
yuri	bd57b6bb8e	detailLayout param 2	2015-10-02 15:10:13 +03:00
yuri	9ab1d16ea0	detailLayout param	2015-10-02 15:09:39 +03:00
yuri	435aa28ca2	iconHtml for menu items	2015-10-01 13:11:05 +03:00
yuri	4bd375f154	fix notice	2015-09-30 17:22:15 +03:00
yuri	d6521f9176	de_DE	2015-09-30 15:07:20 +03:00
yuri	f8e0e4955a	fix meeting onlymy	2015-09-30 15:06:34 +03:00
yuri	7957359c15	fix prev	2015-09-30 11:41:53 +03:00
yuri	bdc3731b9a	fix select manager	2015-09-30 11:39:11 +03:00
yuri	6b8af1220b	opp lost filter	2015-09-30 10:24:39 +03:00
yuri	58fffeaa84	fix typo	2015-09-29 17:56:35 +03:00
yuri	5806785286	fix email notification dups	2015-09-29 11:56:15 +03:00
yuri	2f2d9b5f6f	fix roles	2015-09-29 10:27:02 +03:00
yuri	5af20c1ee0	merge targetLists	2015-09-28 16:41:28 +03:00
yuri	7620be3b40	ve	2015-09-28 14:26:20 +03:00
yuri	86f591b409	trim emails when search	2015-09-28 11:18:12 +03:00
yuri	533dfe24d0	default dashlet options	2015-09-28 11:08:13 +03:00
yuri	10c51dc46e	target lists panels	2015-09-28 10:55:58 +03:00
yuri	a9d24a1e09	fix mass update	2015-09-28 10:45:30 +03:00
yuri	0cfe093701	fix german language	2015-09-28 10:29:50 +03:00
yuri	11ec99fe6a	duplicate email template	2015-09-28 10:26:59 +03:00
yuri	b07e5a6da2	campaign list layout	2015-09-28 10:24:10 +03:00
yuri	151738f896	fix tracking img	2015-09-28 10:23:20 +03:00
yuri	075a370e7a	fix log opened	2015-09-25 16:46:55 +03:00