Commit Graph

1516 Commits

Author SHA1 Message Date
yuri 1293620bbd Merge branch 'hotfix/4.8.5' 2017-11-22 13:24:03 +02:00
yuri b66732bcd0 ms before mrs 2017-11-22 11:52:56 +02:00
yuri 70262f4e89 Merge branch 'hotfix/4.8.5' 2017-11-21 13:52:07 +02:00
yuri 7305ff7792 category tree improvement 2017-11-21 13:52:00 +02:00
yuri b035f7aab4 Merge branch 'hotfix/4.8.5' 2017-11-21 12:13:50 +02:00
yuri 401a9c4687 export xlsx substr utf-8 2017-11-21 12:13:39 +02:00
yuri 420645800e Merge branch 'hotfix/4.8.5' 2017-11-21 12:11:12 +02:00
yuri f4f33e3d1f fix xlsx export 2017-11-21 12:11:06 +02:00
yuri 17cef2461d Merge branch 'hotfix/4.8.5' 2017-11-20 15:19:25 +02:00
yuri cfec27eab8 attachments changes 2017-11-20 15:19:14 +02:00
yuri 355ca2e7fe Merge branch 'hotfix/4.8.5' 2017-11-16 16:10:21 +02:00
yuri 851cef40c4 formula datetime closest function 2017-11-16 16:10:13 +02:00
yuri fbe41afdca Merge branch 'hotfix/4.8.5' 2017-11-16 11:31:03 +02:00
yuri b94f702cc0 language caching and fix 2017-11-16 11:30:53 +02:00
yuri 2637698641 Merge branch 'hotfix/4.8.5' 2017-11-15 16:02:02 +02:00
yuri ffeb600382 next month filter 2017-11-15 16:01:54 +02:00
yuri 171ed885eb Merge branch 'master' of github.com:espocrm/espocrm 2017-11-15 15:14:06 +02:00
yuri e3e05a07f3 Merge branch 'hotfix/4.8.5' 2017-11-15 15:13:05 +02:00
yuri 5a990de0d6 field manager: create labels for generated fields 2017-11-15 15:11:16 +02:00
Taras Machyshyn 3b11245525 Merge pull request #694 from Forestsoft-de/master
Unittests on windows failed
2017-11-15 12:55:02 +02:00
yuri 94923d3ddf merge hotfix/4.8.5 2017-11-15 11:39:14 +02:00
yuri 428cfa3fe0 it_IT lang 2017-11-15 11:34:43 +02:00
yuri d08a100259 es_MX lang 2017-11-15 11:34:14 +02:00
yuri be567b9c0e es_ES lang 2017-11-15 11:33:45 +02:00
yuri 48b1fbe66e zh CN lang 2017-11-15 11:26:36 +02:00
Sebastian Foerster 30fb116676 Extract change in different branch 2017-11-14 21:24:05 +01:00
Sebastian Foerster 5eb2b92397 Integration Test failed on Windows because Espo Bool Type for doctrine could not been found. 2017-11-14 20:54:03 +01:00
Sebastian Foerster 26bbd6672f Merge branch 'master' of https://github.com/espocrm/espocrm 2017-11-14 18:24:06 +01:00
yuri 3cfacafb16 Merge branch 'master' of github.com:espocrm/espocrm 2017-11-14 15:30:13 +02:00
yuri d3bc318307 Merge branch 'hotfix/4.8.5' 2017-11-14 15:30:02 +02:00
Taras Machyshyn 763840e7fc Merge pull request #689 from ZinitSolutions/route_change
Route: possibility to replace routes in modules
2017-11-14 13:29:50 +02:00
yuri e2f6e3324a admin notifications param 2017-11-14 10:57:02 +02:00
Sebastian Foerster ca7b5cab86 Fix Tests for Windows based Development System 2017-11-13 20:59:36 +01:00
r.ratsun 76471a6db1 Route: possibility to replace routes in modules 2017-11-13 16:51:25 +02:00
yuri dd8e51a1d9 skipOrmDefs param additional 2017-11-13 16:14:33 +02:00
yuri 9cbfb930a4 Merge branch 'hotfix/4.8.5' 2017-11-13 14:47:55 +02:00
Taras Machyshyn d04035dd3f HookManager improvements 2017-11-13 13:59:30 +02:00
yuri 5e18528d02 Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend 2017-11-13 13:32:32 +02:00
yuri 68e42e9c5a Merge branch 'hotfix/4.8.5' 2017-11-13 13:32:21 +02:00
yuri 506a9a2e3f Merge branch 'hotfix/4.8.5' of ssh://172.20.0.1/var/git/espo/backend into hotfix/4.8.5 2017-11-10 15:30:36 +02:00
yuri cf53edf604 Merge branch 'hotfix/4.8.5' 2017-11-10 12:22:14 +02:00
yuri a581879a8e email parsing fixes 2017-11-10 12:19:57 +02:00
yuri 4ed742fa4a fix email attachment import for weird formatting by apple client 2017-11-09 11:44:49 +02:00
yuri d3cb258440 fix email attachment import for emails composed with not proper formatting by bad agents 2017-11-09 11:20:38 +02:00
Taras Machyshyn 2d42c21c1a Merge branch 'hotfix/4.8.5' 2017-11-08 16:50:03 +02:00
Taras Machyshyn 1e2700cde1 HookManager improvements 2017-11-08 16:48:20 +02:00
yuri 6c39a89636 Merge branch 'hotfix/4.8.5' 2017-11-07 14:36:25 +02:00
yuri e5f8883399 formula: array push function 2017-11-07 14:33:05 +02:00
yuri 92b9a40891 fix excel export: foreign fields formatting 2017-11-07 14:19:55 +02:00
yuri 7d45be983b Merge branch 'hotfix/4.8.5' 2017-11-07 14:04:10 +02:00