273 Commits

Author SHA1 Message Date
35aa957b35 Merge pull request 'content hardcoded resolved' (#166) from fix/filter into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/166
2022-10-21 11:42:10 +00:00
472e8c2ea5 Merge pull request 'the translation in the main section has been resolved' (#167) from fix/main-section into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/167
2022-10-21 11:41:50 +00:00
“Salar
4f9b33e5b9 resolve article translation 2022-10-21 14:21:26 +03:00
“Salar
28cc9b1a71 the translation in the main section has been resolved 2022-10-21 13:46:47 +03:00
“Salar
47472868e1 content hardcoded resolved 2022-10-21 13:29:08 +03:00
“Salar
932d23befa remove additional link 2022-10-19 18:12:32 +03:00
9c79f449c5 Manually merge 2022-10-19 17:30:50 +03:00
24652d0908 Merge branch 'develop' into fix/header 2022-10-19 17:29:26 +03:00
944baced6c Merge pull request 'localization button feature' (#159) from feature/localization-button into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/159
2022-10-19 14:24:01 +00:00
“Salar
01a873477b resolve localization button in the header 2022-10-19 16:58:19 +03:00
“Salar
d1b17592c3 localization button feature 2022-10-19 16:52:46 +03:00
1ba9dc28b5 Merge branch 'develop' into feature/add-filters 2022-10-18 19:50:13 +03:00
1817946fe6 Merge pull request 'changed query to our api' (#156) from fix/search-request into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/156
2022-10-18 16:49:16 +00:00
maximus
31706ca4e8 fixed logo to actual 2022-10-18 19:26:29 +03:00
filantrop
969749c0c0 Merge branch 'feature/add-filters' of http://85.143.176.51:3000/free-land/front-end into feature/add-filters 2022-10-18 17:50:31 +03:00
filantrop
5667f30a92 add translate 2022-10-18 17:34:10 +03:00
maximus
d77c1c6388 fixed article endpoint 2022-10-18 17:13:46 +03:00
maximus
bd6fbbebfd changed query to our api 2022-10-18 16:51:27 +03:00
filantrop
2ffce71e74 fix styles 2022-10-18 14:59:38 +03:00
maximus
c63c19e1c7 finished styling, added filters to main page 2022-10-18 12:06:21 +03:00
maximus
b5443aa033 Merge branch 'develop' into fix/article-interaction-buttons 2022-10-18 11:07:40 +03:00
maximus
18d02945f3 add functionality to share button and localize it 2022-10-18 09:40:34 +03:00
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
15b9ed1f20 Merge branch 'develop' into feature/add-filters 2022-10-17 14:57:33 +03: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
“Salar
8a075e926e resolve the style of link 2022-10-17 14:47:21 +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
dcda165488 Sticly footer to the bottom of the page 2022-10-14 15:03:37 +03: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
4479300027 Fixed article entity bug 2022-10-12 19:50:52 +03: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
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
“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
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