Commit Graph

1155 Commits

Author SHA1 Message Date
Taras Machyshyn
dc4c4bd084 Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend 2014-12-02 16:12:17 +02:00
Taras Machyshyn
6a5239cedc added camel case for indexes 2014-12-02 16:12:03 +02:00
Taras Machyshyn
9ea9429757 camel case convertation improvements 2014-12-02 16:11:22 +02:00
Yuri Kuznetsov
0fac47e227 Merge remote-tracking branch 'origin/master' 2014-12-02 13:20:08 +02:00
Yuri Kuznetsov
fe3cc09623 orm refactor 2014-12-02 13:19:45 +02:00
Taras Machyshyn
91445f2f9c indexes improvements 2014-12-02 12:25:38 +02:00
Yuri Kuznetsov
053d516bc9 user avatars in user list view 2014-12-02 11:21:01 +02:00
Yuri Kuznetsov
63a9f67bd9 fix avatar 2014-12-01 16:58:09 +02:00
Taras Machyshyn
c7dd503d80 Integration Entity minor fixes 2014-11-28 17:49:30 +02:00
Taras Machyshyn
c96265e2a9 Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend 2014-11-28 17:27:20 +02:00
Taras Machyshyn
ff35f7b1ff Integration entity fixes 2014-11-28 17:27:02 +02:00
Yuri Kuznetsov
ac1748067b fix crypt 2014-11-28 16:34:20 +02:00
Yuri Kuznetsov
a4de09ea36 clenup 2014-11-28 14:22:15 +02:00
Yuri Kuznetsov
0816831fe1 preview attachments in email 2014-11-28 12:57:12 +02:00
Yuri Kuznetsov
f1a990e80a fix email sender 2014-11-27 17:14:14 +02:00
Yuri Kuznetsov
a3a8110ae6 email archive: accountId from contact 2014-11-27 14:44:12 +02:00
Yuri Kuznetsov
82a213555b cleanup 2014-11-27 14:12:02 +02:00
Yuri Kuznetsov
775cfec744 remove comment 2014-11-27 14:07:22 +02:00
Yuri Kuznetsov
9ca1d6608c archive relate by message id 2014-11-27 12:46:57 +02:00
Yuri Kuznetsov
90cf300334 cleanup 2014-11-27 11:01:11 +02:00
Yuri Kuznetsov
00a911434b change user list layout 2014-11-26 17:44:09 +02:00
Yuri Kuznetsov
69840086c9 Merge branch 'hotfix/2.7.1' 2014-11-26 16:48:12 +02:00
Yuri Kuznetsov
9f9d0cb2dc cleanup 2014-11-26 16:43:11 +02:00
Yuri Kuznetsov
6a036595d6 dont notify about mention to current user 2014-11-26 16:29:47 +02:00
Taras Machyshyn
ff492e2a81 Merge branch 'hotfix/2.7.1' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.7.1 2014-11-26 15:39:09 +02:00
Taras Machyshyn
1a401381c4 merge improvements 2014-11-26 15:38:46 +02:00
Yuri Kuznetsov
6e49afddf0 Merge branch 'hotfix/2.7.1' 2014-11-26 14:54:50 +02:00
Yuri Kuznetsov
79dfd6177a fix imap folder encoding 2014-11-26 14:53:52 +02:00
Yuri Kuznetsov
4908f281a3 ability to disable avatars 2014-11-26 12:37:59 +02:00
Yuri Kuznetsov
cba59fe847 EmailReceived Note: dont copy attachments 2014-11-26 10:17:36 +02:00
Yuri Kuznetsov
0a1322843f Fix conflicts on merge with hotfix/2.7.1 2014-11-25 17:48:38 +02:00
Yuri Kuznetsov
6c6a3621e8 avatar 2014-11-25 17:37:16 +02:00
Yuri Kuznetsov
4a075819d1 avatar 3 2014-11-25 17:37:16 +02:00
Yuri Kuznetsov
3aa3914f3a fix notices 2014-11-25 17:37:16 +02:00
Yuri Kuznetsov
eef9c3e35c email sending fix 2014-11-25 17:37:16 +02:00
Taras Machyshyn
fe61fadc09 fileManager improvements 2014-11-25 17:37:16 +02:00
Taras Machyshyn
4c931514a2 E_STRICT notice fixes 2014-11-25 17:37:16 +02:00
Taras Machyshyn
8ad886d871 addded autoload.json for Resources 2014-11-25 16:44:50 +02:00
Taras Machyshyn
8492916d81 Merge branch 'hotfix/2.7.1' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.7.1 2014-11-25 12:21:04 +02:00
Taras Machyshyn
917f86a771 fixed merge with empty arrays 2014-11-25 12:20:41 +02:00
Yuri Kuznetsov
f3f13a1d96 fix notices 2014-11-25 10:38:08 +02:00
Yuri Kuznetsov
f750330171 email sending fix 2014-11-25 10:38:08 +02:00
Taras Machyshyn
de19a8274a fileManager improvements 2014-11-24 12:05:49 +02:00
Taras Machyshyn
0d66e4097c E_STRICT notice fixes 2014-11-21 18:23:24 +02:00
Yuri Kuznetsov
93b8745599 Merge branch 'hotfix/2.7.1' 2014-11-21 18:19:39 +02:00
Yuri Kuznetsov
55d54ee2da fix warning 2014-11-21 18:18:29 +02:00
Yuri Kuznetsov
fa25dc715f avatar 2 2014-11-21 17:00:30 +02:00
Yuri Kuznetsov
c010cf43bf avatar 1 2014-11-21 16:19:47 +02:00
Taras Machyshyn
e52177a687 minor improvements 2014-11-21 16:10:25 +02:00
Taras Machyshyn
d424e6a282 fixed E_STRICT notice for Orm convertation 2014-11-21 13:08:05 +02:00