Commit graph

264 commits

Author SHA1 Message Date
Erick Clark
9476d7fbdb Auto stash before merge of "master" and "origin/master"
Updated Design Files
2018-06-10 12:02:48 -05:00
Bart Akeley
f86061d292 comment out google-signin in GoogleAuth.js 2018-06-10 10:40:28 -05:00
Bart Akeley
c93022a674 comment out googlesigning from MainApplication.java 2018-06-10 10:29:02 -05:00
Bart Akeley
d39fa119db comment out google-signin project from gradle config 2018-06-10 10:25:38 -05:00
Bart Akeley
bb52c9b0db versionCode 20 2018-06-03 17:32:13 -05:00
Bart Akeley
82df7a4d84 debounce should always run most recent call 2018-06-03 17:31:54 -05:00
Bart Akeley
16a41c2d04 versionCode 19 2018-06-03 17:16:01 -05:00
Bart Akeley
c9d6735a17 food item search bar passing to backend 2018-06-03 12:30:19 -05:00
Erick Clark
8df0c6569c Updated drawer styles 2018-06-03 12:12:45 -05:00
Erick Clark
868e61dfa4 Merge remote-tracking branch 'origin/master' 2018-05-28 14:10:17 -05:00
Bart Akeley
ba68da3d48 versionCode 18 2018-05-27 11:50:52 -05:00
Bart Akeley
02384f3f0e revert to web client token 2018-05-27 11:50:45 -05:00
Bart Akeley
f37e919284 use the android client key for google signin 2018-05-27 11:45:15 -05:00
Bart Akeley
cb26c28216 versionCode 16 2018-05-27 10:42:11 -05:00
Bart Akeley
c55171403f use release keystore for debug builds 2018-05-27 10:41:50 -05:00
Bart Akeley
5af20ba834 versionCode 15 2018-05-27 10:25:28 -05:00
Bart Akeley
c95f9b9893 add webClientId to good signin config 2018-05-27 10:25:14 -05:00
Bart Akeley
4998ae0ccd versionCode 13 2018-05-27 10:08:03 -05:00
Bart Akeley
02dace6663 use firebase oauth config 2018-05-27 10:07:45 -05:00
Erick Clark
d30e3fe122 Merge remote-tracking branch 'origin/master' 2018-05-27 09:21:25 -05:00
Bart Akeley
c4db0f09fc versionCode 12 2018-05-27 08:52:01 -05:00
Bart Akeley
645e0887c5 switch from web to android google api key 2018-05-27 08:51:40 -05:00
Bart Akeley
a788bc8981 versionCode 10 2018-05-19 18:32:21 -05:00
Bart Akeley
9ddb7341ef simple error text on login page 2018-05-19 12:25:25 -05:00
Bart Akeley
a25988d4df versionCode 10 2018-05-19 12:25:00 -05:00
Bart Akeley
7cca8ab38a prompt for zipcode and remember choic 2018-05-19 11:17:08 -05:00
Erick Clark
e60ba95bac Merge remote-tracking branch 'origin/master' 2018-05-19 11:15:10 -05:00
Erick Clark
e3fd02d22f editing icon in illustrator 2018-05-13 12:13:53 -05:00
Bart Akeley
84e46aeaf8 Revert "pass google token to backend"
This reverts commit 1e442e830a.
2018-05-13 12:05:40 -05:00
Bart Akeley
d2a1392235 versionCode 9 2018-05-13 11:29:17 -05:00
Bart Akeley
1e442e830a pass google token to backend 2018-05-13 10:54:24 -05:00
Erick Clark
3126950266 Added xxxhdpi icon 2018-05-13 10:52:22 -05:00
Erick Clark
b3663c4b68 Added icons 2018-05-13 10:38:50 -05:00
Bart Akeley
e15404b93c Merge branch 'google-signin' 2018-05-11 16:44:22 -05:00
Bart Akeley
2301b6974c GoogleAuth implementation 2018-05-11 16:42:27 -05:00
Bart Akeley
19c2fbc806 add react-native-google-signin to project 2018-05-10 15:36:01 -05:00
Bart Akeley
ec0da29672 versionCode 8 2018-05-10 15:31:01 -05:00
Bart Akeley
0fc471536a Revert "add react-native-google-signin to project"
This reverts commit 1aaee53314.
2018-05-10 15:10:45 -05:00
Bart Akeley
5558df175e Merge branch 'master' of gitlab.com:aretherecookies/ui-mobile 2018-05-10 14:46:34 -05:00
Erick Clark
31ce678905 Auto stash before merge of "master" and "origin/master"
Minor styling changes
2018-05-06 12:16:55 -05:00
Bart Akeley
1aaee53314 add react-native-google-signin to project 2018-05-06 11:25:33 -05:00
Bart Akeley
03158e3c44 place detail open in maps linking to geo app 2018-05-06 10:58:04 -05:00
Erick Clark
5e0b6ccb5e Merge remote-tracking branch 'origin/master' 2018-05-06 10:42:17 -05:00
Erick Clark
39c80a36f8 Merge remote-tracking branch 'origin/master' 2018-05-06 10:42:11 -05:00
Erick Clark
a0cbde6605 Auto stash before merge of "master" and "origin/master"
Updated the landing page
2018-05-06 10:42:05 -05:00
Bart Akeley
4bf5ed9dfb truncate place tile distance to one decimal place 2018-05-06 10:41:32 -05:00
Bart Akeley
f284547d2a pull to refresh for food and places 2018-05-06 10:37:47 -05:00
Bart Akeley
e4c44e9aff fix crash on PlaceDetails when foodItems is null 2018-05-06 09:53:44 -05:00
Bart Akeley
c93064515a package.json merge/fix 2018-05-06 09:21:32 -05:00
Erick Clark
a98fcc247c Merge remote-tracking branch 'origin/master' 2018-05-02 13:24:41 -05:00