Skip to content

merge develop into master#82

Open
kushal2011 wants to merge 177 commits into
masterfrom
develop
Open

merge develop into master#82
kushal2011 wants to merge 177 commits into
masterfrom
develop

Conversation

@kushal2011

@kushal2011 kushal2011 commented Oct 2, 2019

Copy link
Copy Markdown
Collaborator

this pr contains the working app demo with following functionalities

  • user can login to app via meetup
    -upcomming events are displayed to user
    -button to scan qr code for registration and swag distribution is showed only to host in event details screen
    -scaning the qr code will return a message for either success or failure

kushal2011 and others added 30 commits June 10, 2019 22:24
Edit the api config to use mlab database
- participant Detail
- code to show these icons on success/unsuccess of barcode scanning.
-Added AttendeeStatusModel.
-mentioned above jpegs icons on pubspec.yaml
# Conflicts:
#	app/raize/pubspec.lock
#	app/raize/pubspec.yaml
…from issue#6 and merged in DetailWidget.dart.
# Conflicts:
#	app/raize/lib/main.dart
#	app/raize/pubspec.lock
#	app/raize/pubspec.yaml
2)Connecting EventListWidget with EventDetailsWidget.
3)Removed linkingi of EventDetailsWidget from SignInWidget.
mistryhardik and others added 20 commits September 15, 2019 23:39
Use mongodb instead of csv file
-added mongodb to check schwag status and schwag given or not with validations
Use mongodb instead of csv file for swags api
-added mongodb condition fix
-fixed json message response on scanning renamed reason to message
Include a Pull Request template to help community folks contribute better.
Include an Issue template to help community folks contribute better.
code clean up and added comments for event list
Comment thread api/config/env/env.json Outdated

@mistryhardik mistryhardik left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SnehPandya18 You were supposed to delete the values for the keys, not the file itself.

@mistryhardik

Copy link
Copy Markdown
Member

@kushal2011 What does Develop mean? This is not a valid PR title. Also there is just no description provided for all the changes we want to merge into master. Please use the following template to create the description and then we will review the PR once again: https://github.com/gdgbaroda/raize/blob/develop/PULL_REQUEST_TEMPLATE.md.

@SnehPandya18 Thank you for the quick edit.

@kushal2011 kushal2011 changed the title Develop merge develop into master Oct 3, 2019
@kushal2011

Copy link
Copy Markdown
Collaborator Author

@mistryhardik done , changed the title and added description

@SnehPandya18 SnehPandya18 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Proper pull request details and formatting requested

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants