Michael RICOIS
b1614b7fda
Merge branch 'ticket/r15351-permissions-managers' into develop
2018-01-08 12:50:18 +01:00
Christophe LATOUR
d80baa79bd
FIX 500 :
...
- exception 'ErrorException' with message 'mktime(): You should be using the time() function instead' in /Library/WebServer/Documents/bebeboutik/modules/privatesales/Sale.php:76
2018-01-04 18:39:01 +01:00
Christophe LATOUR
6a994070bd
Merge branch 'fix/500-module-invite' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
2017-12-05 16:21:53 +01:00
root
c29293c7ae
push from prod
2017-12-04 11:27:43 +01:00
Marion Muszynski
a846de99eb
Merge branch 'ticket-14828-ChangeIdContactDynamically' into develop
2017-11-23 15:32:07 +01:00
root
78bd7eb479
fixes from prod
2017-11-23 15:05:07 +01:00
Marion Muszynski
d2acbed313
Merge branch 'ticket-14456-BugBaliseEd' into develop
2017-11-15 12:41:22 +01:00
root
43a085d4ec
push from prod
2017-11-15 10:34:51 +01:00
Marion Muszynski
fe0c0ad177
Merge branch 'ticket-14735-NewExpe' into develop
2017-11-14 17:09:37 +01:00
Marion Muszynski
83171ab6c2
add a new delay
2017-11-14 17:09:17 +01:00
Marion Muszynski
0ea19438a0
Merge branch 'fix-SaleClass' into develop
2017-11-13 15:29:01 +01:00
Marion Muszynski
7bafa646e4
getting categories by cache in getProducts
2017-11-13 15:28:46 +01:00
Marion Muszynski
ead1bf052e
Merge branch 'Task-Caching_2' into develop
2017-10-31 16:04:53 +01:00
Marion Muszynski
d0c298f20b
caching menu
2017-10-31 16:04:36 +01:00
Marion Muszynski
ef54c025ad
Merge branch 'ticket-White_2' into develop
2017-10-31 13:11:14 +01:00
Marion Muszynski
cd2bf20ae9
uncache sale for backoffice
2017-10-30 15:11:20 +01:00
Marion Muszynski
5ea49b53b4
Merge branch 'Task-Caching' into develop
2017-10-30 14:41:52 +01:00
Marion Muszynski
c25d0551cd
remove console log
2017-10-30 14:41:37 +01:00
Marion Muszynski
0b78ebc2f3
Merge branch 'Task-Caching' into develop
2017-10-30 13:42:08 +01:00
Marion Muszynski
07dd8ab9c9
test flush cache sale
2017-10-30 13:41:50 +01:00
Marion Muszynski
aac4da9c0a
Merge branch 'ticket-14436-WP' into develop
2017-10-27 13:12:23 +02:00
Marion Muszynski
f64bc5ff1f
fix for admin
2017-10-25 15:48:01 +02:00
Marion Muszynski
d62919e240
uncache future sale
2017-10-25 15:37:15 +02:00
Marion Muszynski
35e786058c
add mobile off img
2017-10-25 15:06:50 +02:00
Marion Muszynski
96a0f240f2
Merge branch 'add-CacheRedis'
2017-10-25 14:31:25 +02:00
Marion Muszynski
2ea53f44ab
Merge branch 'fix-namePromoBanner' into develop
2017-10-24 18:30:31 +02:00
Marion Muszynski
61a00eafbd
fix in tpl
2017-10-24 18:30:20 +02:00
Marion Muszynski
161673618e
Merge branch 'fix-resetpassword-include' into develop
2017-10-24 10:27:54 +02:00
Marion Muszynski
fc08dfd0eb
fix delay in admin privatesale
2017-10-23 10:10:05 +02:00
Marion Muszynski
df52811ada
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
2017-10-19 17:13:41 +02:00
root
9c97f5ff94
fix and translation from prod
2017-10-18 12:10:35 +02:00
Marion Muszynski
1dc2a7f6b2
fix conflict
2017-10-17 16:29:54 +02:00
Marion Muszynski
e300ed0dfc
Merge branch 'ticket-14460-BugReturnProcess' into develop
2017-10-11 16:15:14 +02:00
Marion Muszynski
ab39a55b63
change trad
2017-10-04 15:36:36 +02:00
Marion Muszynski
2a5b0712e9
Merge branch 'update-CreationCat' into develop
2017-10-04 13:25:50 +02:00
Marion Muszynski
f7057346be
add creation category in adminprivatesalesale
2017-10-04 13:25:32 +02:00
Marion Muszynski
97ec6492c6
Merge branch 'ticket-14285-Dropshipping' into develop
2017-10-02 13:24:32 +02:00
Marion Muszynski
c5db353391
fix sale conbination
2017-10-02 13:24:15 +02:00
Marion Muszynski
faff854953
Merge branch 'fix-uncombinable' into develop
2017-10-02 12:50:22 +02:00
Marion Muszynski
6b2e8deea1
fix and addition
2017-10-02 12:49:45 +02:00
Marion Muszynski
20b2adc944
Merge branch 'fix-uncombinable' into develop
2017-10-02 12:41:38 +02:00
Marion Muszynski
e12e7616d7
fix when is same sale
2017-10-02 12:41:00 +02:00
Marion Muszynski
d5bbf47f10
fix conflicts
2017-09-29 15:51:41 +02:00
Marion Muszynski
ad291c9f99
move mobile imgage upload to adminprivatesalesale
2017-09-28 15:38:03 +02:00
Marion Muszynski
8f07cd31c6
fix conflicts
2017-09-26 17:35:31 +02:00
Marion Muszynski
8fb28292b8
add drop shipping
2017-09-26 14:53:38 +02:00
Marion Muszynski
635e984d67
Merge branch 'add-CacheRedis' into develop
2017-09-25 12:29:11 +02:00
Marion Muszynski
c962994c82
Merge branch 'ticket-14161-UncombinableSale'
2017-09-20 16:53:52 +02:00
Michael RICOIS
8c1c166572
Merge branch 'ticket-13149' into develop
2017-09-18 17:45:29 +02:00
Michael RICOIS
f0e00394fa
Clean ajax and add parameter to not loop in categoryUpdate hook
2017-09-18 17:44:09 +02:00
