Ismail Šošić
|
bfd9f26d41
|
Merge branch 'next_button' into 'main'
add next button in filters
See merge request saburly/marketalarm/kivi-za-auta-react!23
|
2022-04-18 05:12:47 +00:00 |
|
ismailsosic
|
e3add5878b
|
add next button in filters
|
2022-04-18 07:11:23 +02:00 |
|
Ismail Šošić
|
9c12612b86
|
Merge branch 'vehicle_brands' into 'main'
add vehicle brands
See merge request saburly/marketalarm/kivi-za-auta-react!22
|
2022-04-14 10:13:36 +00:00 |
|
ismailsosic
|
a46e5d9755
|
add vehicle brands
|
2022-04-14 12:12:03 +02:00 |
|
Ismail Šošić
|
986ea5d18b
|
Merge branch 'simple_object' into 'main'
Simple object
See merge request saburly/marketalarm/kivi-za-auta-react!21
|
2022-04-14 08:53:51 +00:00 |
|
ismailsosic
|
85169b63b5
|
Simple object
|
2022-04-14 10:50:35 +02:00 |
|
Ismail Šošić
|
c6a1e2b335
|
Merge branch 'location_page' into 'main'
unfinished locationpage
See merge request saburly/marketalarm/kivi-za-auta-react!20
|
2022-04-11 10:28:42 +00:00 |
|
ismailsosic
|
f4c9f6258e
|
unfinished locationpage
|
2022-04-11 12:22:55 +02:00 |
|
Ismail Šošić
|
cb1257a902
|
Merge branch 'page_functionality' into 'main'
add page functionality
See merge request saburly/marketalarm/kivi-za-auta-react!19
|
2022-03-29 10:54:47 +00:00 |
|
ismailsosic
|
acd20536c8
|
add page functionality
|
2022-03-29 12:52:57 +02:00 |
|
ismailsosic
|
398ed4ceb4
|
clear app.js
|
2022-03-22 02:22:25 +01:00 |
|
Ismail Šošić
|
f9fa420459
|
Merge branch 'standard_filters' into 'main'
add standard filters component
See merge request saburly/marketalarm/kivi-za-auta-react!18
|
2022-03-22 01:19:46 +00:00 |
|
Ismail Šošić
|
c60e8697d2
|
Merge branch 'main' into 'standard_filters'
# Conflicts:
# kivi-cars/src/containers/App.js
|
2022-03-22 01:19:39 +00:00 |
|
ismailsosic
|
8dde844307
|
add standard filters component
|
2022-03-22 02:13:48 +01:00 |
|
msosic97
|
b5cc36709b
|
Merge branch 'emailpage' into 'main'
custmize email page
See merge request saburly/marketalarm/kivi-za-auta-react!17
|
2022-03-16 09:39:34 +00:00 |
|
msosic97
|
e8cbac666b
|
custmize email page
|
2022-03-16 10:37:56 +01:00 |
|
msosic97
|
f743e6aad8
|
add margin-top to categorybtns.css
|
2022-03-15 12:18:56 +01:00 |
|
msosic97
|
98d6efa600
|
Merge branch 'main' of gitlab.com:saburly/marketalarm/kivi-za-auta-react into main
|
2022-03-15 12:16:38 +01:00 |
|
msosic97
|
72fcd523d1
|
add margin-bottom on categorpage
|
2022-03-15 12:15:53 +01:00 |
|
ismailsosic
|
cd29538665
|
conflicts resolve
|
2022-03-15 12:00:33 +01:00 |
|
ismailsosic
|
c04f094b0d
|
add filters data
|
2022-03-15 11:54:33 +01:00 |
|
msosic97
|
ad441cc08e
|
clear app.js to avoid conflict
|
2022-03-15 11:52:13 +01:00 |
|
msosic97
|
dfd3ccc593
|
Merge branch 'editbtncss' into 'main'
edit button css for mobile
See merge request saburly/marketalarm/kivi-za-auta-react!15
|
2022-03-15 10:44:54 +00:00 |
|
msosic97
|
a3e038fbef
|
edit button css for mobile
|
2022-03-15 11:44:12 +01:00 |
|
msosic97
|
1dac631441
|
Merge branch 'editbuttoncss' into 'main'
edited buttons.css
See merge request saburly/marketalarm/kivi-za-auta-react!14
|
2022-03-14 16:25:09 +00:00 |
|
msosic97
|
99caca9e7d
|
edited buttons.css
|
2022-03-14 17:24:24 +01:00 |
|
Ahmed Šošić
|
9e086ddabe
|
Merge branch 'addlandingpage' into 'main'
create landing page
See merge request saburly/marketalarm/kivi-za-auta-react!13
|
2022-03-14 15:21:51 +00:00 |
|
ahmedsosic
|
f2990a84c7
|
add landing page and merged old file
|
2022-03-14 16:21:17 +01:00 |
|
ahmedsosic
|
08c3e632c8
|
create landing page
|
2022-03-14 16:08:14 +01:00 |
|
msosic97
|
2ac0df7921
|
Merge branch 'congratspage' into 'main'
Add congrats page
See merge request saburly/marketalarm/kivi-za-auta-react!12
|
2022-03-14 15:01:31 +00:00 |
|
msosic97
|
32d8e92c61
|
Add congrats page
|
2022-03-14 16:00:58 +01:00 |
|
msosic97
|
08df3cecf5
|
Merge branch 'addcategorypage' into 'main'
add category page
See merge request saburly/marketalarm/kivi-za-auta-react!11
|
2022-03-14 13:13:16 +00:00 |
|
msosic97
|
e15c31d4ec
|
add category page
|
2022-03-14 14:12:23 +01:00 |
|
msosic97
|
869d4453c8
|
fixes app.js issue after merging branch addcategorybuttons
|
2022-03-14 13:11:55 +01:00 |
|
msosic97
|
44163ea615
|
fixed conflict and merged branch addcategorybuttons
|
2022-03-14 13:06:46 +01:00 |
|
msosic97
|
a738f08905
|
edit css categorybtns
|
2022-03-14 12:22:36 +01:00 |
|
ismailsosic
|
09a176cd98
|
resolve conflicts
|
2022-03-14 12:14:58 +01:00 |
|
msosic97
|
992cb1756a
|
add category btns
|
2022-03-14 12:14:03 +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 |
|