Commit Graph

644 Commits

Author SHA1 Message Date
yuri 018eb44de6 Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend 2015-02-02 12:49:46 +02:00
yuri ee57c9223c User:isActive 2015-02-02 12:22:37 +02:00
Taras Machyshyn f799ffc61f Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend 2015-02-02 12:10:21 +02:00
Taras Machyshyn bdb1f2f3b6 improved Util::merge() functionality 2015-02-02 12:10:04 +02:00
yuri fd755df67b Merge branch 'hotfix/2.9.3' 2015-02-02 11:21:14 +02:00
yuri e9edd01d08 modified date and id for remove 2015-02-02 11:21:00 +02:00
yuri dea7e0b33e modified date and id for remove 2015-02-02 11:20:28 +02:00
yuri 8a53657b9c text search by email address 2015-01-30 15:51:47 +02:00
yuri c6ecbf4942 Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend 2015-01-30 14:55:51 +02:00
yuri 56d11807a1 access check in select managers change 2015-01-30 14:52:34 +02:00
yuri f60061a387 Merge branch 'hotfix/2.9.3' 2015-01-30 12:54:00 +02:00
yuri c627d84273 cleanup 2015-01-30 12:53:52 +02:00
Taras Machyshyn 5a16ee0493 Merge branch 'master' of ssh://172.20.0.1/var/git/espo/backend 2015-01-29 17:11:28 +02:00
Taras Machyshyn 14252d6e9e FileManager: improved 'remove()' functionality 2015-01-29 17:11:16 +02:00
yuri 8b4070f9ae Merge branch 'hotfix/2.9.2' 2015-01-29 12:14:13 +02:00
yuri 0b6c5c2862 Merge branch 'hotfix/2.9.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.9.2 2015-01-29 12:13:54 +02:00
yuri ce9ff10cb0 fix imap 2015-01-29 12:03:43 +02:00
Taras Machyshyn de688bfa12 CronManager minor changes 2015-01-29 11:44:47 +02:00
yuri b1e184c6d1 link manager dev 2015-01-28 16:38:27 +02:00
Taras Machyshyn 33fef4c90e Merge branch 'hotfix/2.9.2' 2015-01-27 17:19:18 +02:00
yuri 2dc15294fc Merge branch 'hotfix/2.9.2' 2015-01-27 16:30:26 +02:00
yuri 171df33736 move logic to Repository::afterSave 2015-01-27 16:27:05 +02:00
yuri bc65975f74 fix in default config 2015-01-27 11:53:55 +02:00
yuri a5308831f2 Merge branch 'hotfix/2.9.2' 2015-01-27 11:42:17 +02:00
yuri ef05e4e9f4 add cryptKey to systemItems 2015-01-27 11:40:51 +02:00
yuri a9b3320302 Merge branch 'hotfix/2.9.2' 2015-01-26 17:36:21 +02:00
yuri 884ccb5265 Select Managers changes and Email changes 2015-01-26 17:35:43 +02:00
Taras Machyshyn e218056683 Cron job improvements 2015-01-26 12:28:00 +02:00
yuri 838288a463 Merge branch 'hotfix/2.9.2' 2015-01-26 12:11:30 +02:00
yuri 48ee7d4cc7 Merge branch 'hotfix/2.9.2' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.9.2 2015-01-23 18:19:25 +02:00
Taras Machyshyn c712366737 cron jobs improvements and fixes 2015-01-23 17:44:59 +02:00
yuri 9049ebfa8c fix email importer 2015-01-23 17:05:33 +02:00
yuri f4b9356173 em dev 2015-01-22 15:55:11 +02:00
yuri beaa4a29ba Merge branch 'hotfix/2.9.1' 2015-01-22 15:32:36 +02:00
yuri 632ee66155 Merge branch 'hotfix/2.9.1' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.9.1 2015-01-22 15:14:25 +02:00
yuri 4446bc3167 fix oauth client 2015-01-22 15:14:16 +02:00
Taras Machyshyn 785934c7cc Language: chnaged set(), delete() methods 2015-01-22 14:49:40 +02:00
Taras Machyshyn ac36096d55 Merge branch 'hotfix/2.9.1' of ssh://172.20.0.1/var/git/espo/backend into hotfix/2.9.1 2015-01-22 13:15:15 +02:00
Taras Machyshyn 8ec8cb3c56 Metadata: fixed description 2015-01-22 13:14:55 +02:00
Taras Machyshyn 1f7cb2402d changed Metadata methods set(), get(), added save() 2015-01-22 13:14:06 +02:00
yuri 987ba2faa5 EM dev 2015-01-22 12:10:53 +02:00
yuri c7947d0c46 Merge branch 'hotfix/2.9.1' 2015-01-21 17:13:48 +02:00
yuri eed9059913 integration changes 2015-01-21 17:11:12 +02:00
yuri 20a1053413 fix select manager 2015-01-21 15:50:41 +02:00
yuri fff1be9d07 entity manager dev 2015-01-21 15:13:37 +02:00
yuri 93a4f999b6 entity manager 2 2015-01-20 18:01:05 +02:00
yuri 3030643ce4 entity manager 1 2015-01-20 16:40:04 +02:00
Taras Machyshyn e814ea9ec6 added 'save()' method to Layout 2015-01-20 15:34:29 +02:00
Taras Machyshyn 832c63e014 added 'getPhpContents()' to FileManager 2015-01-20 12:22:04 +02:00
Taras Machyshyn 8035bc424e added 2015 to the license 2015-01-15 15:36:20 +02:00