Listify

ClaytonWWilson/Listify

Fork 0

mirror of https://github.com/ClaytonWWilson/Listify.git synced 2026-03-10 10:45:04 +00:00

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

058810f42f Merge pull request #78 from ClaytonWWilson/aaron-branch-2 Clayton Wilson 2020-10-31 21:13:24 -04:00
bc66026bd3 Manual merge conflict bug fixes Clayton Wilson 2020-10-31 21:12:52 -04:00
a13f2d288f Merge branch 'master' into aaron-branch-2 Clayton Wilson 2020-10-31 20:58:25 -04:00
52e76be34a Merge pull request #73 from ClaytonWWilson/search-filter Clayton Wilson 2020-10-31 20:48:06 -04:00
fdb1ea6213 Fix branch merge bug Clayton Wilson 2020-10-31 20:47:48 -04:00
7cb7f5f468 Merge branch 'master' into search-filter Clayton Wilson 2020-10-31 20:40:19 -04:00
d7a86aac7d Merge pull request #74 from ClaytonWWilson/total-price-bar Clayton Wilson 2020-10-31 20:35:43 -04:00
1f7a1b10db Remove print statements Clayton Wilson 2020-10-31 20:35:31 -04:00
d9ea934021 Fix total price being incorrect Clayton Wilson 2020-10-31 20:34:54 -04:00
4b8561ebd7 Removed my grand total code (Clayton's job) and reformatted shopping list page Aaron Sun 2020-10-31 17:25:56 -07:00
1f2ea26efe Merge branch 'master' into total-price-bar Clayton Wilson 2020-10-31 20:21:00 -04:00
19fdd96b76 Merge pull request #69 from ClaytonWWilson/async-loading Clayton Wilson 2020-10-31 20:11:36 -04:00
8364ed049b Fixed formatting from merge Clayton Wilson 2020-10-31 20:10:09 -04:00
4a43b84aba Merge branch 'master' into async-loading Clayton Wilson 2020-10-31 20:05:18 -04:00
739699d7a5 Explicitly declared inner loop variables to final Clayton Wilson 2020-10-31 19:54:11 -04:00
e392820404 Default can be sorted descending Clayton Wilson 2020-10-31 19:36:45 -04:00
3b8e13e84c Merge pull request #70 from ClaytonWWilson/item-search-limit Nathan Merz 2020-10-31 19:16:18 -04:00
8233a989ef ListDELETE lambda NMerz 2020-10-31 14:54:42 -04:00
7cf6c0534a Merge pull request #76 from ClaytonWWilson/master Aaron Sun 2020-10-27 11:07:13 -07:00
7c6045ba46 Merge pull request #72 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-10-27 11:06:42 -07:00
32dd8c56ca New sort dialog fully implemented Clayton Wilson 2020-10-26 19:15:58 -04:00
20b86c573a New sort dialog layout Clayton Wilson 2020-10-26 03:49:43 -04:00
2c73e8b224 Properly formatted the price values in shopping list Aaron Sun 2020-10-25 23:27:25 -07:00
049d95bb91 Can now clear shopping list (i.e. remove all items) Aaron Sun 2020-10-25 22:39:56 -07:00
0562c66dbb Can now display the grand total of items in shopping list Aaron Sun 2020-10-25 22:15:27 -07:00
e7c1ab85ea Moving sort and filter code to the correct files Clayton Wilson 2020-10-26 00:59:18 -04:00
a3e72d3699 Shopping list can now display actual image of item Aaron Sun 2020-10-25 21:47:48 -07:00
d8bf4e02f8 Add menu to search and rename SortDialogFragment to FilterDialogFragment Clayton Wilson 2020-10-26 00:25:47 -04:00
367ff12f58 Merge pull request #75 from ClaytonWWilson/search-filter Clayton Wilson 2020-10-26 00:11:39 -04:00
04a944f2d5 Update total price when quantities change and items are removed Clayton Wilson 2020-10-25 23:06:56 -04:00
caf929a71e Floating total price bar Clayton Wilson 2020-10-25 22:52:35 -04:00
07db1c833a Fix duplicate lists displaying Clayton Wilson 2020-10-25 21:57:57 -04:00
9462bc6723 Price range filtering finished Clayton Wilson 2020-10-25 21:19:02 -04:00
7bc43d8249 Simplified a section of code for total price by store (used HashMap to access header section) Aaron Sun 2020-10-25 16:15:42 -07:00
c07599ecc6 Add threads in awaited for loops. Remove new threads from Requestor.getObject calls Clayton Wilson 2020-10-25 16:53:51 -04:00
8afa81db59 Total prices change on the spot after changing quantity and removing items Aaron Sun 2020-10-24 16:14:17 -07:00
6fe3110c29 Can now display the total price of the items from each store in shopping list Aaron Sun 2020-10-24 12:40:28 -07:00
f2346f32a9 Add client-side shareWithEmail NMerz 2020-10-24 14:50:11 -04:00
34d74aae6a Treat ListSharee as access table NMerz 2020-10-24 14:46:56 -04:00
c9d40d0eae Price filter debugging Clayton Wilson 2020-10-24 13:51:11 -04:00
2637cab282 Create userID retrieval Lambda NMerz 2020-10-24 12:52:45 -04:00
45c7ac15bd Limit item search results NMerz 2020-10-24 11:53:12 -04:00
4eddf3ce2d Can now divde the items in shopping list by store Aaron Sun 2020-10-23 22:06:21 -07:00
8f6ecdbab1 Removed unnecessary code for Cancel button in pop-up window Aaron Sun 2020-10-23 20:20:31 -07:00
6b30476ccd Move loading circle into its own object Clayton Wilson 2020-10-23 22:27:01 -04:00
e21913882c Merge branch 'master' into async-loading Clayton Wilson 2020-10-22 23:12:41 -04:00
8604d98e63 Async creating lists and adding items Clayton Wilson 2020-10-22 23:09:57 -04:00
07d0cd44cb Async loading list products Clayton Wilson 2020-10-22 18:36:00 -04:00
ec28e8babc Async loading lists page Clayton Wilson 2020-10-22 18:06:10 -04:00
20408ea42b async search bug fixes Clayton Wilson 2020-10-22 16:28:00 -04:00
378878d746 Merge pull request #68 from ClaytonWWilson/master DreamCoder23 2020-10-21 20:11:19 -07:00
c6b5e28755 Merge pull request #67 from ClaytonWWilson/aaron-branch-2 DreamCoder23 2020-10-21 20:10:44 -07:00
22f8cabc67 Simplified code for verification code pop-up Aaron Sun 2020-10-21 20:09:40 -07:00
4a35c5de92 Merge pull request #66 from ClaytonWWilson/master DreamCoder23 2020-10-21 19:33:14 -07:00
7e19a898ff Merge pull request #65 from ClaytonWWilson/aaron-branch-2 DreamCoder23 2020-10-21 19:32:39 -07:00
f62e666652 User can no longer reaccess login-required pages through the back button Aaron Sun 2020-10-21 19:31:24 -07:00
465318eb84 Sign out button is now in the hamburger menu Aaron Sun 2020-10-21 14:31:00 -07:00
fdf27b9e62 User can now log out and also automatically gets logged in after signing up Aaron Sun 2020-10-21 12:22:42 -07:00
8dd2f33b42 App directs user to Login page if not logged in Aaron Sun 2020-10-21 11:52:20 -07:00
ff14f59ddd Merge pull request #64 from ClaytonWWilson/master DreamCoder23 2020-10-21 10:27:34 -07:00
dacd469a56 Merge pull request #62 from ClaytonWWilson/aaron-branch-2 DreamCoder23 2020-10-21 10:26:05 -07:00
a3ed7ba8d9 Finished with adding an extra security step to the delete account process Aaron Sun 2020-10-20 23:37:27 -07:00
e1c670fed0 Renamed xml file for list entry Aaron Sun 2020-10-20 22:55:43 -07:00
4623718e3a Restructured Forgot Password code similar to that of Sign Up Aaron Sun 2020-10-20 20:55:02 -07:00
6337422f52 Added Confirm Password to Forgot Password Aaron Sun 2020-10-20 20:36:42 -07:00
8acf630382 Removed everything except Login and Delete Account buttons in Home/Profile page Aaron Sun 2020-10-20 20:07:31 -07:00
4757ba2ddf Create new thread on search and show progress bar Clayton Wilson 2020-10-20 07:28:58 -04:00
4e7b180fe0 Async load search results Clayton Wilson 2020-10-20 05:45:33 -04:00
e98d2a6a93 Search activity price seekbar layout Clayton Wilson 2020-10-18 19:50:00 -04:00
79598bf9e9 Lambdaify Kohls scraping NMerz 2020-10-18 17:51:08 -04:00
7dbea8f805 Add Kohls data to database NMerz 2020-10-18 14:10:41 -04:00
8e6dbac183 Kohl's scraping outline NMerz 2020-10-17 22:56:25 -04:00
85f78e3333 Can now display splashscreen when first entering the app v.3 Aaron Sun 2020-10-09 12:14:44 -07:00
5cae38c812 Can now display splashscreen when first entering the app v.6 aaron-branch Aaron Sun 2020-10-08 23:40:55 -07:00
8512fbc3d4 Can now display splashscreen when first entering the app v.5 Aaron Sun 2020-10-08 23:36:19 -07:00
8fa081e4b7 Fix creating list from hamburger menu Clayton Wilson 2020-10-09 02:15:08 -04:00
838db000af Can now display splashscreen when first entering the app v.4 Aaron Sun 2020-10-08 23:01:49 -07:00
addb8632d6 Can now display splashscreen when first entering the app v.3 Aaron Sun 2020-10-08 22:44:33 -07:00
24554b50dd Revert "Can now display splashscreen when first entering the app v.1" NMerz 2020-10-09 01:40:55 -04:00
0151fa7db2 Revert "Can now display splashscreen when first entering the app v.2" NMerz 2020-10-09 01:40:48 -04:00
491e32b07f Merge pull request #61 from ClaytonWWilson/aaron-branch Nathan Merz 2020-10-09 01:39:41 -04:00
55d07f23e8 Can now display splashscreen when first entering the app v.2 Aaron Sun 2020-10-08 22:37:14 -07:00
43bd0a7fb4 Merge pull request #60 from ClaytonWWilson/layout-improvements Clayton Wilson 2020-10-09 01:36:45 -04:00
61d7c88e1a Can now display splashscreen when first entering the app v.1 Aaron Sun 2020-10-08 22:35:38 -07:00
c1a8103da8 Various layout improvements Clayton Wilson 2020-10-09 01:35:16 -04:00
a7ac3d6ec9 Enforce synchronous updates for quanitity NMerz 2020-10-09 01:16:42 -04:00
702a83ff85 Can now save quantity after changing it in List v.1 Aaron Sun 2020-10-08 22:03:45 -07:00
23fc181fc0 Removed upper limit for quantity -- not needed Aaron Sun 2020-10-08 21:31:43 -07:00
e7d2ec333a Implemented Confirm Password and quantity fetching from shopping list v.1 Aaron Sun 2020-10-08 21:30:08 -07:00
f4d1458eb7 Update StatementInjector for missing rsReturns NMerz 2020-10-09 00:15:57 -04:00
d42013a07e Merge branch 'master' of https://github.com/ClaytonWWilson/Listify NMerz 2020-10-09 00:11:56 -04:00
86975532bc Merge identical ListEntries NMerz 2020-10-09 00:11:44 -04:00
7a210f5ac9 Merge pull request #59 from ClaytonWWilson/master DreamCoder23 2020-10-08 21:00:43 -07:00
a01eb994bb Merge pull request #58 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-08 21:00:15 -07:00
4680103dd2 Can now display auth error message Aaron Sun 2020-10-08 20:59:15 -07:00
57ca4dbd85 Merge pull request #57 from ClaytonWWilson/master DreamCoder23 2020-10-08 20:15:33 -07:00
09735f5ce3 Merge pull request #56 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-08 20:14:56 -07:00
cd1dbf2589 Can now remove items from database Aaron Sun 2020-10-08 20:14:25 -07:00
38aea790d8 UserDeleter 'unit tests' Clayton Wilson 2020-10-08 23:07:53 -04:00
1d4704483f Merge pull request #55 from ClaytonWWilson/master DreamCoder23 2020-10-08 19:00:00 -07:00

... 2 3 4 5 6