Aaron Sun
|
10956f8515
|
Merge pull request #109 from ClaytonWWilson/aaron-branch-2
Merge pull request #107 from ClaytonWWilson/master
|
2020-11-06 11:28:33 -08:00 |
|
NMerz
|
709812d0c1
|
Login updates
Skip the login screen if the user is logged in
|
2020-11-06 12:51:34 -05:00 |
|
Clayton Wilson
|
9c9219bd6c
|
Fix list price display
|
2020-11-05 20:57:35 -05:00 |
|
|
|
cfc8b65d47
|
Merge pull request #108 from ClaytonWWilson/dynamic-chain-names
Dynamic chain names
|
2020-11-05 01:03:19 -05:00 |
|
Clayton Wilson
|
24d4f0baa8
|
merge conflicts
|
2020-11-05 00:51:28 -05:00 |
|
Clayton Wilson
|
00de30d884
|
line total displayed
|
2020-11-05 00:48:41 -05:00 |
|
Aaron Sun
|
c9c225f67d
|
Merge pull request #107 from ClaytonWWilson/master
Merge pull request #106 from ClaytonWWilson/aaron-branch-2
|
2020-11-04 21:39:06 -08:00 |
|
Aaron Sun
|
b490945f34
|
Merge pull request #106 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
|
2020-11-04 21:38:37 -08:00 |
|
Aaron Sun
|
cc08b02be1
|
Shrunk the item name text in shopping list
|
2020-11-04 21:34:38 -08:00 |
|
Aaron Sun
|
87720a9b43
|
Can now properly display items from multiple stores in shopping list
|
2020-11-04 21:05:09 -08:00 |
|
Clayton Wilson
|
9edab80c2f
|
Store-filtering-related bugs fixed
|
2020-11-05 00:01:20 -05:00 |
|
Clayton Wilson
|
ad4e7fd810
|
Reset search filter
|
2020-11-04 23:14:59 -05:00 |
|
Aaron Sun
|
a2e9c30d6c
|
Merge pull request #105 from ClaytonWWilson/master
Merge from master
|
2020-11-04 20:06:14 -08:00 |
|
Aaron Sun
|
17e9f6575e
|
Merge pull request #104 from ClaytonWWilson/aaron-branch-2
Merge pull request #101 from ClaytonWWilson/master
|
2020-11-04 20:05:24 -08:00 |
|
Nathan Merz
|
3f3d888376
|
Merge pull request #103 from ClaytonWWilson/account-deletion-email
Send more detailed account deletion email
|
2020-11-04 22:09:04 -05:00 |
|
NMerz
|
87039579f7
|
Send more detailed account deletion email
Use SES to send an account deletion confimration email to the user when they delete their account.
|
2020-11-04 22:08:34 -05:00 |
|
|
|
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 |
|
