Commit Graph

1709 Commits

Author SHA1 Message Date
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
5b2a07310e Merge remote-tracking branch 'origin/hotfix/2.7.1' into hotfix/2.7.1 2014-11-26 16:46:52 +02:00
Yuri Kuznetsov
b72f6fa2cc manual merge with hotfix/2.7.1 2014-11-26 16:45:26 +02:00
Yuri Kuznetsov
f6ff8e77e4 fix row action translation 2014-11-26 16:44:35 +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
Yuri Kuznetsov
f4c57046dd cleanup 2014-11-26 15:47:58 +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
7b507f1bab edit note is wide 2014-11-26 15:35:05 +02:00
Yuri Kuznetsov
c0b8c5e7d2 change avatar size 2014-11-26 15:25:49 +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
796b51d620 avatar for side field 2014-11-26 12:17:58 +02:00
Yuri Kuznetsov
9cc44cf917 modal backdrop param 2014-11-26 11:16:47 +02:00
Yuri Kuznetsov
9f7eecac73 attachment block fix 2014-11-26 10:47:14 +02:00
Yuri Kuznetsov
cba59fe847 EmailReceived Note: dont copy attachments 2014-11-26 10:17:36 +02:00
Yuri Kuznetsov
07df97ab9e ability to use entryPoint w/o build 2014-11-25 18:03:14 +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
Yuri Kuznetsov
51bdd15c9e change password 3 2014-11-20 16:25:43 +02:00
Yuri Kuznetsov
b48f10b45f load language on login form 2014-11-20 11:52:10 +02:00
Yuri Kuznetsov
027e928bd3 rename getController for app.js 2014-11-19 16:47:01 +02:00
Yuri Kuznetsov
3cfcfb02de changes in app.js 2014-11-19 16:42:20 +02:00
Yuri Kuznetsov
322df7ff68 Merge branch 'hotfix/2.7.1' 2014-11-19 16:05:45 +02:00
Yuri Kuznetsov
d58b9cac40 change password 2 2014-11-19 16:03:33 +02:00
Yuri Kuznetsov
cca6567bbd fix query 2014-11-19 16:03:33 +02:00
Yuri Kuznetsov
26eb194ccb small change 2014-11-19 16:03:33 +02:00
Yuri Kuznetsov
9b42ae41e7 change password 1 2014-11-19 16:03:33 +02:00
Yuri Kuznetsov
83916cacd9 cleanup 2014-11-19 16:03:33 +02:00