348 Commits

Author SHA1 Message Date
558a1fd5a7 Merge pull request 'bold style for the link resolved' (#154) from fix/featured-articles-cards into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/154
2022-10-17 15:14:59 +00:00
“Salar
bee5499816 bold style for the link resolved 2022-10-17 15:27:28 +03:00
8a2a7f0c53 Merge pull request 'added filter (beta version)' (#147) from feature/add-filters into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/147
2022-10-17 11:58:02 +00:00
15b9ed1f20 Merge branch 'develop' into feature/add-filters 2022-10-17 14:57:33 +03:00
cad2174bc5 Merge pull request 'English localization' (#152) from feature/english-localization into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/152
2022-10-17 11:56:01 +00:00
0c0a79d81d Merge pull request 'resolve padding of featured authors' (#149) from fix/featured-authors into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/149
2022-10-17 11:55:47 +00:00
df4b4d5c32 Merge pull request 'resolve not found page' (#148) from fix/404-page into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/148
2022-10-17 11:54:25 +00:00
92dddab82a Merge pull request 'the padding of featured articles cards has been resolved' (#150) from fix/featured-articles-cards into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/150
2022-10-17 11:53:58 +00:00
93cefd9ce3 Merge pull request 'resolve the margin of topic in the article info and article content pages' (#151) from fix/fetch-article into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/151
2022-10-17 11:53:40 +00:00
373d55a543 Merge pull request 'resolve the style of link' (#153) from fix/link into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/153
2022-10-17 11:52:57 +00:00
“Salar
8a075e926e resolve the style of link 2022-10-17 14:47:21 +03:00
“Salar
705ae6471f English localization 2022-10-17 14:15:13 +03:00
“Salar
64a6e6ab20 resolve the margin of topic in the article info and article content pages 2022-10-17 13:08:24 +03:00
“Salar
3cac7c7d04 the padding of featured articles cards has been resolved 2022-10-17 12:49:21 +03:00
“Salar
9154b1fb96 resolve padding of featured authors 2022-10-17 12:41:10 +03:00
“Salar
b390ae7a2e resolve not found page 2022-10-17 12:26:23 +03:00
filantrop
3c739247d2 added filter (beta version) 2022-10-17 12:17:14 +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