m.korolev
|
bb94fba4c3
|
Merge branch 'origin/master'
|
2013-09-04 12:20:46 +04:00 |
|
m.korolev
|
a3a72718f8
|
At now categories load from IB of product
|
2013-09-04 12:20:33 +04:00 |
|
Grisha Pomadchin
|
c1c298b4eb
|
timezone fix; v0.3.9.1
|
2013-09-03 13:22:05 +04:00 |
|
m.korolev
|
f684763ea9
|
At now articles load from Product InfoBlock
|
2013-09-02 17:40:21 +04:00 |
|
Grisha Pomadchin
|
f0b87087e7
|
delete updater from master
|
2013-08-26 11:05:33 +04:00 |
|
Ilyas Salikhov
|
0e4988e415
|
Merge branch '0.3.9'
Conflicts:
intaro.intarocrm/export/export_setup.php
intaro.intarocrm/install/version.php
|
2013-08-26 10:42:47 +04:00 |
|
Ilyas Salikhov
|
a592053447
|
fix encoding
|
2013-08-26 10:38:52 +04:00 |
|
Ilyas Salikhov
|
535e665fc7
|
v0.3.9
|
2013-08-26 10:33:51 +04:00 |
|
Ilyas Salikhov
|
42d54b1982
|
fix in messages
|
2013-08-21 19:00:14 +04:00 |
|
m.korolev
|
63b10e658f
|
add empty option in select articles
|
2013-08-21 18:40:45 +04:00 |
|
m.korolev
|
82fce596dc
|
bugfix profile editing
|
2013-08-21 17:08:02 +04:00 |
|
m.korolev
|
b1a71726fc
|
Articles is not modatory now
|
2013-08-20 13:42:13 +04:00 |
|
m.korolev
|
57335ffb54
|
bugfix with &
|
2013-08-20 13:06:31 +04:00 |
|
m.korolev
|
04ea0ea00e
|
refactoring export run and setup
|
2013-08-20 12:53:32 +04:00 |
|
m.korolev
|
a1258b9af2
|
bugfix Count of profile
|
2013-08-19 18:13:26 +04:00 |
|
m.korolev
|
2a66f0a67b
|
bug fix ICMLLoader.php
|
2013-08-19 15:14:36 +04:00 |
|
m.korolev
|
6bb71edd15
|
Fix bugs in export encoding
|
2013-08-19 10:43:59 +04:00 |
|
Grisha Pomadchin
|
3926b01901
|
update up to 3.8
|
2013-08-16 16:29:11 +04:00 |
|
Grisha Pomadchin
|
07e42e793c
|
Revert to cf6a9ab20
|
2013-08-16 16:24:12 +04:00 |
|
Grisha Pomadchin
|
9ce341cf43
|
update up to 0.3.8
|
2013-08-16 16:18:06 +04:00 |
|
Grisha Pomadchin
|
cf6a9ab203
|
stable
|
2013-08-15 22:05:06 +04:00 |
|
Grisha Pomadchin
|
9a3ec002d6
|
added method
|
2013-08-15 19:41:07 +04:00 |
|
Grisha Pomadchin
|
67781a6f00
|
merge exportICML
|
2013-08-15 19:29:32 +04:00 |
|
m.korolev
|
f2097f72f0
|
Actual index
|
2013-08-15 18:14:41 +04:00 |
|
m.korolev
|
4c12e36c67
|
BugFix names
|
2013-08-15 18:01:03 +04:00 |
|
m.korolev
|
c947c7109f
|
1. added error handler
2. added updater
|
2013-08-15 17:34:29 +04:00 |
|
m.korolev
|
a7d5828caa
|
Exports files has been added
|
2013-08-15 14:46:13 +04:00 |
|
Grisha Pomadchin
|
b1b2d685db
|
event reovery
|
2013-08-14 20:12:40 +04:00 |
|
Grisha Pomadchin
|
d0a5ad4cf0
|
update 0.3.7 -> 0.3.8
|
2013-08-14 19:56:52 +04:00 |
|
pomadchin
|
bba1df38dc
|
deprecated parameters removing
|
2013-08-14 16:54:00 +04:00 |
|
pomadchin
|
f564c6c8e0
|
only package mode
|
2013-08-14 16:51:40 +04:00 |
|
pomadchin
|
8d5918cfc3
|
lang files mod
|
2013-08-14 12:23:00 +04:00 |
|
pomadchin
|
5e99c0c71d
|
fixed issue
|
2013-08-14 12:12:09 +04:00 |
|
pomadchin
|
33f279f90c
|
merge export
|
2013-08-14 11:42:01 +04:00 |
|
pomadchin
|
dec7cd50ea
|
merging second
|
2013-08-14 11:05:37 +04:00 |
|
pomadchin
|
1a7cd55b46
|
del confl files
|
2013-08-14 10:50:30 +04:00 |
|
МЫ
|
6d7829b03c
|
test merge
|
2013-08-14 10:45:05 +04:00 |
|
МЫ
|
29bf585826
|
test
|
2013-08-14 10:44:27 +04:00 |
|
Grisha Pomadchin
|
f92a62f70e
|
statuses ajax update
|
2013-08-07 14:45:25 +04:00 |
|
m.korolev
|
e6c8e49fc1
|
Delete old Export to ICML
|
2013-08-06 19:16:55 +04:00 |
|
m.korolev
|
14dce123c4
|
Export to ICML has been modified
Added step4 into install
|
2013-08-06 19:13:49 +04:00 |
|
Grisha Pomadchin
|
0fc3b0d3df
|
onSalePayOrder event
|
2013-08-06 16:50:09 +04:00 |
|
Grisha Pomadchin
|
05bd2807fd
|
bank-transfer
|
2013-08-06 15:39:10 +04:00 |
|
Grisha Pomadchin
|
d2949b1a80
|
fixes after revert
|
2013-08-06 15:10:01 +04:00 |
|
Grisha Pomadchin
|
f101809165
|
Revert to 7fdddd5ed
|
2013-08-06 15:02:11 +04:00 |
|
Grisha Pomadchin
|
2e4d520f65
|
fix statistic update
|
2013-08-06 13:14:53 +04:00 |
|
Grisha Pomadchin
|
114b2f1aae
|
after merge fixes
|
2013-08-06 10:38:27 +04:00 |
|
Grisha Pomadchin
|
6db7f6e656
|
v3.7
|
2013-08-06 10:31:37 +04:00 |
|
Grisha Pomadchin
|
fbcc052513
|
merging
|
2013-08-06 10:28:36 +04:00 |
|
Grisha Pomadchin
|
7fdddd5edf
|
orderCreate fix
|
2013-08-05 15:39:37 +04:00 |
|