282 Commits

Author SHA1 Message Date
“Salar
705ae6471f English localization 2022-10-17 14:15:13 +03:00
904730dfd9 Merge pull request 'Sticly footer to the bottom of the page' (#146) from fix/footer-to-bottom into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/146
2022-10-14 12:04:15 +00:00
dcda165488 Sticly footer to the bottom of the page 2022-10-14 15:03:37 +03:00
49d15e538b Merge pull request 'feature/russian-localization' (#145) from feature/russian-localization into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/145
2022-10-14 11:21:14 +00:00
maximus
da389cc337 added localiazation 2022-10-14 14:12:24 +03:00
3f9a76815e Created navbar ru localization 2022-10-14 10:29:23 +03:00
c99e9217f1 Merge pull request 'Fixed article entity bug' (#144) from fix/resolve-merge-issues into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/144
2022-10-12 16:52:58 +00:00
4479300027 Fixed article entity bug 2022-10-12 19:50:52 +03:00
e97d3abe96 Merge pull request 'new line bug has been fixed' (#143) from fix/markdown into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/143
2022-10-12 16:12:32 +00:00
“Salar
eff1a2a04f new line bug has been fixed 2022-10-12 19:04:52 +03:00
81faa7121e Manualy merge from fix/article-interaction-buttons
Resolve interaction button link issue
2022-10-12 17:09:11 +03:00
bbe6bcca51 Merge pull request 'feature/complete-develop-merge' (#142) from feature/complete-develop-merge into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/142
2022-10-12 14:03:30 +00:00
c161606e08 Merge pull request 'article slice' (#140) from feature/article-slice into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/140
2022-10-12 14:03:08 +00:00
5550b7c241 Merge pull request 'Fetch an articl by its id, Fetch the body of the articl(content)' (#139) from feature/fetch-article into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/139
2022-10-12 13:59:49 +00:00
maximus
86073d5718 set up makefile 2022-10-12 16:59:24 +03:00
85f227f7d9 Resolve entrypoint file bug 2022-10-12 16:44:41 +03:00
“Salar
779b091bd5 article slice 2022-10-12 16:34:44 +03:00
“Salar
a26faeeb02 Fetch an articl by its id, Fetch the body of the articl(content) 2022-10-12 16:23:48 +03:00
50a42955d6 Merge pull request '(feature/complete-develop-merge) Resolving multiple merges' (#138) from feature/complete-develop-merge into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/138
2022-10-12 12:15:01 +00:00
9a3e545cf0 Resolving issues 2022-10-12 15:13:08 +03:00
87ad19fa1a Merge branch 'feature/search-results-page' into feature/complete-develop-merge 2022-10-12 14:52:55 +03:00
1d5eb72826 Merge branch 'fix/article-interaction-buttons' into feature/complete-develop-merge 2022-10-12 14:46:28 +03:00
011f1564a0 Merge branch 'fix/article-keywords' into feature/complete-develop-merge 2022-10-12 14:45:52 +03:00
89146993c7 Merge branch 'fix/logo' into feature/complete-develop-merge 2022-10-12 14:45:44 +03:00
a9895cc6dd Merge branch 'fix/base-layout' into feature/complete-develop-merge 2022-10-12 14:42:46 +03:00
“Salar
5afd4ced4d Link component has been added to the icon to referense to the home page 2022-10-12 11:50:17 +03:00
“Salar
f09cddff75 The style of the children has been modified 2022-10-12 11:43:49 +03:00
maximus
8db96d108f return markdown component 2022-10-11 14:39:45 +03:00
maximus
a7534b589f added search results page, chanhgen search bar, changed article component 2022-10-11 11:53:20 +03:00
“Salar
bd1771e234 The style of the logo has been modified 2022-10-10 20:02:17 +03:00
“Salar
6cdd4ed730 The border color of the keyword has been modified according to our design 2022-10-10 18:32:47 +03:00
“Salar
12043e9123 The distance between the buttons has been increased 2022-10-10 18:13:22 +03:00
maximus
5e46d6a098 ended search 2022-10-05 15:49:07 +03:00
maximus
18cc0084af resloving 2022-09-28 17:28:06 +03:00
Denis Gorbunov
43a73bc538 Merge pull request 'Fixed props in link component' (#130) from fix/link-component into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/130
2022-09-22 09:55:19 +00:00
Maximus
4c90885d92 fixed props in link component 2022-09-09 18:57:43 +03:00
Denis Gorbunov
f3c6b65b57 Merge pull request 'fixed style again' (#129) from fix/MainSection into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/129
2022-09-09 09:14:57 +00:00
filantrop
ae0f36c21e fixed style again 2022-09-08 16:38:04 +03:00
Denis Gorbunov
0e3f08dea9 Merge pull request 'Removed scroll locking' (#128) from fix/bottom-sheet-modal into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/128
2022-09-08 13:18:36 +00:00
decamel
10b501869a Merge branch 'develop' into fix/bottom-sheet-modal 2022-09-08 16:18:26 +03:00
Denis Gorbunov
6e71403869 Merge pull request 'Markdown component,package.json' (#122) from feature/markdown into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/122
2022-09-08 13:17:55 +00:00
decamel
ffb5a428a0 Merge branch 'develop' into feature/markdown 2022-09-08 16:17:42 +03:00
Denis Gorbunov
0411fed55e Merge pull request 'fix styles' (#127) from fix/MainSection into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/127
2022-09-08 13:16:05 +00:00
Denis Gorbunov
8aaff6ab7b Merge pull request 'fixed errors' (#126) from fix/clean-develop into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/126
2022-09-08 13:15:40 +00:00
Maximus
a047f1fd91 removed scroll lock from modal 2022-09-08 15:59:14 +03:00
Maximus
449b05c1a0 Merge branch 'fix/clean-develop' into fix/bottom-sheet-modal 2022-09-08 14:12:37 +03:00
filantrop
ccadb58979 fix styles 2022-09-08 13:40:54 +03:00
Maximus
00ee5788a8 fixed errors 2022-09-08 13:30:30 +03:00
Denis Gorbunov
f5251fd04b Merge pull request 'Updated link to universal component' (#124) from fix/link-update into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/124
2022-09-08 09:14:36 +00:00
Maximus
0931fa8fe5 fixed props 2022-09-08 12:13:20 +03:00