360 Commits

Author SHA1 Message Date
335218fdd9 Merge pull request 'fix/fetch-article-loop' (#178) from fix/fetch-article-loop into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/178
2022-11-12 14:11:20 +00:00
35170d4558 Merge pull request 'topic resolved' (#177) from fix/topic into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/177
2022-11-12 14:10:10 +00:00
5d28da2f0a Merge pull request 'The overlaping in the navbar resolved' (#176) from fix/navbar-overlap into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/176
2022-11-12 14:09:51 +00:00
f677bffc16 Merge pull request 'fix/burger-translation' (#175) from fix/burger-translation into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/175
2022-11-12 14:09:29 +00:00
69d09bb8a4 Remove unused imports 2022-11-11 18:58:32 +03:00
d3d1d9d1af Fetch article useCase added 2022-11-11 18:57:16 +03:00
salar.sali
355a9af985 topic resolved 2022-11-11 08:53:01 -05:00
salar.sali
a4a8116d32 The overlaping in the navbar resolved 2022-11-11 05:16:02 -05:00
salar.sali
a4ef589ca9 The translation in burger component resolved 2022-11-11 05:03:34 -05:00
8d3115d878 Updated style for MD code view 2022-11-09 17:35:25 +03:00
eb17ae6377 Merge pull request 'dockerfile-envs fixe, three bugs in select.tsx,typography/Link.tsx, and typography/RouterLink.tsx fixed' (#174) from bugfix/dockerfile-envs into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/174
2022-10-31 17:54:56 +00:00
moeidtopcoder
e9e9611f80 Merge branch 'develop' into master 2022-10-31 17:52:31 +00:00
moeidheidari
181a225eff dockerfile-envs fixe, three bugs in select.tsx,typography/Link.tsx, and typography/RouterLink.tsx fixed 2022-10-31 20:50:33 +03:00
0c054687ba Merge pull request 'the overlay in burger resolved' (#172) from fix/burger into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/172
2022-10-31 15:03:14 +00:00
3b147e50a1 Merge pull request 'resolve animation - resolve responsive' (#171) from fix/404-page into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/171
2022-10-31 15:02:49 +00:00
“Salar
e94514ed02 the overlay in burger resolved 2022-10-31 17:13:43 +03:00
“Salar
0032e51858 resolve animation - resolve responsive 2022-10-31 13:28:55 +03:00
8d6a9ab74c Dockerfile changes 2022-10-29 16:23:34 +03:00
07c4ae8cbd Fixed # on localization button 2022-10-26 16:00:45 +03:00
a782930d3d Replace mocks to real APIs 2022-10-21 18:12:15 +03:00
4c1877caa5 Merge pull request 'feature/markdown-styling' (#169) from feature/markdown-styling into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/169
2022-10-21 15:10:44 +00:00
e9324f6c14 Merge pull request 'classnames resolved' (#170) from fix/link into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/170
2022-10-21 15:10:28 +00:00
“Salar
9fcee44e0c classnames resolved 2022-10-21 18:03:17 +03:00
“Salar
9939b1c824 resolve headers, lists, link, paragraph.. 2022-10-21 17:57:55 +03:00
00deb05850 Merge branch 'develop' into feature/markdown-styling 2022-10-21 14:44:09 +03:00
b8849945b9 Merge pull request 'resolve no break space in the english localization' (#164) from fix/english-localization into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/164
2022-10-21 11:42:39 +00:00
08f5ee272b Merge pull request 'resolve no break space in the russian localization' (#165) from fix/russian-localization into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/165
2022-10-21 11:42:25 +00:00
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
f17d5f3079 Merge pull request 'resolve article translation' (#168) from fix/category-card into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/168
2022-10-21 11:41:33 +00:00
“Salar
4f9b33e5b9 resolve article translation 2022-10-21 14:21:26 +03:00
“Salar
753223c7a9 the translation of interaction buttons has been added 2022-10-21 14:07:48 +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
f965eaddbc content and filter were added 2022-10-21 13:26:23 +03:00
“Salar
2075426ff7 resolve no break space in the russian localization 2022-10-21 13:08:21 +03:00
“Salar
209507833e resolve no break space in the english localization 2022-10-21 13:00:25 +03:00
eff20ae459 Mocked correct article body 2022-10-21 12:08:29 +03:00
dcfe260f0e Merge pull request 'resolve english translation' (#161) from fix/english-localization into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/161
2022-10-20 10:02:12 +00:00
1af206c360 Merge pull request 'remove additional link' (#162) from fix/featured-articles-cards into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/162
2022-10-20 10:01:39 +00:00
“Salar
932d23befa remove additional link 2022-10-19 18:12:32 +03:00
“Salar
e52026cf86 resolve english translation 2022-10-19 17:46:33 +03:00
033a1f31ad Merge pull request 'resolve localization button in the header' (#160) from fix/header into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/160
2022-10-19 14:31:03 +00: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
1475d2db27 Merge pull request 'feature/add-filters' (#157) from feature/add-filters into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/157
2022-10-18 16:50:53 +00:00
1ba9dc28b5 Merge branch 'develop' into feature/add-filters 2022-10-18 19:50:13 +03:00