Commit Graph

21 Commits

Author SHA1 Message Date
Mike Fitzpatrick
cf07ab1c2e Merge branch 'feature/PROFILE_-_Registration' of honey.fitz.guru:eventment-app into feature/PROFILE_-_Registration 2019-08-12 17:44:42 -04:00
Mike Fitzpatrick
f0460a1b76 - more 2019-08-12 17:44:01 -04:00
769fc0c2b5 - getDefaultEvent now returns active event or first event 2019-08-10 15:28:12 -04:00
0f618fdd78 - Reorg andf cleanup. Maintainability. 2019-08-09 02:52:31 -04:00
e6a4eeaeb1 - more tweaks and fixes.... still not running 2019-08-09 02:01:39 -04:00
70a8246a05 Merge branch 'feature/PROFILE_-_Registration' of honey.fitz.guru:eventment-app into feature/PROFILE_-_Registration
# Conflicts:
#	app/components/AppHeader/HeaderContentLeft.js
#	app/components/AppHeader/HeaderTitle/EventTitle/EventTitle.js
2019-08-08 20:58:01 -04:00
2643fe5d4a - conlicts inboud... 2019-08-08 20:55:19 -04:00
Mike Fitzpatrick
ebb6f47455 - The fix is in! Linty fresh and pretty... 2019-08-08 16:18:08 -04:00
Mike Fitzpatrick
dfc4daf696 - Stuff 2019-08-07 17:49:34 -04:00
Mike Fitzpatrick
aea9bbda96 Merge branch 'master' of honey.fitz.guru:eventment-app
# Conflicts:
#	app/components/Login/LocalLogin.js
#	app/screens/Register.js
2019-08-07 10:23:40 -04:00
Mike Fitzpatrick
b8ea813a77 - Stuff and things for registration! 2019-08-07 10:21:30 -04:00
847c9b192a - Linting... Prettier... 2019-08-07 01:59:10 -04:00
Mike Fitzpatrick
3dc8589fb4 - AppHeader containerized for events fetch (TEMP) 2019-08-06 15:03:06 -04:00
Mike Fitzpatrick
637794ebcd - more! 2019-08-06 14:58:01 -04:00
b8ddc54b99 - Cleanup 2019-08-06 01:36:08 -04:00
6e71ac688a Merge branch 'master' of honey.fitz.guru:eventment-app
# Conflicts:
#	app/actions/profile.js
#	app/router.js
2019-08-05 21:25:43 -04:00
1e464de7e8 -More! 2019-08-05 21:23:17 -04:00
Mike Fitzpatrick
c123ec385c - Registration screens stubbing and partial buildouts 2019-08-05 16:59:38 -04:00
a9f4324f29 - more! 2019-07-24 00:53:01 -04:00
434a1ded24 - implementing immutable.js 2019-07-17 03:21:23 -04:00
8ecf036cc4 - Initial commit 2019-07-09 03:48:02 -04:00