Commit Graph

324 Commits

Author SHA1 Message Date
NMerz
f8db33bde4 Add chain id list retrieval
Update ChainGetter to work with getListOfIds
2020-11-15 17:29:37 -05:00
2d3e985ded
Merge pull request #113 from ClaytonWWilson/improvements
Adding menus and icons to menus
2020-11-12 20:34:49 -05:00
Clayton Wilson
bae3d77c57 Adding menus and icons to menus 2020-11-12 20:32:09 -05:00
Aaron Sun
edba58ebec
Merge pull request #111 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-12 14:48:18 -08:00
Aaron Sun
a441b672f4 Added user's email to Profile page 2020-11-11 14:44:51 -08:00
Aaron Sun
c293fd8877 Can now display message on List page if there are currently no lists 2020-11-11 11:58:54 -08:00
Aaron Sun
9d80d6c937 Changed color of Delete Account button 2020-11-10 21:53:53 -08:00
Aaron Sun
879f282735 Moved link to list page to above link to profile page in hamburger menu 2020-11-10 20:11:49 -08:00
Aaron Sun
ea660e4c3a Cleaned up the code of the previous 3 commits 2020-11-10 19:54:32 -08:00
Aaron Sun
65d59500be Readded padding to List page 2020-11-10 17:46:05 -08:00
Aaron Sun
fb50c4e0fd Removed old unused images 2020-11-10 17:36:47 -08:00
Aaron Sun
96e0adf883 Made List page show up first after signing in 2020-11-10 17:35:12 -08:00
Aaron Sun
aa2f68c3e5 Added profile icon to Drawable folder 2020-11-09 17:32:49 -08:00
Clayton Wilson
17cc3e68e6 Remove old TODOs 2020-11-08 20:57:42 -05:00
Aaron Sun
530d23de3e
Merge pull request #110 from ClaytonWWilson/master
Merge from master
2020-11-06 11:29:08 -08:00
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