89 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bart Akeley	a1fa8790cf	ImagePicker using native camera or gallery	2017-06-24 22:38:14 -05:00
Bart Akeley	6d6900c568	ImagePicker showing thumbs for existing images ... still wip for pulling the images from camera	2017-06-24 22:04:25 -05:00
Bart Akeley	0c0e6a619b	Merge remote-tracking branch 'gitlab/master'	2017-06-24 16:07:36 -05:00
Bart Akeley	2b63103662	category picker	2017-06-24 16:06:11 -05:00
Erick Clark	6b34817ec6	Auto stash before merge of "master" and "origin/master" ... Fixed some links	2017-06-23 15:08:05 -05:00
Erick Clark	4fe7109f8e	Typos fixed	2017-06-22 17:06:34 -05:00
Erick Clark	d9e52097a2	Auto stash before merge of "master" and "origin/master"	2017-06-18 21:04:04 -05:00
Bart Akeley	48cdff5aec	google places modal integrated into create food item page	2017-06-18 20:58:43 -05:00
Bart Akeley	928fbd5255	styling for name chooser modal full screen	2017-06-18 12:43:29 -05:00
Bart Akeley	c7a4fecb4a	Merge remote-tracking branch 'gitlab/master'	2017-06-18 12:42:39 -05:00
Erick Clark	4723647f6b	Started ios design	2017-06-18 12:31:18 -05:00
Erick Clark	8562440826	Merge remote-tracking branch 'origin/master'	2017-06-18 12:12:28 -05:00
Erick Clark	f35d7bd364	Started ios design	2017-06-18 12:12:23 -05:00
Bart Akeley	f74aa1f669	convert food name modal into full screen	2017-06-18 11:45:54 -05:00
Erick Clark	6f7e770dfb	Auto stash before merge of "master" and "origin/master"	2017-06-11 20:42:45 -05:00
Erick Clark	7a1ebf2b15	Merge remote-tracking branch 'origin/master'	2017-06-11 20:42:30 -05:00
Bart Akeley	2c294dfcc4	quantity picker in create item screen	2017-06-11 18:32:21 -05:00
Erick Clark	7b795c1697	More link updates in design file	2017-06-04 12:26:49 -05:00
Erick Clark	9cc6d26660	Updated link in design file	2017-06-04 12:23:04 -05:00
Erick Clark	17e5e7ae81	Auto stash before merge of "master" and "origin/master" ... Updated design file	2017-06-04 12:20:24 -05:00
Bart Akeley	29cbffcf38	lint script and some fixes	2017-06-04 11:37:38 -05:00
Bart Akeley	1e9fd7940b	behavior updates for new food item name modal	2017-06-04 11:26:11 -05:00
Bart Akeley	2882770f28	initiatize state in place modal	2017-06-04 10:04:14 -05:00
Bart Akeley	98c9ddb594	react-native-scrollable-tab-view at 0.7.4	2017-06-03 20:12:38 -05:00
Bart Akeley	d1982b1e51	upgrade react-native-scrollable-tab-view	2017-06-03 19:46:09 -05:00
Bart Akeley	edec43e29c	fix many flow type errors	2017-06-03 19:43:45 -05:00
Erick Clark	993e1a3371	Merge remote-tracking branch 'origin/master'	2017-05-28 12:41:25 -05:00
Erick Clark	20ea2dbb90	Updated design mock-ups	2017-05-28 12:40:48 -05:00
Bart Akeley	e04a6fafdc	ignore vscode project files	2017-05-28 12:05:54 -05:00
Bart Akeley	926b46d9a7	fix layout of modal when keyboard is visible	2017-05-28 11:48:04 -05:00
Bart Akeley	5fee4be098	updated react-native template for 0.42	2017-05-28 11:22:05 -05:00
Bart Akeley	34bea52913	Merge remote-tracking branch 'gitlab/master'	2017-05-28 10:50:00 -05:00
Bart Akeley	264404c787	update to react-native 0.42	2017-05-28 10:49:46 -05:00
Erick Clark	64488b1e5e	Auto stash before merge of "master" and "origin/master" ... Updated Map and Filter icon positions, removed food item amount numbers.	2017-05-27 15:24:35 -05:00
Bart Akeley	deecd02152	fix some lint errors	2017-05-27 11:26:50 -05:00
Bart Akeley	c4ebb3a628	Place Modal	2017-05-27 11:26:17 -05:00
Bart Akeley	492f98ae8c	name modal styling fixes	2017-05-27 10:57:11 -05:00
Bart Akeley	f950089125	update name of new food item	2017-05-25 21:44:57 -05:00
Erick Clark	02faa0f2a3	Merge remote-tracking branch 'origin/master'	2017-05-23 08:55:19 -05:00
Bart Akeley	aa8ce0b601	show icons in food item name modal	2017-05-21 20:36:30 -05:00
Bart Akeley	0133db1b64	food list showing correct place	2017-05-21 20:26:12 -05:00
Bart Akeley	ee25861327	Fix thumbnails for food items	2017-05-21 19:44:51 -05:00
Erick Clark	ed7c185000	Merge remote-tracking branch 'origin/master'	2017-05-21 14:19:43 -05:00
Erick Clark	195aec2113	Updated design mock-ups	2017-05-21 14:18:39 -05:00
Bart Akeley	38035c6f5c	add food item name modal	2017-05-13 22:33:56 -05:00
Bart Akeley	27ad3d5769	Merge remote-tracking branch 'gitlab/master'	2017-04-26 22:06:36 -05:00
Bart Akeley	1ad6d24d36	link food items to places in the detail screen	2017-04-26 22:06:31 -05:00
Erick Clark	8d956e7fdf	Updated some color values	2017-04-25 00:20:49 -05:00
Erick Clark	1666829450	Merge remote-tracking branch 'origin/master'	2017-04-25 00:17:09 -05:00
Erick Clark	8a5f3e3fa6	Changed a couple color values	2017-04-25 00:15:21 -05:00