8000 build: Back-merges master into 2.1 by cbaudouinjr · Pull Request #435 · codeRIT/hackathon-manager · GitHub
[go: up one dir, main page]

Skip to content

Conversation

@cbaudouinjr
Copy link
Member

#closes #433

dependabot bot and others added 3 commits November 18, 2020 22:05
@cbaudouinjr cbaudouinjr requested a review from peterkos December 11, 2020 07:39
@cbaudouinjr cbaudouinjr linked an issue Dec 11, 2020 that may be closed by this pull request
@peterkos peterkos merged commit a20d912 into 2.1 Dec 11, 2020
@peterkos peterkos deleted the hm-433 branch December 11, 2020 09:04
cbaudouinjr added a commit that referenced this pull request Dec 11, 2020
* Fixed issue on desktop

* Map overflow scroll

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Fix scroll issue

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Fixed toggle button; fits screen, sidebar width

Sidebar width is better
Toggle button fills height of navbar

Signed-off-by: Peter Kos <pkos91@icloud.com>

* fix: Allows optional assets to be unset

* Fixes test

* feat: Redesigns OAuth2 portal (#404)

* feat: Redesigns OAuth2 portal

* fix: Some Hound issues

* Changes application verbiage

* Fixes ID issue

* Fixes table link and sign out button

* Peter's wishes

* fix: Fixes MyMLH branding in config (#412)

* feat(settings): Simplifies Config (#409)

* feat(settings): Simplifies Config

* Resolves Hound issues

* Update app/views/manage/configs/index.html.haml

Co-authored-by: Peter Kos <pkos91@icloud.com>

* design: Increases the font-weight and reorganizes the page

* fix: Hound issues

Co-authored-by: Peter Kos <pkos91@icloud.com>

* feat: Adds support for digital-only hackathons (#395)

* feat: Adds support for digital-only hackathons

* fix: Provides clarity for what is removed from digital hackathons

Co-authored-by: Peter Kos <pkos91@icloud.com>

* feat: Adds GitHub Action for releases (#426)

* feat: Adds GitHub Action CI testing (#423)

* feat: Adds GitHub Action CI testing

* fix: Adds sudo

* refactor: Changes naming

* Removes travis.yml

* docs: Adds ruby version comment

* feat: Adds Legal Agreements object for dynamic agreements (#429)

* feat: Adds Legal Agreements object for dynamic agreements

* fix: Fixes several bugs with agreement error checking

* fix: Fixes several Hound issues

* fix: Fixes some more Hound issues

* Update app/views/application/_unaccepted_agreements_notice.html.haml

Co-authored-by: Peter Kos <pkos91@icloud.com>

* fix: Fixes Peter's requests

* Fix agreement checkbox wrap with small names

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Fix straggling merge conflict error

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Removed agreements card

Signed-off-by: Peter Kos <pkos91@icloud.com>

* Force validation for agreement on questionnaire pg

FRONTEND

Signed-off-by: Peter Kos <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>

* refactor: Changes hackathon_manager to HackathonManager (#417)

Co-authored-by: Peter Kos <pkos91@icloud.com>

* feat: Adds GitLab VCS URL support (#415)

* feat: Adds GitLab VCS URL support

* fix: Corrects Bitbucket capitalization

* Update schema.rb

Removes events

* Update test/models/questionnaire_test.rb

Co-authored-by: Peter Kos <pkos91@icloud.com>

* Update test/models/questionnaire_test.rb

Co-authored-by: Peter Kos <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>

* fix: Fixes pluralization of "Callback URL" (#421)

* fix: Fixes pluralization of "Callback URL"

* refactor: Adds "(s)" to Callback URLs

Co-authored-by: Peter Kos <pkos91@icloud.com>

* refactor: Removes legal section from config (#440)

* refactor: Removes legal section from config

* refactor: Removes agreement asset from locals

* Removes additional PDF asset messages

Co-authored-by: Peter Kos <pkos91@icloud.com>

* fix(map): changed map overflow from scroll to auto (#428)

changed the map div from overflow scroll to overflow auto so that the
scroll bars do not show up when the map is large enough to not need them

Co-authored-by: Peter Kos <pkos91@icloud.com>

* build(deps-dev): Bump semantic-release from 17.2.1 to 17.2.3 (#435)

Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 17.2.1 to 17.2.3.
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](semantic-release/semantic-release@v17.2.1...v17.2.3)

Signed-off-by: dependabot[bot] <support@github.com>

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

Co-authored-by: Peter Kos <pkos91@icloud.com>
Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free t 6E92 o join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Back-merge Master into 2.1 for release

3 participants

0