-
Notifications
You must be signed in to change notification settings - Fork 24
develop <- 2.2 #559
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.
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
Merged
Merged
develop <- 2.2 #559
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* build(deps): Upgrade yarn * build(deps): Upgrade gems * build(deps): Remove obsolete gems * v0.0.0 * build(deps): Update semantic-release * feat(events): add upcoming events page made a page to to view upcoming events in the management tools * feat(events): added page to make new events * added gem.lock * functionally complete calendar calendar has all the features needed need to make it less janky and possible add/remove features based on feedback * feat(events):page to view and make upcoming events created a page to view, make, and delete events. These events contain a title, description, location, owner(s), if it is a public and/or all day event and when it starts and stops. * fix: corrected formating errors and removed all day option made the code comply with houndci-bot requests and removed the all day bool for a event * fix: removed left over allDay refernce * fix: corrected houndci format suggestion * feat(event): added owners as a list of admins only implemented owners in a similar way to message recipients it will only allow for the selection of admin user as the owner(s) of a event. No owners it also allowed. * fix(events): refactored to work with latest 2.0 altered new manage sidebar to include events and fixed bug in event model testing * Fixed issue on desktop * feat(event): removed unneeded form options removed owner and public options from event creation form since they are no longer relevent for the intended purpose of this schedule * 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 * fix(events):added basic testing added the basic tests and renamed "end" to "finish" in event * Fixes test * fix(event): tweak test in attempt to get working * fix(event): got testing to work for some reason there is a flow for how redirects works for a controller. The index goes to the correct redirect but the create does not. * fix(event): fix hound errors and db password error accidently pushed local db password and corrected hound errors * fix(event): fix houndci error i missed * 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 * Adds Redis dump files to .gitignore * fix(event): fixed some of the pull request suggestions * Shorten form :) Signed-off-by: Peter Kos <pkos91@icloud.com> * fix(forms): change size of all forms without textbox changed the style of all forms that don't have a large text area or other aspects of the form that make a full length form perferable. With the exception of those forms all forms are now more narrow * fix(event): implemented pull request changes fixed cancel button and removed blue dot in list. decided to use simple form datetime picker instead of html datetime-local input because firefox does not support it. * 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> * event(fix): renamed events to schedule and reverted forms change event to schedule on the mangage sidebar and undid change to forms * 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 * fix(event): schedule now shows end time do to issues with "end" being a keyword in rails and what fullcalendar uses for events ending end time was previously not showing up * fix(event): fix houndci complaints * bundle install * fixed styling errors and added check for finish and start time * made finish time optional and made css fixes * fix houndci complaint * fix houndci complaint part 2 * removed finish time requirement in test Co-authored-by: Chris Baudouin, Jr <chrisbaudouinjr@icloud.com> Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu> Co-authored-by: Peter Kos <pkos91@icloud.com>
* side bar title now matches sidebar width * made sidebar narrower Co-authored-by: Peter Kos <pkos91@icloud.com>
* security: Adds rel="noopener" to all target="_blank" * feature: Adds additonal rel="noopener" Co-authored-by: Peter Kos <pkos91@icloud.com>
Co-authored-by: Peter Kos <pkos91@icloud.com>
Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu>
Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu>
* hide map on mobile and added button to show it * map button text now changes when map is open * fix houndci errors Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu>
* master <- develop (2.1.2) (#472) (#478) * fix(questionnaire): missing information now in correct place (#443) * fix(questionnair): missing information now in correct place it now displays the correct message "Please read & accept" instead of missing information and the notification is now in the correct place * Update app/assets/javascripts/validate.js * Revert "Update app/assets/javascripts/validate.js" This reverts commit bc54783. Signed-off-by: Peter Kos <pkos91@icloud.com> Co-authored-by: Peter Kos <pkos91@icloud.com> * fix: Fixes mobile agreements layout bug Signed-off-by: Peter Kos <pkos91@icloud.com> * feat: Removes semantic-release (#446) * refactor: Moves CI to develop branch (#449) Co-authored-by: Peter Kos <pkos91@icloud.com> * build: Merges 2.1.2 into develop * fix(hakiri): corrected unescaped model attribute * fix(hakiri): added html_safe to show proper output Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com> Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com> * fix: Shows questionnaires_closed_message on registration * feat: Allows agreements to be fully customizable (#465) * feat: Allows agreements to be fully customizable * fix: Fixes broken migrations * fix: Migrations misname issue * feat: Forces agreement links to open in new tab * Agreement validation detection fixed Signed-off-by: Peter Kos <pkos91@icloud.com> * refactor: Removes old input hint Co-authored-by: Peter Kos <pkos91@icloud.com> * fix(hakiri): fixed un-escaped regex for vcs link (#467) * fix(hakiri): corrected unescaped model attribute * fix(hakiri): added html_safe to show proper output * fix(hakiri): added \A \z to regex * fix(questionnaire): fixed hakiri error with vcs link regex * fix(questionnaire): fixed houndci commplaint Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu> * fix(hakiri): fix hakiri error with user input in html_safe (#475) Co-authored-by: Peter Kos <pkos91@icloud.com> Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com> Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu> Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com> Co-authored-by: Peter Kos <pkos91@icloud.com> Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com> Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com> * build(deps): Updates shoulda and shoulda-matchers * Update test/test_helper.rb Co-authored-by: Hound <hello@houndci.com> Co-authored-by: Peter Kos <pkos91@icloud.com> Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com> Co-authored-by: Jeremy Rudman <jeremyrudman@gmail.com> Co-authored-by: Hound <hello@houndci.com>
…#533) * refactor: Hides several dangling dietary restrictions in digital mode * fix: Hides dietary restrictions form questionnaire overview Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu>
* feat(schedule): add category field to schedule * moved event catorgory addition to a seprate migration * add category and location label for schedule display * made label more semantically nice * more code cleanup for events * Update app/assets/javascripts/events.js Co-authored-by: Peter Kos <pkos91@icloud.com> Co-authored-by: Chris Baudouin, Jr <cjb5326@rit.edu> Co-authored-by: Peter Kos <pkos91@icloud.com>
* build(deps): Updates Sidekiq to 6.1.2 * build: Updates Sidekiq to 6.1.3 * build: Updates sidekiq-cron
…o locales (#460) * refactor: Removes MLH branding from Stats page * fix: Updates stats test paths * refactor: Renames several stats tables Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
* cors * Do it more properly * hound * cors allowed only on non-manage routes * Resource path does not support regex; even tonly * only allow on gets lol Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
* feat(questionnaire): add country field for questionnaire the application now asks for a country to due to MLH requirements * fix houndci complaints * Update app/views/application/_missing_country_notice.html.haml Co-authored-by: Chris Baudouin, Jr. <cjb5326@rit.edu> * added custom error message for missing country for RSVP * fix houndci complaints * Update _missing_country_notice.html.haml Co-authored-by: Chris Baudouin, Jr. <cjb5326@rit.edu> Co-authored-by: Peter Kos <pkos91@icloud.com>
* completed questionnaire page on docs * Update questionnaires.md * Fix various typos Co-authored-by: Peter Kos <pkos91@icloud.com> Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com>
Co-authored-by: JeremyRudman <38338616+JeremyRudman@users.noreply.github.com> Co-authored-by: Peter Kos <pkos91@icloud.com>
JeremyRudman
approved these changes
Feb 3, 2021
Contributor
JeremyRudman
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good code 👍
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.