Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: coding-circle/charades
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: coding-circle/charades
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: release
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 2 commits
  • 4 files changed
  • 3 contributors

Commits on Jan 24, 2021

  1. release (#108) 

    * adding number variant to TextInput component (#90)

* adding number variant to TextInput component

* restricting input in number fields using regex

* removed unneeded prop

* added variant prop to TextInput component to restrict input and set input mode within component

* added variant prop to TextInput component to restrict input and set input mode within component

* added input mode toggle on multiline view of TextInput component

* renamed inputType to inputMode

* Bump axios from 0.19.2 to 0.21.1 in /client (#93)

Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](axios/axios@v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* doc: update readme (#97)

* add timer documentation

* stuff

* time documentation

* update documentation

* code review fixes

* restyled checkbox component, added labelBefore variant (#96)

* restyled checkbox component, added labelBefore variant

* fixed logic for type coercion and placement of label

* waiting room text is removed when enough players join (#98)

* Bump socket.io from 2.3.0 to 2.4.0 in /server (#100)

Bumps [socket.io](https://github.com/socketio/socket.io) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.0/CHANGELOG.md)
- [Commits](socketio/socket.io@2.3.0...2.4.0)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* no longer offer renaming on play again (#99)

* fix socket issue (#103)

* Fix/server crash (#104)

* fix socket issue

* hopefully fix socket

* does this fix anything? (#107)

Co-authored-by: Diego Glusberg <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @jacten @chedgo @dependabot
    3 people authored Jan 24, 2021
    Configuration menu
    Copy the full SHA
    4792327 View commit details
    Browse the repository at this point in the history

  2. RELEASE - Everything back to normal?!?! (#111) 

    * adding number variant to TextInput component (#90)

* adding number variant to TextInput component

* restricting input in number fields using regex

* removed unneeded prop

* added variant prop to TextInput component to restrict input and set input mode within component

* added variant prop to TextInput component to restrict input and set input mode within component

* added input mode toggle on multiline view of TextInput component

* renamed inputType to inputMode

* Bump axios from 0.19.2 to 0.21.1 in /client (#93)

Bumps [axios](https://github.com/axios/axios) from 0.19.2 to 0.21.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.21.1/CHANGELOG.md)
- [Commits](axios/axios@v0.19.2...v0.21.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* doc: update readme (#97)

* add timer documentation

* stuff

* time documentation

* update documentation

* code review fixes

* restyled checkbox component, added labelBefore variant (#96)

* restyled checkbox component, added labelBefore variant

* fixed logic for type coercion and placement of label

* waiting room text is removed when enough players join (#98)

* Bump socket.io from 2.3.0 to 2.4.0 in /server (#100)

Bumps [socket.io](https://github.com/socketio/socket.io) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.0/CHANGELOG.md)
- [Commits](socketio/socket.io@2.3.0...2.4.0)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* no longer offer renaming on play again (#99)

* fix socket issue (#103)

* Fix/server crash (#104)

* fix socket issue

* hopefully fix socket

* does this fix anything? (#107)

* onlyhost (#110)

Co-authored-by: Diego Glusberg <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @jacten @chedgo @dependabot
    3 people authored Jan 24, 2021
    Configuration menu
    Copy the full SHA
    424352a View commit details
    Browse the repository at this point in the history
Loading