Denis Gorbunov
|
81fb3787bf
|
Merge branch 'develop' into feature/add-button-component
|
2022-08-23 10:46:23 +00:00 |
|
Denis Gorbunov
|
b076b8ef69
|
Merge pull request 'Rename wrong icon's name' (#98) from fix/icon-factory into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/98
|
2022-08-23 10:45:44 +00:00 |
|
Denis Gorbunov
|
d448ac0110
|
Merge pull request 'Delete unnecessary component Logotype' (#99) from fix/unnecessary-files into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/99
|
2022-08-23 10:45:20 +00:00 |
|
Denis Gorbunov
|
bc9fc9495d
|
Merge pull request 'Delete property from deprecated page component' (#100) from fix/deprecated-trash into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/100
|
2022-08-23 10:45:10 +00:00 |
|
Denis Gorbunov
|
faed5dd8dc
|
Merge pull request 'Fixed header' (#101) from fix/header into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/101
|
2022-08-23 10:44:47 +00:00 |
|
Denis Gorbunov
|
30f0e02a4d
|
Merge pull request 'Feixed navbar from header' (#102) from fix/header-navbar into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/102
|
2022-08-23 10:44:00 +00:00 |
|
Denis Gorbunov
|
cd4f5f55ca
|
Merge pull request 'Fixed width if bottom sheet modal component' (#104) from fix/bottom-sheet-modal into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/104
|
2022-08-23 10:43:36 +00:00 |
|
decamel
|
159913fe97
|
Merge remote-tracking branch 'origin/develop' into fix/bottom-sheet-modal
|
2022-08-23 13:43:03 +03:00 |
|
Denis Gorbunov
|
27a769277e
|
Merge pull request 'Fixed button component' (#103) from fix/button-component into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/103
|
2022-08-23 10:41:37 +00:00 |
|
Denis Gorbunov
|
ebbb66e48a
|
Merge pull request 'Return of the App.tsx' (#97) from fix/return-app into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/97
|
2022-08-23 09:42:12 +00:00 |
|
Maximus
|
e87a920d99
|
fixed width of bottom modal
|
2022-08-23 11:57:20 +03:00 |
|
Maximus
|
0fa8033830
|
changed deprecated page component
|
2022-08-22 17:55:59 +03:00 |
|
Maximus
|
4caaa13752
|
removed unnecessary console.log command
|
2022-08-22 17:51:46 +03:00 |
|
Denis Gorbunov
|
47c4f2c113
|
Merge pull request 'fix errors with import footer' (#96) from fix/base-layout-schema into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/96
|
2022-08-22 09:29:27 +00:00 |
|
Maximus
|
1aa8f104bd
|
setup imports
|
2022-08-20 16:19:52 +03:00 |
|
Maximus
|
f42b505136
|
setup imports in header
|
2022-08-20 16:16:18 +03:00 |
|
Maximus
|
b557d05718
|
resolved header errors, refresh imports
|
2022-08-20 15:15:05 +03:00 |
|
Maximus
|
4247766746
|
replace our header to parts folder, remove deprecated header
|
2022-08-20 14:42:47 +03:00 |
|
Maximus
|
f7ce6f0a07
|
delete unnecessary logotype
|
2022-08-20 10:34:08 +03:00 |
|
Maximus
|
d2976eb824
|
rename wrong icon's name
|
2022-08-20 10:27:34 +03:00 |
|
Maximus
|
8d2036207e
|
Merge branch 'fix/return-app' into develop
|
2022-08-20 10:19:13 +03:00 |
|
Maximus
|
adf23f3b8f
|
fix errors with import footer
|
2022-08-19 22:56:31 +03:00 |
|
Denis Gorbunov
|
c7af2deb9c
|
Merge pull request 'added new icons, remove repetable icons, modified icon-factory' (#93) from fix/icon-factory into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/93
|
2022-08-19 19:02:24 +00:00 |
|
Denis Gorbunov
|
b6ba21be7d
|
Merge pull request 'fix/base-layout-schema' (#91) from fix/base-layout-schema into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/91
|
2022-08-19 19:02:16 +00:00 |
|
Maximus
|
4c44a1ba2d
|
Merge branch 'fix/icon-factory' into fix/return-app
|
2022-08-19 19:55:49 +03:00 |
|
Maximus
|
fba6faecd2
|
Merge branch 'fix/base-layout-schema' into fix/return-app
|
2022-08-19 19:55:38 +03:00 |
|
Maximus
|
4b9ce789f7
|
return of App.tsx
|
2022-08-19 19:49:34 +03:00 |
|
maximus
|
79f89fac3f
|
Merge branch 'develop' into fix/base-layout-schema
|
2022-08-19 16:29:36 +00:00 |
|
Maximus
|
44de4f1195
|
added new icons, remove repetable icons, modified icon-factory
|
2022-08-19 19:24:59 +03:00 |
|
Maximus
|
dec8bce3e3
|
exactly added Footer and Header to base layout
|
2022-08-19 17:17:59 +03:00 |
|
Denis Gorbunov
|
a314782acb
|
Merge pull request 'feature/add-featured-articles-section' (#87) from feature/add-featured-articles-section into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/87
|
2022-08-19 14:09:00 +00:00 |
|
decamel
|
79f015c5b0
|
Merge branch 'develop' into feature/add-featured-articles-section
|
2022-08-19 17:08:47 +03:00 |
|
Maximus
|
d38f76c38f
|
added Footer and Header to base layout
|
2022-08-19 17:08:02 +03:00 |
|
Denis Gorbunov
|
2dcdfda4bf
|
Merge pull request 'added possibility to turn off paddings of button' (#89) from fix/button-component into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/89
|
2022-08-19 14:07:37 +00:00 |
|
Denis Gorbunov
|
f3b757937b
|
Merge pull request 'feature/all-card-components' (#86) from feature/all-card-components into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/86
|
2022-08-19 14:07:06 +00:00 |
|
Denis Gorbunov
|
9abdabf66b
|
Merge pull request 'feature/header' (#85) from feature/header into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/85
|
2022-08-19 14:06:21 +00:00 |
|
Maximus
|
246aa98a73
|
added possibility to turn off paddings of button
|
2022-08-19 17:01:05 +03:00 |
|
Maximus
|
037fa4e92b
|
added featured categories section
|
2022-08-19 16:49:46 +03:00 |
|
Maximus
|
965892818e
|
added category card component
|
2022-08-19 13:29:05 +03:00 |
|
“Salar
|
4dd580c53f
|
Other unwanted files have been removed from header branch
|
2022-08-18 14:23:36 +03:00 |
|
“Salar
|
41726d47ac
|
Photos have been removed from the header branch
|
2022-08-18 14:13:15 +03:00 |
|
“Salar
|
dafbb444be
|
Header with the navbar files - without additional files
|
2022-08-18 14:03:08 +03:00 |
|
Maximus
|
977da92786
|
modified icons factory added new icons
|
2022-08-18 13:19:37 +03:00 |
|
“Salar
|
3671d3d5bc
|
Merge branch 'develop' into feature/header
|
2022-08-18 13:13:45 +03:00 |
|
Denis Gorbunov
|
eb7205025c
|
Merge pull request 'Dropdown has been modified - Button converted to Link' (#84) from fix/dropdown into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/84
|
2022-08-18 09:53:36 +00:00 |
|
Denis Gorbunov
|
13cbdfd46d
|
Merge pull request 'added RouterLink component setup route system' (#81) from feature/add-routes into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/81
|
2022-08-18 09:53:18 +00:00 |
|
Denis Gorbunov
|
68cfb61a1d
|
Merge pull request 'Create footer' (#83) from feature/footer into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/83
|
2022-08-18 09:53:09 +00:00 |
|
“Salar
|
e8f8777fa8
|
Unimportant comments have been removed
|
2022-08-18 12:22:41 +03:00 |
|
Maximus
|
f1cbc0bae7
|
Merge branch 'feature/add-routes' into feature/add-featured-articles-section
|
2022-08-18 12:01:56 +03:00 |
|
Maximus
|
f56ae41235
|
modified footer add router and default link
|
2022-08-18 11:39:50 +03:00 |
|