Commit Graph

Select branches

Hide Pull Requests

authentication-by-role

backend-contacts-page

backoffice-minimum-cost-margin

cart-validation

cherry-pick-392b1134

cherry-pick-f33c6aa6

commercial-lead-prices

dashboard

development

documents-fix

fix-order-assigment-bug

fix-tests

forms-filtering

installation-fix

master

package-reference

remove-co-market

templates

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#38

#4

#40

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

Mono Color

• 66452eee86 Connected template category to product in bundle product search Nedim Uka 2018-10-23 15:48:56 +02:00
• 18f40d9403 Merge branch 'template-creation-fix' into 'master' Nedim Uka 2018-10-23 10:37:49 +00:00
• 69773c77a7 validate country Almira Krdzic 2018-10-23 12:17:25 +02:00
• e3869e720b Fix template creation Almira Krdzic 2018-10-23 11:28:11 +02:00
• 00999122a2 Merge branch 'role-access' into 'master' Bilal Catic 2018-10-22 09:26:56 +00:00
• 09aac81276 allow admin on frontend Almira Krdzic 2018-10-22 11:00:48 +02:00
• 790d24a1f6 forbid admin user on frontend Almira Krdzic 2018-10-22 10:58:45 +02:00
• 3d6f15dd4f return error status on login Almira Krdzic 2018-10-22 10:35:25 +02:00
• 5570cf7f91 transform auth user last Almira Krdzic 2018-10-22 09:53:40 +02:00
• e420953c39 do not set cart cookies Almira Krdzic 2018-10-22 09:52:01 +02:00
• 21fafc5a43 Enable login by role both on frontend and backend Almira Krdzic 2018-10-22 09:47:48 +02:00
• 87f408125d Merge branch 'preserve-uploads-dir' into 'master' Almira 2018-10-22 06:46:38 +00:00
• 37916e4931 fixes Almira Krdzic 2018-10-22 08:46:07 +02:00
• a07b3fb7d9 preserve user uploaded content Bilal Catic 2018-10-21 19:18:54 +02:00
• f76e102bf3 Merge branch 'package-reference' into 'master' Bilal Catic 2018-10-21 13:22:49 +00:00
• 4ee63b053c test authentication-by-role Almira Krdzic 2018-10-21 02:40:58 +02:00
• bfc216b0fe test Almira Krdzic 2018-10-21 02:19:10 +02:00
• 5cbdb482f2 test Almira Krdzic 2018-10-21 02:13:57 +02:00
• a61edbc984 test' Almira Krdzic 2018-10-20 14:02:06 +02:00
• 70d16f95c5 test' Almira Krdzic 2018-10-20 13:46:02 +02:00
• 5a42777500 test Almira Krdzic 2018-10-20 00:47:04 +02:00
• 95318ff1c4 test Almira Krdzic 2018-10-20 00:42:03 +02:00
• 88c5ae5eb1 test Almira Krdzic 2018-10-20 00:30:10 +02:00
• e618484725 test Almira Krdzic 2018-10-20 00:25:29 +02:00
• 4d87551fef test Almira Krdzic 2018-10-20 00:08:48 +02:00
• 52fb6dc5d9 test Almira Krdzic 2018-10-19 23:43:05 +02:00
• cfd602bef7 test Almira Krdzic 2018-10-19 23:30:03 +02:00
• 6b3964c2ca test Almira Krdzic 2018-10-19 23:22:11 +02:00
• dc5461f616 test Almira Krdzic 2018-10-19 23:08:31 +02:00
• eecbeed2b8 test Almira Krdzic 2018-10-19 22:36:39 +02:00
• f21e1d90b5 test Almira Krdzic 2018-10-19 22:23:57 +02:00
• e323b597b1 test Almira Krdzic 2018-10-19 21:11:12 +02:00
• 5a6f876c69 Merge branch 'master' into package-reference package-reference Almira Krdzic 2018-10-19 21:01:05 +02:00
• 3d4c3c40c1 test Almira Krdzic 2018-10-19 20:55:33 +02:00
• c3b665cd51 test Almira Krdzic 2018-10-19 20:50:55 +02:00
• 84f7974050 test Almira Krdzic 2018-10-19 20:44:30 +02:00
• bde4a9a91f test Almira Krdzic 2018-10-19 20:37:10 +02:00
• 05863b4114 test Almira Krdzic 2018-10-19 20:32:42 +02:00
• fd2f01197e test Almira Krdzic 2018-10-19 20:20:19 +02:00
• 30a51dae8c test Almira Krdzic 2018-10-19 20:16:05 +02:00
• b5b8a72eaf test Almira Krdzic 2018-10-19 20:10:20 +02:00
• 5d8e759e80 Remove shop on org delete Almira Krdzic 2018-10-19 20:00:40 +02:00
• a5a795af93 Authenticate by role on frontend Almira Krdzic 2018-10-19 17:57:27 +02:00
• 9b5cc3a978 Merge branch 'bundle-cost-summary' into 'master' Nedim Uka 2018-10-19 10:28:24 +00:00
• 038b622eca Update product properties field Almira Krdzic 2018-10-19 12:27:25 +02:00
• e4ed26de7d add missing comma Almira Krdzic 2018-10-19 10:27:33 +02:00
• 094a7bd56c Merge branch 'master' into package-reference Almira Krdzic 2018-10-19 10:19:45 +02:00
• 67dc8d7d69 Hide unused tabs and render only edit link for package prices Almira Krdzic 2018-10-18 20:02:12 +02:00
• 3ccea1804e Merge branch 'master' into bundle-cost-summary Almira Krdzic 2018-10-18 19:01:18 +02:00
• 315ac70484 Merge branch 'simple-product-details' into 'master' Almira 2018-10-18 17:00:28 +00:00
• c4cddf8ace Added comment to save post method Nedim Uka 2018-10-18 17:30:42 +02:00
• 00e853ae6b Fixed product status issue Nedim Uka 2018-10-18 17:28:31 +02:00
• 071c549726 Impleneted search by country, and added mesurment unit Nedim Uka 2018-10-10 14:09:31 +02:00
• d22ea58568 Import reference ui field Almira Krdzic 2018-10-18 13:36:45 +02:00
• d3c280548b customize column name for reference Almira Krdzic 2018-10-18 13:28:41 +02:00
• 1ed7310994 handle package reference Almira Krdzic 2018-10-18 13:10:55 +02:00
• 76e9b10235 Merge branch 'master' into bundle-cost-summary Almira Krdzic 2018-10-18 09:58:15 +02:00
• 6b0dd0b5a9 handle bundle product prices editor and prices summary Almira Krdzic 2018-10-18 09:57:44 +02:00
• 6d65a5f30c handle bundle product prices editor and prices summary Almira Krdzic 2018-10-18 09:57:38 +02:00
• c8ed5f7ff8 Merge branch 'resseler-to-customer' into 'master' Bilal Catic 2018-10-17 20:27:03 +00:00
• 49281f02be remove error logs Almira Krdzic 2018-10-17 19:40:25 +02:00
• b7ab761a25 Handle bundle pricing on separate page Almira Krdzic 2018-10-17 19:38:41 +02:00
• 0238f9140e Fixes Almira Krdzic 2018-10-17 17:45:33 +02:00
• 4d13ee40bc Add descriptive comments Almira Krdzic 2018-10-17 14:02:35 +02:00
• 6c27afabfc Merge branch 'master' into resseler-to-customer Almira Krdzic 2018-10-17 13:44:15 +02:00
• 755fc75ae9 Filter linked organizations as customer Almira Krdzic 2018-10-17 11:31:09 +02:00
• ecde654ae9 Merge branch 'commercial-lead-prices' into 'master' Nedim Uka 2018-10-17 09:29:54 +00:00
• 8769606a4b Implement shop search and refactor Almira Krdzic 2018-10-17 00:36:19 +02:00
• ddf7d4452c Refactor admin cl interface and handle product access with groups commercial-lead-prices Almira Krdzic 2018-10-16 16:57:48 +02:00
• 554dc37a2d updated timestamp of role related db updates so they get triggered again Almira Krdzic 2018-10-16 06:49:57 +02:00
• afab22a30b reseller to customer Almira Krdzic 2018-10-16 06:45:28 +02:00
• dc1a1c64d2 Add default roles Almira Krdzic 2018-10-15 18:08:09 +02:00
• 2d7b6c55e6 add view admin dashboard to cl Almira Krdzic 2018-10-15 17:22:58 +02:00
• d7103df6dc add view admin dashboard to cl Almira Krdzic 2018-10-15 17:21:30 +02:00
• b7ac53d195 use only customer specific prices if set Almira Krdzic 2018-10-15 14:59:57 +02:00
• f14d35b1aa Fix tests Almira Krdzic 2018-10-15 05:06:46 +02:00
• e810dd086a Merge branch 'master' into commercial-lead-prices Almira Krdzic 2018-10-15 00:31:24 +02:00
• 8789eb1426 Merge branch 'organization-access' into 'master' Bilal Catic 2018-10-14 22:27:52 +00:00
• bd724d12c2 Merge branch 'master' into organization-access Almira Krdzic 2018-10-15 00:25:11 +02:00
• 803e62ea69 Merge branch 'backoffice-max-cost-margin' into 'master' Almira 2018-10-14 22:24:33 +00:00
• a5168d3487 remove unnecessary code Bilal Catic 2018-10-14 23:42:18 +02:00
• d7c34c3b0b remove double code, change hook for validation Bilal Catic 2018-10-14 23:38:38 +02:00
• 55dc87e174 check if taxonomy query exists and append if exists Bilal Catic 2018-10-14 16:03:05 +02:00
• 9f3fe44bb1 add proper message when adding invalid package to cart Bilal Catic 2018-10-14 15:31:27 +02:00
• ba2629ca22 refactor Bilal Catic 2018-10-14 14:46:35 +02:00
• 14eda981b7 add notice instead of throwing error Bilal Catic 2018-10-14 14:24:06 +02:00
• 8df4ec3dc7 move package validation to seperate function Bilal Catic 2018-10-14 14:19:22 +02:00
• 17acc9d96a Error proof creating suppliers link to organization Almira Krdzic 2018-10-13 14:28:45 +02:00
• 4bdad78ed8 add tests Bilal Catic 2018-10-11 05:53:39 +02:00
• f3d911e5b1 remove debug logging Bilal Catic 2018-10-11 05:27:17 +02:00
• e4a7b28301 fix tests Bilal Catic 2018-10-11 03:24:19 +02:00
• 84ba574bcb add detailed error message Bilal Catic 2018-10-11 03:13:15 +02:00
• 4f31cc94e8 update package status on package update Bilal Catic 2018-10-11 03:00:44 +02:00
• bc74b504db fix const declaration Bilal Catic 2018-10-11 01:20:33 +02:00
• 8d2b1e52b4 prevent checkout with invalid package Bilal Catic 2018-10-10 14:41:57 +02:00
• 63c1ee945f prevent adding invalid package to cart Bilal Catic 2018-10-10 12:40:20 +02:00
• 1e9f959b16 fetch only available packages Bilal Catic 2018-10-10 12:26:01 +02:00
• afe4ac1676 update package status on product update Bilal Catic 2018-10-09 14:34:10 +02:00
• c7e8a526e0 add custom package status Bilal Catic 2018-10-09 14:33:53 +02:00
• ac9c89e8eb update name to reflect logic behind margin Bilal Catic 2018-10-07 14:09:11 +02:00