Commit Graph

Select branches

Hide Pull Requests

Krogger-Auth-Token

Krogger-getProduct-api

aaron-branch

aaron-branch-2

chain-get-ids

duplicate-lists

fix-listshare

fix-price-reset2

intra-list-ordering

lambda-robustness

list-duplication

list-renaming

master

profile-picture

readmes

rearrange-lists

search-history

share-confirm-done

sharing-permissions

test-new-lambdas

update-tests-to-mockito

update-user-location

#1

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#110

#111

#112

#113

#115

#117

#118

#119

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 04636f3d25 Sign out button works with one click Clayton Wilson 2020-11-14 23:07:56 -05:00
• 0934965306 Restrict quantities when adding item to a list Clayton Wilson 2020-11-14 22:51:02 -05:00
• 757ac20fe6 Broken images in search now display a broke image icon Clayton Wilson 2020-11-14 22:36:42 -05:00
• 72a201a0fe Search displays 'No Results' when results are empty Clayton Wilson 2020-11-14 22:27:47 -05:00
• c0f79a70ef Search, filter, and sort scroll to the top of the results Clayton Wilson 2020-11-14 19:55:30 -05:00
• 07733caed7 Lists activity displays item count on each list Clayton Wilson 2020-11-14 19:35:11 -05:00
• 680c545d76 Display shopping list name in titlebar Clayton Wilson 2020-11-14 19:12:03 -05:00
• 35f709fcd9 Add list position changing Lambdas NMerz 2020-11-14 16:21:18 -05:00
• 421fceb364 Store uiPosition NMerz 2020-11-14 15:55:29 -05:00
• 7cb9639f9a Refine delete access NMerz 2020-11-14 15:17:56 -05:00
• 2c23331354 Finish ON DUPLICATE in list sharing NMerz 2020-11-14 15:16:52 -05:00
• b478ace552 Update delete to use delete permission NMerz 2020-11-14 15:02:04 -05:00
• d4606df350 Fix unique assertion on share rows NMerz 2020-11-14 15:01:36 -05:00
• 3b938bdd2c Recracterize ListSharePOST as ListSharePUT NMerz 2020-11-14 14:35:08 -05:00
• 9de8f425c7 Merge branch 'search-history' into sharing-permissions NMerz 2020-11-14 14:32:27 -05:00
• 954b52dc0a Stricter access checking NMerz 2020-11-14 14:29:48 -05:00
• 82272a9a29 Set permission param NMerz 2020-11-14 12:46:33 -05:00
• 3afaad89ea Use plain table search history search-history NMerz 2020-11-14 12:05:50 -05:00
• 8653b9a035 Try storing serialized search object NMerz 2020-11-14 11:40:42 -05:00
• 2d3e985ded Merge pull request #113 from ClaytonWWilson/improvements Clayton Wilson 2020-11-12 20:34:49 -05:00
• bae3d77c57 Adding menus and icons to menus Clayton Wilson 2020-11-12 20:32:09 -05:00
• 36ef81ce16 Merge pull request #112 from ClaytonWWilson/master Aaron Sun 2020-11-12 14:49:04 -08:00
• edba58ebec Merge pull request #111 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-12 14:48:18 -08:00
• a441b672f4 Added user's email to Profile page Aaron Sun 2020-11-11 14:44:51 -08:00
• c293fd8877 Can now display message on List page if there are currently no lists Aaron Sun 2020-11-11 11:58:54 -08:00
• 9d80d6c937 Changed color of Delete Account button Aaron Sun 2020-11-10 21:53:53 -08:00
• 879f282735 Moved link to list page to above link to profile page in hamburger menu Aaron Sun 2020-11-10 20:11:49 -08:00
• ea660e4c3a Cleaned up the code of the previous 3 commits Aaron Sun 2020-11-10 19:54:32 -08:00
• 65d59500be Readded padding to List page Aaron Sun 2020-11-10 17:46:05 -08:00
• fb50c4e0fd Removed old unused images Aaron Sun 2020-11-10 17:36:47 -08:00
• 96e0adf883 Made List page show up first after signing in Aaron Sun 2020-11-10 17:35:12 -08:00
• aa2f68c3e5 Added profile icon to Drawable folder Aaron Sun 2020-11-09 17:32:49 -08:00
• 17cc3e68e6 Remove old TODOs Clayton Wilson 2020-11-08 20:57:42 -05:00
• 530d23de3e Merge pull request #110 from ClaytonWWilson/master Aaron Sun 2020-11-06 11:29:08 -08:00
• 10956f8515 Merge pull request #109 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-06 11:28:33 -08:00
• 709812d0c1 Login updates NMerz 2020-11-06 12:51:34 -05:00
• 9c9219bd6c Fix list price display Clayton Wilson 2020-11-05 20:57:35 -05:00
• cfc8b65d47 Merge pull request #108 from ClaytonWWilson/dynamic-chain-names Clayton Wilson 2020-11-05 01:03:19 -05:00
• 24d4f0baa8 merge conflicts Clayton Wilson 2020-11-05 00:51:28 -05:00
• 00de30d884 line total displayed Clayton Wilson 2020-11-05 00:48:41 -05:00
• c9c225f67d Merge pull request #107 from ClaytonWWilson/master Aaron Sun 2020-11-04 21:39:06 -08:00
• b490945f34 Merge pull request #106 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-04 21:38:37 -08:00
• cc08b02be1 Shrunk the item name text in shopping list Aaron Sun 2020-11-04 21:34:38 -08:00
• 87720a9b43 Can now properly display items from multiple stores in shopping list Aaron Sun 2020-11-04 21:05:09 -08:00
• 9edab80c2f Store-filtering-related bugs fixed Clayton Wilson 2020-11-05 00:01:20 -05:00
• ad4e7fd810 Reset search filter Clayton Wilson 2020-11-04 23:14:59 -05:00
• a2e9c30d6c Merge pull request #105 from ClaytonWWilson/master Aaron Sun 2020-11-04 20:06:14 -08:00
• 17e9f6575e Merge pull request #104 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-04 20:05:24 -08:00
• 3f3d888376 Merge pull request #103 from ClaytonWWilson/account-deletion-email Nathan Merz 2020-11-04 22:09:04 -05:00
• 87039579f7 Send more detailed account deletion email NMerz 2020-11-04 22:08:34 -05:00
• 10895c9430 Merge pull request #102 from ClaytonWWilson/dynamic-chain-names Clayton Wilson 2020-11-04 20:29:39 -05:00
• dd7a823552 Remove hardcoded store names Clayton Wilson 2020-11-04 20:28:46 -05:00
• 406287ceab Merge pull request #101 from ClaytonWWilson/master Aaron Sun 2020-11-03 19:18:20 -08:00
• 222dbda627 Merge pull request #100 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-03 19:17:50 -08:00
• 901af2d1cf User (truly) can no longer reaccess login-required pages through the back button v.2 Aaron Sun 2020-11-03 19:17:09 -08:00
• 56cd59351f Added shared button back to shopping list page Aaron Sun 2020-11-03 16:25:58 -08:00
• 1fd0149b2e Email gets sent after deleting account Aaron Sun 2020-11-03 15:26:27 -08:00
• e29a026954 Merge pull request #99 from ClaytonWWilson/master Aaron Sun 2020-11-03 14:44:51 -08:00
• 809893ff96 Merge pull request #98 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-03 14:44:07 -08:00
• 13bd8f29ef Can now see if a list is shared or not Aaron Sun 2020-11-02 21:29:01 -08:00
• 90a09d9d53 Merge pull request #95 from ClaytonWWilson/revamped-search-filter Clayton Wilson 2020-11-02 00:56:42 -05:00
• e58d28ea6a Change list swipe direction Clayton Wilson 2020-11-02 00:55:57 -05:00
• 7e7b4bec84 Merge pull request #97 from ClaytonWWilson/non-owner-delete Nathan Merz 2020-11-01 21:48:25 -05:00
• 7412915034 Allow non-owner semi-delete NMerz 2020-11-01 21:48:05 -05:00
• a355820c3c Merge pull request #96 from ClaytonWWilson/chain-get Nathan Merz 2020-11-01 21:08:26 -05:00
• 48f96c4146 Add chainID to Chain class Lambda NMerz 2020-11-01 21:08:07 -05:00
• 06dd554691 Fixing merge bugs Clayton Wilson 2020-11-01 20:09:46 -05:00
• 7c9f5cbd5e Merge branch 'master' into revamped-search-filter Clayton Wilson 2020-11-01 19:47:18 -05:00
• 6623aeef90 Filter dialog layout improvements Clayton Wilson 2020-11-01 19:37:11 -05:00
• 6189c39a1c Merge pull request #94 from ClaytonWWilson/master Aaron Sun 2020-11-01 16:13:43 -08:00
• 6ff5e9ab30 Merge pull request #93 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-01 16:13:16 -08:00
• 62735aae0c Made sharing list an option after swiping Aaron Sun 2020-11-01 16:12:28 -08:00
• 8744b99cb5 Delete list now works Aaron Sun 2020-11-01 11:41:58 -08:00
• e35ef127ff Merge pull request #92 from ClaytonWWilson/master Aaron Sun 2020-11-01 10:33:23 -08:00
• 9cb3835e4a Merge pull request #91 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-01 10:32:45 -08:00
• ef5fb35ad5 Merge pull request #90 from ClaytonWWilson/list-swiping Aaron Sun 2020-11-01 10:32:12 -08:00
• f559a3298f Added back old list display adapter as ShoppingListsAdapter Clayton Wilson 2020-11-01 13:30:16 -05:00
• cce114e4d5 Renamed DisplayShoppingListsAdapter to ShoppingListsSwipeableAdapter Clayton Wilson 2020-11-01 13:16:36 -05:00
• 33d60d20f6 Merge pull request #89 from ClaytonWWilson/master Aaron Sun 2020-11-01 09:50:57 -08:00
• 117015b7f8 Merge pull request #88 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-01 09:50:12 -08:00
• 4885a163c0 Changed share list prompt Aaron Sun 2020-11-01 09:49:21 -08:00
• eab15e4b8a Merge pull request #87 from ClaytonWWilson/lambda-tests Nathan Merz 2020-11-01 12:46:28 -05:00
• a12b1ae870 Update lambda tests NMerz 2020-11-01 12:46:03 -05:00
• 424f012637 Merge pull request #86 from ClaytonWWilson/master Aaron Sun 2020-11-01 09:22:26 -08:00
• aeb6433a87 Merge pull request #85 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-01 09:21:01 -08:00
• 7949e98d49 Merge pull request #80 from ClaytonWWilson/list-swiping Aaron Sun 2020-11-01 09:20:31 -08:00
• 51e8d8607d Merge pull request #84 from ClaytonWWilson/master Aaron Sun 2020-11-01 09:18:27 -08:00
• 5493ca8fc0 Merge pull request #83 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-11-01 09:16:16 -08:00
• 567f0ccc00 Merge pull request #81 from ClaytonWWilson/list-share-lambda Nathan Merz 2020-11-01 12:01:44 -05:00
• 9c9da446ef Make shared info avlaible for lists NMerz 2020-11-01 12:00:50 -05:00
• f2e9488544 Merge pull request #63 from ClaytonWWilson/kohls-data Nathan Merz 2020-11-01 11:48:32 -05:00
• 2cce80ffbd Correct shareWithEmail naming NMerz 2020-11-01 11:34:34 -05:00
• 446a482a41 In progress on sharing list - need help on handling NPE bug Aaron Sun 2020-11-01 08:33:32 -08:00
• ee04a06e0e Chaining, retries, and general scraping durability NMerz 2020-11-01 11:30:03 -05:00
• 9616c7a572 Display checkbox listview for filtering store selection Clayton Wilson 2020-11-01 02:42:02 -05:00
• 33c3d8c56e Filtering search results is disabled until there are results to filter Clayton Wilson 2020-11-01 00:51:38 -04:00
• 65c60d2e70 List swiping displays share and delete buttons Clayton Wilson 2020-10-31 23:57:07 -04:00
• 85873e5f20 Merge pull request #79 from ClaytonWWilson/master Aaron Sun 2020-10-31 18:21:09 -07:00
• 71487c818a Merge pull request #71 from ClaytonWWilson/list-share-lambda Clayton Wilson 2020-10-31 21:17:33 -04:00
• 004c5de314 Merge pull request #77 from ClaytonWWilson/list-delete Clayton Wilson 2020-10-31 21:17:17 -04:00