Commit Graph

443 Commits

Author SHA1 Message Date
10895c9430
Merge pull request #102 from ClaytonWWilson/dynamic-chain-names
Remove hardcoded store names
2020-11-04 20:29:39 -05:00
Clayton Wilson
dd7a823552 Remove hardcoded store names 2020-11-04 20:28:46 -05:00
Aaron Sun
406287ceab
Merge pull request #101 from ClaytonWWilson/master
Merge pull request #100 from ClaytonWWilson/aaron-branch-2
2020-11-03 19:18:20 -08:00
Aaron Sun
222dbda627
Merge pull request #100 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-03 19:17:50 -08:00
Aaron Sun
901af2d1cf User (truly) can no longer reaccess login-required pages through the back button v.2 2020-11-03 19:17:09 -08:00
Aaron Sun
56cd59351f Added shared button back to shopping list page 2020-11-03 16:25:58 -08:00
Aaron Sun
1fd0149b2e Email gets sent after deleting account 2020-11-03 15:26:27 -08:00
Aaron Sun
e29a026954
Merge pull request #99 from ClaytonWWilson/master
Merge from master
2020-11-03 14:44:51 -08:00
Aaron Sun
809893ff96
Merge pull request #98 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-03 14:44:07 -08:00
Aaron Sun
13bd8f29ef Can now see if a list is shared or not 2020-11-02 21:29:01 -08:00
90a09d9d53
Merge pull request #95 from ClaytonWWilson/revamped-search-filter
Revamped search filter
2020-11-02 00:56:42 -05:00
Clayton Wilson
e58d28ea6a Change list swipe direction 2020-11-02 00:55:57 -05:00
Nathan Merz
7e7b4bec84
Merge pull request #97 from ClaytonWWilson/non-owner-delete
Allow non-owner semi-delete
2020-11-01 21:48:25 -05:00
NMerz
7412915034 Allow non-owner semi-delete
Non-owners should be able to remove only their own access to a list
2020-11-01 21:48:05 -05:00
Nathan Merz
a355820c3c
Merge pull request #96 from ClaytonWWilson/chain-get
Add chainID to Chain class Lambda
2020-11-01 21:08:26 -05:00
NMerz
48f96c4146 Add chainID to Chain class Lambda 2020-11-01 21:08:07 -05:00
Clayton Wilson
06dd554691 Fixing merge bugs 2020-11-01 20:09:46 -05:00
7c9f5cbd5e
Merge branch 'master' into revamped-search-filter 2020-11-01 19:47:18 -05:00
Clayton Wilson
6623aeef90 Filter dialog layout improvements 2020-11-01 19:37:11 -05:00
Aaron Sun
6189c39a1c
Merge pull request #94 from ClaytonWWilson/master
Merge pull request #93 from ClaytonWWilson/aaron-branch-2
2020-11-01 16:13:43 -08:00
Aaron Sun
6ff5e9ab30
Merge pull request #93 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-01 16:13:16 -08:00
Aaron Sun
62735aae0c Made sharing list an option after swiping 2020-11-01 16:12:28 -08:00
Aaron Sun
8744b99cb5 Delete list now works 2020-11-01 11:41:58 -08:00
Aaron Sun
e35ef127ff
Merge pull request #92 from ClaytonWWilson/master
Merge code from master
2020-11-01 10:33:23 -08:00
Aaron Sun
9cb3835e4a
Merge pull request #91 from ClaytonWWilson/aaron-branch-2
Merge pull request #89 from ClaytonWWilson/master
2020-11-01 10:32:45 -08:00
Aaron Sun
ef5fb35ad5
Merge pull request #90 from ClaytonWWilson/list-swiping
List swiping
2020-11-01 10:32:12 -08:00
Clayton Wilson
f559a3298f Added back old list display adapter as ShoppingListsAdapter 2020-11-01 13:30:16 -05:00
Clayton Wilson
cce114e4d5 Renamed DisplayShoppingListsAdapter to ShoppingListsSwipeableAdapter 2020-11-01 13:16:36 -05:00
Aaron Sun
33d60d20f6
Merge pull request #89 from ClaytonWWilson/master
Merge code from master
2020-11-01 09:50:57 -08:00
Aaron Sun
117015b7f8
Merge pull request #88 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-01 09:50:12 -08:00
Aaron Sun
4885a163c0 Changed share list prompt 2020-11-01 09:49:21 -08:00
Nathan Merz
eab15e4b8a
Merge pull request #87 from ClaytonWWilson/lambda-tests
Update lambda tests
2020-11-01 12:46:28 -05:00
NMerz
a12b1ae870 Update lambda tests
Update lambda tests for new and altered lambdas
2020-11-01 12:46:03 -05:00
Aaron Sun
424f012637
Merge pull request #86 from ClaytonWWilson/master
Merge code from master
2020-11-01 09:22:26 -08:00
Aaron Sun
aeb6433a87
Merge pull request #85 from ClaytonWWilson/aaron-branch-2
Merge pull request #84 from ClaytonWWilson/master
2020-11-01 09:21:01 -08:00
Aaron Sun
7949e98d49
Merge pull request #80 from ClaytonWWilson/list-swiping
List swiping displays share and delete buttons
2020-11-01 09:20:31 -08:00
Aaron Sun
51e8d8607d
Merge pull request #84 from ClaytonWWilson/master
Sharing list now works - fix was on Nathan's side
2020-11-01 09:18:27 -08:00
Aaron Sun
5493ca8fc0
Merge pull request #83 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-01 09:16:16 -08:00
Nathan Merz
567f0ccc00
Merge pull request #81 from ClaytonWWilson/list-share-lambda
Correct shareWithEmail naming
2020-11-01 12:01:44 -05:00
NMerz
9c9da446ef Make shared info avlaible for lists 2020-11-01 12:00:50 -05:00
Nathan Merz
f2e9488544
Merge pull request #63 from ClaytonWWilson/kohls-data
Kohls data
2020-11-01 11:48:32 -05:00
NMerz
2cce80ffbd Correct shareWithEmail naming
Ths somehow ended up different on the client and the server
2020-11-01 11:34:34 -05:00
Aaron Sun
446a482a41 In progress on sharing list - need help on handling NPE bug 2020-11-01 08:33:32 -08:00
NMerz
ee04a06e0e Chaining, retries, and general scraping durability
Make the scraping infrastructure more durable since the scraping service often fails to deliver
2020-11-01 11:30:03 -05:00
Clayton Wilson
9616c7a572 Display checkbox listview for filtering store selection 2020-11-01 02:42:02 -05:00
Clayton Wilson
33c3d8c56e Filtering search results is disabled until there are results to filter 2020-11-01 00:51:38 -04:00
Clayton Wilson
65c60d2e70 List swiping displays share and delete buttons 2020-10-31 23:57:07 -04:00
Aaron Sun
85873e5f20
Merge pull request #79 from ClaytonWWilson/master
Get latest code from master
2020-10-31 18:21:09 -07:00
71487c818a
Merge pull request #71 from ClaytonWWilson/list-share-lambda
List share lambda
2020-10-31 21:17:33 -04:00
004c5de314
Merge pull request #77 from ClaytonWWilson/list-delete
ListDELETE lambda
2020-10-31 21:17:17 -04:00