Commit Graph

  • e9e9611f80 Merge branch 'develop' into master master moeidtopcoder 2022-10-31 17:52:31 +00:00
  • 0c054687ba Merge pull request 'the overlay in burger resolved' (#172) from fix/burger into develop danysmall 2022-10-31 15:03:14 +00:00
  • 3b147e50a1 Merge pull request 'resolve animation - resolve responsive' (#171) from fix/404-page into develop danysmall 2022-10-31 15:02:49 +00:00
  • e94514ed02 the overlay in burger resolved “Salar 2022-10-31 17:13:43 +03:00
  • 0032e51858 resolve animation - resolve responsive “Salar 2022-10-31 13:28:55 +03:00
  • 8d6a9ab74c Dockerfile changes danysmall 2022-10-29 16:23:34 +03:00
  • 07c4ae8cbd Fixed # on localization button danysmall 2022-10-26 16:00:45 +03:00
  • a782930d3d Replace mocks to real APIs danysmall 2022-10-21 18:12:15 +03:00
  • 4c1877caa5 Merge pull request 'feature/markdown-styling' (#169) from feature/markdown-styling into develop danysmall 2022-10-21 15:10:44 +00:00
  • e9324f6c14 Merge pull request 'classnames resolved' (#170) from fix/link into develop danysmall 2022-10-21 15:10:28 +00:00
  • 9fcee44e0c classnames resolved “Salar 2022-10-21 18:03:17 +03:00
  • 9939b1c824 resolve headers, lists, link, paragraph.. “Salar 2022-10-21 17:57:55 +03:00
  • 00deb05850 Merge branch 'develop' into feature/markdown-styling danysmall 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 danysmall 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 danysmall 2022-10-21 11:42:25 +00:00
  • 35aa957b35 Merge pull request 'content hardcoded resolved' (#166) from fix/filter into develop danysmall 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 danysmall 2022-10-21 11:41:50 +00:00
  • f17d5f3079 Merge pull request 'resolve article translation' (#168) from fix/category-card into develop danysmall 2022-10-21 11:41:33 +00:00
  • 4f9b33e5b9 resolve article translation “Salar 2022-10-21 14:21:26 +03:00
  • 753223c7a9 the translation of interaction buttons has been added “Salar 2022-10-21 14:07:48 +03:00
  • 28cc9b1a71 the translation in the main section has been resolved “Salar 2022-10-21 13:46:47 +03:00
  • 47472868e1 content hardcoded resolved “Salar 2022-10-21 13:29:08 +03:00
  • f965eaddbc content and filter were added “Salar 2022-10-21 13:26:23 +03:00
  • 2075426ff7 resolve no break space in the russian localization “Salar 2022-10-21 13:08:21 +03:00
  • 209507833e resolve no break space in the english localization “Salar 2022-10-21 13:00:25 +03:00
  • eff20ae459 Mocked correct article body danysmall 2022-10-21 12:08:29 +03:00
  • dcfe260f0e Merge pull request 'resolve english translation' (#161) from fix/english-localization into develop danysmall 2022-10-20 10:02:12 +00:00
  • 1af206c360 Merge pull request 'remove additional link' (#162) from fix/featured-articles-cards into develop danysmall 2022-10-20 10:01:39 +00:00
  • 932d23befa remove additional link “Salar 2022-10-19 18:12:32 +03:00
  • e52026cf86 resolve english translation “Salar 2022-10-19 17:46:33 +03:00
  • 033a1f31ad Merge pull request 'resolve localization button in the header' (#160) from fix/header into develop danysmall 2022-10-19 14:31:03 +00:00
  • 9c79f449c5 Manually merge danysmall 2022-10-19 17:30:50 +03:00
  • 24652d0908 Merge branch 'develop' into fix/header danysmall 2022-10-19 17:29:26 +03:00
  • 944baced6c Merge pull request 'localization button feature' (#159) from feature/localization-button into develop danysmall 2022-10-19 14:24:01 +00:00
  • 01a873477b resolve localization button in the header “Salar 2022-10-19 16:58:19 +03:00
  • d1b17592c3 localization button feature “Salar 2022-10-19 16:52:46 +03:00
  • 1475d2db27 Merge pull request 'feature/add-filters' (#157) from feature/add-filters into develop danysmall 2022-10-18 16:50:53 +00:00
  • 1ba9dc28b5 Merge branch 'develop' into feature/add-filters danysmall 2022-10-18 19:50:13 +03:00
  • 1817946fe6 Merge pull request 'changed query to our api' (#156) from fix/search-request into develop danysmall 2022-10-18 16:49:16 +00:00
  • de5b6ad60c Merge pull request 'fixed logo to actual' (#158) from fix/scipaper-logo into develop danysmall 2022-10-18 16:48:47 +00:00
  • 31706ca4e8 fixed logo to actual maximus 2022-10-18 19:26:29 +03:00
  • 969749c0c0 Merge branch 'feature/add-filters' of http://85.143.176.51:3000/free-land/front-end into feature/add-filters filantrop 2022-10-18 17:50:31 +03:00
  • 5667f30a92 add translate filantrop 2022-10-18 17:34:10 +03:00
  • d77c1c6388 fixed article endpoint maximus 2022-10-18 17:13:46 +03:00
  • bd6fbbebfd changed query to our api maximus 2022-10-18 16:51:27 +03:00
  • 2ffce71e74 fix styles filantrop 2022-10-18 14:59:38 +03:00
  • 35900bec5d Merge pull request 'fix/article-interaction-buttons' (#155) from fix/article-interaction-buttons into develop danysmall 2022-10-18 10:43:30 +00:00
  • c63c19e1c7 finished styling, added filters to main page maximus 2022-10-18 12:06:21 +03:00
  • b5443aa033 Merge branch 'develop' into fix/article-interaction-buttons maximus 2022-10-18 11:07:40 +03:00
  • 18d02945f3 add functionality to share button and localize it maximus 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 danysmall 2022-10-17 15:14:59 +00:00
  • bee5499816 bold style for the link resolved “Salar 2022-10-17 15:27:28 +03:00
  • 8a2a7f0c53 Merge pull request 'added filter (beta version)' (#147) from feature/add-filters into develop danysmall 2022-10-17 11:58:02 +00:00
  • 15b9ed1f20 Merge branch 'develop' into feature/add-filters danysmall 2022-10-17 14:57:33 +03:00
  • cad2174bc5 Merge pull request 'English localization' (#152) from feature/english-localization into develop danysmall 2022-10-17 11:56:01 +00:00
  • 0c0a79d81d Merge pull request 'resolve padding of featured authors' (#149) from fix/featured-authors into develop danysmall 2022-10-17 11:55:47 +00:00
  • df4b4d5c32 Merge pull request 'resolve not found page' (#148) from fix/404-page into develop danysmall 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 danysmall 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 danysmall 2022-10-17 11:53:40 +00:00
  • 373d55a543 Merge pull request 'resolve the style of link' (#153) from fix/link into develop danysmall 2022-10-17 11:52:57 +00:00
  • 8a075e926e resolve the style of link “Salar 2022-10-17 14:47:21 +03:00
  • 705ae6471f English localization “Salar 2022-10-17 14:15:13 +03:00
  • 64a6e6ab20 resolve the margin of topic in the article info and article content pages “Salar 2022-10-17 13:08:24 +03:00
  • 3cac7c7d04 the padding of featured articles cards has been resolved “Salar 2022-10-17 12:49:21 +03:00
  • 9154b1fb96 resolve padding of featured authors “Salar 2022-10-17 12:41:10 +03:00
  • b390ae7a2e resolve not found page “Salar 2022-10-17 12:26:23 +03:00
  • 3c739247d2 added filter (beta version) filantrop 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 danysmall 2022-10-14 12:04:15 +00:00
  • dcda165488 Sticly footer to the bottom of the page danysmall 2022-10-14 15:03:37 +03:00
  • 49d15e538b Merge pull request 'feature/russian-localization' (#145) from feature/russian-localization into develop danysmall 2022-10-14 11:21:14 +00:00
  • da389cc337 added localiazation maximus 2022-10-14 14:12:24 +03:00
  • 3f9a76815e Created navbar ru localization danysmall 2022-10-14 10:29:23 +03:00
  • c99e9217f1 Merge pull request 'Fixed article entity bug' (#144) from fix/resolve-merge-issues into develop danysmall 2022-10-12 16:52:58 +00:00
  • 4479300027 Fixed article entity bug danysmall 2022-10-12 19:50:52 +03:00
  • e97d3abe96 Merge pull request 'new line bug has been fixed' (#143) from fix/markdown into develop danysmall 2022-10-12 16:12:32 +00:00
  • eff1a2a04f new line bug has been fixed “Salar 2022-10-12 19:04:52 +03:00
  • 81faa7121e Manualy merge from fix/article-interaction-buttons danysmall 2022-10-12 17:09:11 +03:00
  • bbe6bcca51 Merge pull request 'feature/complete-develop-merge' (#142) from feature/complete-develop-merge into develop danysmall 2022-10-12 14:03:30 +00:00
  • c161606e08 Merge pull request 'article slice' (#140) from feature/article-slice into develop danysmall 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 danysmall 2022-10-12 13:59:49 +00:00
  • 86073d5718 set up makefile maximus 2022-10-12 16:59:24 +03:00
  • 85f227f7d9 Resolve entrypoint file bug danysmall 2022-10-12 16:44:41 +03:00
  • 779b091bd5 article slice “Salar 2022-10-12 16:34:44 +03:00
  • a26faeeb02 Fetch an articl by its id, Fetch the body of the articl(content) “Salar 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 danysmall 2022-10-12 12:15:01 +00:00
  • 9a3e545cf0 Resolving issues danysmall 2022-10-12 15:13:08 +03:00
  • 87ad19fa1a Merge branch 'feature/search-results-page' into feature/complete-develop-merge danysmall 2022-10-12 14:52:55 +03:00
  • 1d5eb72826 Merge branch 'fix/article-interaction-buttons' into feature/complete-develop-merge danysmall 2022-10-12 14:46:28 +03:00
  • 011f1564a0 Merge branch 'fix/article-keywords' into feature/complete-develop-merge danysmall 2022-10-12 14:45:52 +03:00
  • 89146993c7 Merge branch 'fix/logo' into feature/complete-develop-merge danysmall 2022-10-12 14:45:44 +03:00
  • a9895cc6dd Merge branch 'fix/base-layout' into feature/complete-develop-merge danysmall 2022-10-12 14:42:46 +03:00
  • 5afd4ced4d Link component has been added to the icon to referense to the home page “Salar 2022-10-12 11:50:17 +03:00
  • f09cddff75 The style of the children has been modified “Salar 2022-10-12 11:43:49 +03:00
  • 8db96d108f return markdown component maximus 2022-10-11 14:39:45 +03:00
  • a7534b589f added search results page, chanhgen search bar, changed article component maximus 2022-10-11 11:53:20 +03:00
  • bd1771e234 The style of the logo has been modified “Salar 2022-10-10 20:02:17 +03:00
  • 6cdd4ed730 The border color of the keyword has been modified according to our design “Salar 2022-10-10 18:32:47 +03:00
  • 12043e9123 The distance between the buttons has been increased “Salar 2022-10-10 18:13:22 +03:00
  • 5e46d6a098 ended search maximus 2022-10-05 15:49:07 +03:00
  • 18cc0084af resloving maximus 2022-09-28 17:28:06 +03:00