Skip to content
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

Changes made in the Hackathon for the ReactEurope App #23

Merged
merged 103 commits into from
May 19, 2018

Conversation

horacioh
Copy link

react-europe-screenshots

Solves #12 & #17

simonayzman and others added 30 commits May 19, 2018 10:20
…mlyck

React europe search attendees mlyck
…h-attendees-mlyck

Add graphQL query using react-apollo
…h-attendees-simonayzman

Added rough draft of filtering & autocomplete
…h-attendees-mlyck

React europe search attendees mlyck
…h-attendees-simonayzman

Updated integration of profile cards
Horacio Herrera and others added 26 commits May 19, 2018 17:08
…ch-attendees-simonayzman

Added highlighting to search results
…ch-attendees-jmcgee

getting rid of animatedview thing and fixing twitter/email bugs
…ch-attendees-simonayzman

Updated text input component
…ch-attendees-mlyck

distinguish speakers from normal attendees and remove console logs
…ch-attendees-jmcgee

React europe search attendees jmcgee
…ch-attendees-simonayzman

Added highlight words core dependency
…ch-attendees-jmcgee

fixing list behind search
* react-europe:
  Fixed linting issues. Updated babel-eslint.
  Ensure that nextTalks is not empty before accessing
  automatically select current day in schedule
  use gql to get latest talks
  bump version and schedule
  bump version and schedule

Conflicts:
	src/Navigation.js
	src/components/TabBarBottom.js
	src/screens/Contacts.js
	src/screens/Details.js
	src/screens/Home.js
	src/screens/Profile.js
	src/screens/ScheduleDay.js
	src/screens/Speakers.js
	src/screens/Sponsors.js
	src/screens/StaffCheckinLists.js
* react-europe-search-attendees: (69 commits)
  fixing list behind search
  Added highlight words core
  removing stuff
  remove log
  fixing
  placeholder
  fix conflict
  remove Foundation import
  distinguish speakers from normal attendees and remove console logs
  Updated sorting logic
  Updated text input component
  fixing email and twitter
  fixing color
  Supplied query for highlighting to search results
  Attended special version of highlightable text component
  getting rid of animatedview thing
  Fix searchbar position on non-dank phones
  Searchbar
  Searchbar
  Fixed twitter util errors
  ...

Conflicts:
	src/Navigation.js
	src/screens/Details.js
	src/screens/index.js
@patcito patcito closed this May 19, 2018
@patcito patcito reopened this May 19, 2018
@horacioh
Copy link
Author

#24 needs to be merged first in order to this PR get no conflicts, the Layout in the contactCard is a little broken (screenshot in #24)

@patcito patcito merged commit 948e0a5 into react-europe:react-europe May 19, 2018
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.

4 participants