#68 fix/missing-functionalities (#67)

Merged
tyler merged 1 commits from master into fix/missing-functionalities 4 years ago
tyler commented 4 years ago

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

fix: unnecessary api calls and add missing functionalities on profile page

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

fix: login

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

fix: login and sign up stuff

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

fix: page reloading stuff

fix: login stuff

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

fix: sign up and payment check stuff

fix: launch bubble screen

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

fix: refreshing issue

feat: implement devices screen

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

feat: implement new layout

Merge branch ‘master’ of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities

feat: implement new layout

fix: header

fix: showing error on add ssh modal

fix: login by enter key

Co-authored-by: Tyler everdev0923@gmail.com
Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/67

Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: unnecessary api calls and add missing functionalities on profile page Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: login Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: login and sign up stuff Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: page reloading stuff fix: login stuff Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: sign up and payment check stuff fix: launch bubble screen Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities fix: refreshing issue feat: implement devices screen Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities feat: implement new layout Merge branch 'master' of git.bubblev.org:bubblev/bubble-web into fix/missing-functionalities feat: implement new layout fix: header fix: showing error on add ssh modal fix: login by enter key Co-authored-by: Tyler <everdev0923@gmail.com> Reviewed-on: https://git.bubblev.org/bubblev/bubble-web/pulls/67
jonathan commented 4 years ago
Owner

@tyler There are merge conflicts -- can you resolve these?

@tyler There are merge conflicts -- can you resolve these?
tyler closed this pull request 4 years ago
The pull request has been merged as df60fbd5a8.
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

Loading…
There is no content yet.