Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #121

Open
wants to merge 131 commits into
base: main
Choose a base branch
from
Open

Develop #121

wants to merge 131 commits into from

Conversation

alix1982
Copy link
Contributor

No description provided.

AnaSerg and others added 30 commits July 24, 2023 23:11
@AnaSerg
feat: add routine slider, fix events in main page, start to make reco…
257f963 
…mposition
@AnaSerg
feat: make pie chart
217e370
@Segodnya
fix: landing page v3 with widescreen support and FAQ
4f89475
@Segodnya
Merge pull request #68 from moodbeat/fix/landing-v3-widescreen
acbe640 
fix: landing page v3 with widescreen support and FAQ
@AnaSerg
feat: make periodpicker
51772eb
@AnaSerg
refactor: change path for useful
54b2587
@AnaSerg
feat: create Report component
1b6d672
@AnaSerg
refactor: add components to main component
98b3e14
@AnaSerg
feat: resolve conflicts in main
4f39df7
@AnaSerg
fix: resolve conflicts
687c4e4
@AnaSerg
Merge pull request #70 from AnaSerg/develop
8bc18a9 
Develop
@AnaSerg
styles: change hover and active styles form mood buttons
946ebef
@AnaSerg
fix: make mood buttons invisible when impossible to use it
0cb1d57
@AnaSerg
Merge pull request #71 from AnaSerg/develop
de9e20c 
Develop
@Segodnya
fix: notification count update in real-time
647cf55
@Segodnya
resolve conflicts in PeriodPicker.module.scss
2c25251
@Segodnya
resolve conflicts in PeriodPicker.module.scss
1b7eea0
@Segodnya
Merge pull request #72 from moodbeat/fix/notification-count-65
2cc6b8b 
fix: notification count update in real-time
@AnaSerg
styles: change styles for Test banner
9e759ff
@AnaSerg
feat: add tooltip for routine slider
ea652ce
@Segodnya
feat: notification popup in Header, issue #66
1a9bd65
@Segodnya
Merge pull request #73 from moodbeat/fix/notification-popup-66
1110bad 
feat: notification popup in Header, issue #66
@AnaSerg
styles: change image for report component
8fe4b5e
@AnaSerg
make custom messages for tooltip
33fda6e
@alix1982
fix_bug_err-build
d09fea2
@alix1982
fix_conflict
2339538
@alix1982
fix_bug_build
b9b859c
@alix1982
Merge pull request #76 from moodbeat/feat/activity
f480db6 
Feat/activity
@alix1982
remove_Articles_MyTeam
0ce24c3
@alix1982
fix_bug_build
0015a25
AnaSerg and others added 29 commits August 2, 2023 15:10
@AnaSerg
fix: resolve conflict in Records and MoodGraph
2c38f27
@AnaSerg
fix: fix paths in charts, changr transition in event cards
7261e63
@AnaSerg
fix: change eventpopup transition to display
faeb2da
@AnaSerg
fix: fix bugs
4ed4ee0
@AnaSerg
fix: add dependency to useEffect in Balance wheel
6c959c8
@RomanRiyanov
fix: fix days error moodgraph
fa5cc8b
@RomanRiyanov
fix: fix error with months moodgraph
3fd6d56
@AnaSerg
Merge pull request #105 from AnaSerg/feature/charts_and_main
b100c13 
Feature/charts and main
@AnaSerg
Merge branch 'develop' into fix/juneerror
2e49e9d
@Segodnya
feat: Добавил кнопку возврата к началу страницы, правки после тестов …
e3a4470 
…0208
@Segodnya
fix: Обновил цвета кнопки возвращения к началу страницы
ecf4860
@alix1982
fix_bug_card_MyTeam
829ffca
@alix1982
fix_conflict
5fbf61a
@alix1982
fix_conflict
38dd5e2
@AnaSerg
Merge pull request #106 from moodbeat/fix/juneerror
748e24a 
Fix/juneerror
@AnaSerg
Merge pull request #108 from moodbeat/feat/backtotop-button-landing
dbb3c31 
feat: Добавил кнопку возврата к началу страницы, правки после тестов
@AnaSerg
Merge pull request #109 from moodbeat/feat/activity
dbf5e82 
fix_bug_card_MyTeam
@AnaSerg
fix: fix MoodGraph in profile page. Resolve #51
06b08c3
@AnaSerg
fix: add word-wrap to About Section in profile page. Resolve #50
894d142
@AnaSerg
fix: change regex for AddMeetingForm. Resolve #44
4cd5252
@AnaSerg
Merge pull request #110 from AnaSerg/i_love_to_fix_bugs
dd616c1 
I love to fix bugs
@Segodnya
hotfix: add swiper slides gap (#111)
a1d94ee 
* hotfix: add swiper slides gap
* hotfix: delete empty line to rerun netlify deploy
@Segodnya
fix: textarea char counter for landing page (#113)
93db195 
* fix: textarea char counter for landing page

* fix: change char counter font color

* fix: char counter paddings

* fix: delete link underline for EULA
@Segodnya
hotfix: feedback form newline (#114)
2960590 
* hotfix: feedback form newline

* hotfix: add at, hash, dollar, percent signs

* hotfix: add asterisk, brackets
@AnaSerg
fix: fix balance wheel
b176488
@AnaSerg
Merge pull request #115 from AnaSerg/develop
3a57359 
fix: fix balance wheel
@alix1982
fix_readme (#118)
cd9e098
@Segodnya
refactor: apiConfig.js for api endpoint, edit readme, remove extra co…
55591f7 
…nsole.logs
@AleksandrUsolcev
Merge pull request #120 from moodbeat/refactor/api-config
97ea0c6 
refactor: apiConfig.js for api endpoint ...
@netlify
Copy link

netlify bot commented Oct 18, 2023 •
edited
Loading

✅ Deploy Preview for moodbeat-dev ready!

Name Link
🔨 Latest commit 97ea0c6
🔍 Latest deploy log https://app.netlify.com/sites/moodbeat-dev/deploys/65301ec07b40ba000872b95d
😎 Deploy Preview https://deploy-preview-121--moodbeat-dev.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alix1982 @AnaSerg @Segodnya @ArtemKhudiakov @RomanRiyanov @AleksandrUsolcev