|
|
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 |
|
Denis Gorbunov
|
2d2e9905d3
|
Merge pull request 'Return of working develop' (#125) from fix/clean-develop into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/125
|
2022-09-08 08:52:51 +00:00 |
|
Maximus
|
956109f34a
|
updated imports, mock authors and articles request, renamed files
|
2022-09-08 11:44:02 +03:00 |
|
Maximus
|
d108e88c65
|
Merge branch 'develop' into fix/clean-develop
|
2022-09-08 11:22:23 +03:00 |
|
Maximus
|
f4e83e0cc8
|
updated link to universal component
|
2022-09-08 11:11:22 +03:00 |
|
decamel
|
4a44157efb
|
Main Section redundant dependencies
|
2022-09-07 16:40:36 +03:00 |
|
Denis Gorbunov
|
57b5c229a0
|
Merge pull request 'Search bar' (#123) from feature/search-bar into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/123
|
2022-09-07 13:37:07 +00:00 |
|
decamel
|
37bc27bbd6
|
Fix merge
|
2022-09-07 16:36:45 +03:00 |
|
decamel
|
ea783017a7
|
Dependencies fixes
|
2022-09-07 16:28:27 +03:00 |
|
Denis Gorbunov
|
aaecefb462
|
Merge pull request 'fix/select' (#120) from fix/select into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/120
|
2022-09-07 13:23:09 +00:00 |
|
“Salar
|
f49b9fee1a
|
Markdown component,package.json
|
2022-09-07 16:22:58 +03:00 |
|
Denis Gorbunov
|
b5b05cd7ae
|
Merge pull request 'feature/main-section' (#118) from feature/main-section into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/118
|
2022-09-07 13:22:53 +00:00 |
|
Denis Gorbunov
|
83ff35ce4f
|
Merge pull request 'added SearchBar for MainSection' (#117) from feature/search-bar into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/117
|
2022-09-07 13:21:18 +00:00 |
|
decamel
|
2581ca1d88
|
Merge branch 'develop' into feature/search-bar
|
2022-09-07 16:21:00 +03:00 |
|
Denis Gorbunov
|
94f7a3d851
|
Merge pull request 'Edited Heading component' (#115) from fix/heading into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/115
|
2022-09-07 13:19:13 +00:00 |
|
filantrop
|
f7a5aaf90e
|
fix props in component
|
2022-09-07 15:30:31 +03:00 |
|
Denis Gorbunov
|
8a64b5f0f7
|
Merge pull request 'Aspect ratio component' (#121) from feature/aspect-ratio-component into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/121
|
2022-09-07 12:25:35 +00:00 |
|
filantrop
|
f3ccb0523a
|
fix props in component
|
2022-09-07 14:58:40 +03:00 |
|
Denis Gorbunov
|
94d23d7b0b
|
Merge pull request 'feature/add-background-image' (#119) from feature/add-background-image into develop
Reviewed-on: http://85.143.176.51:3000/free-land/front-end/pulls/119
|
2022-09-06 09:11:26 +00:00 |
|
