Commit Graph

21 Commits

Author SHA1 Message Date
ismailsosic
c04f094b0d add filters data 2022-03-15 11:54:33 +01:00
ismailsosic
09a176cd98 resolve conflicts 2022-03-14 12:14:58 +01:00
ismailsosic
a064e89ceb add filter_navigation 2022-03-14 12:03:26 +01:00
msosic97
5d1e7ab14f Merge branch 'addstandardbutton' into 'main'
add standard button

See merge request saburly/marketalarm/kivi-za-auta-react!8
2022-03-14 10:54:27 +00:00
msosic97
d49328fea4 add standard button 2022-03-14 11:53:42 +01:00
msosic97
781f46328d Merge branch 'createbuttonstoolbar' into 'main'
edit css buttonstoolbar

See merge request saburly/marketalarm/kivi-za-auta-react!7
2022-03-14 09:54:20 +00:00
msosic97
176a071874 edit css buttonstoolbar 2022-03-14 10:53:36 +01:00
Ismail Šošić
5e45397218 Merge branch 'createbuttonstoolbar' into 'main'
add buttons, buttonstoolbar

See merge request saburly/marketalarm/kivi-za-auta-react!6
2022-03-14 09:46:00 +00:00
msosic97
4e74b56b2f add buttons, buttonstoolbar 2022-03-14 10:21:18 +01:00
Ismail Šošić
4e5d0f7022 Merge branch 'Info' into 'main'
add info.js

See merge request saburly/marketalarm/kivi-za-auta-react!5
2022-03-11 11:07:16 +00:00
ismailsosic
37218739f4 add info.js 2022-03-11 12:05:18 +01:00
Ismail Šošić
ee6920d5df Merge branch 'addfiler' into 'main'
add filter js

See merge request saburly/marketalarm/kivi-za-auta-react!3
2022-03-11 09:06:34 +00:00
ismailsosic
36aee4b8b1 merge branches 2022-03-11 10:05:33 +01:00
ismailsosic
3247554c01 Merge branch 'addfiler' into main 2022-03-11 10:00:33 +01:00
Ismail Šošić
b19142ad47 Update kivi-cars/public/index.html, kivi-cars/src/index.js 2022-03-11 08:56:11 +00:00
ismailsosic
be01f7ac58 add filter js 2022-03-11 09:40:12 +01:00
Ahmed Šošić
df8617b192 Merge branch 'welcomscreen' into 'main'
create welcome and category screens

See merge request saburly/marketalarm/kivi-za-auta-react!2
2022-03-10 15:54:24 +00:00
ahmedsosic
8059e28e18 create welcome and category screens 2022-03-10 16:53:07 +01:00
Ahmed Šošić
d808705c45 Merge branch 'react_installation' into 'main'
install react

See merge request saburly/marketalarm/kivi-za-auta-react!1
2022-03-08 09:34:54 +00:00
ismailsosic
924ed91566 install react 2022-03-07 13:23:53 +01:00
Senad Uka
8710ec8138 Initial commit 2022-02-17 13:19:13 +00:00