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
|
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 |
|
|
|
058810f42f
|
Merge pull request #78 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
|
2020-10-31 21:13:24 -04:00 |
|
Clayton Wilson
|
bc66026bd3
|
Manual merge conflict bug fixes
|
2020-10-31 21:12:52 -04:00 |
|
|
|
a13f2d288f
|
Merge branch 'master' into aaron-branch-2
|
2020-10-31 20:58:25 -04:00 |
|
|
|
52e76be34a
|
Merge pull request #73 from ClaytonWWilson/search-filter
Search filter
|
2020-10-31 20:48:06 -04:00 |
|
Clayton Wilson
|
fdb1ea6213
|
Fix branch merge bug
|
2020-10-31 20:47:48 -04:00 |
|
|
|
7cb7f5f468
|
Merge branch 'master' into search-filter
|
2020-10-31 20:40:19 -04:00 |
|
|
|
d7a86aac7d
|
Merge pull request #74 from ClaytonWWilson/total-price-bar
Floating total price bar
|
2020-10-31 20:35:43 -04:00 |
|
Clayton Wilson
|
1f7a1b10db
|
Remove print statements
|
2020-10-31 20:35:31 -04:00 |
|
Clayton Wilson
|
d9ea934021
|
Fix total price being incorrect
|
2020-10-31 20:34:54 -04:00 |
|
Aaron Sun
|
4b8561ebd7
|
Removed my grand total code (Clayton's job) and reformatted shopping list page
|
2020-10-31 17:25:56 -07:00 |
|
|
|
1f2ea26efe
|
Merge branch 'master' into total-price-bar
|
2020-10-31 20:21:00 -04:00 |
|
|
|
19fdd96b76
|
Merge pull request #69 from ClaytonWWilson/async-loading
Async loading
|
2020-10-31 20:11:36 -04:00 |
|
Clayton Wilson
|
8364ed049b
|
Fixed formatting from merge
|
2020-10-31 20:10:09 -04:00 |
|
|
|
4a43b84aba
|
Merge branch 'master' into async-loading
|
2020-10-31 20:05:18 -04:00 |
|
Clayton Wilson
|
739699d7a5
|
Explicitly declared inner loop variables to final
|
2020-10-31 19:54:11 -04:00 |
|
Nathan Merz
|
3b8e13e84c
|
Merge pull request #70 from ClaytonWWilson/item-search-limit
Limit item search results
|
2020-10-31 19:16:18 -04:00 |
|
NMerz
|
8233a989ef
|
ListDELETE lambda
List deletion now working
Integration tested independently.
Still needs tests and user deletion should now use this.
|
2020-10-31 14:54:42 -04:00 |
|
Aaron Sun
|
7cf6c0534a
|
Merge pull request #76 from ClaytonWWilson/master
Merge pull request #72 from ClaytonWWilson/aaron-branch-2
|
2020-10-27 11:07:13 -07:00 |
|
Aaron Sun
|
7c6045ba46
|
Merge pull request #72 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
|
2020-10-27 11:06:42 -07:00 |
|
Aaron Sun
|
2c73e8b224
|
Properly formatted the price values in shopping list
|
2020-10-25 23:27:25 -07:00 |
|
Aaron Sun
|
049d95bb91
|
Can now clear shopping list (i.e. remove all items)
|
2020-10-25 22:39:56 -07:00 |
|
Aaron Sun
|
0562c66dbb
|
Can now display the grand total of items in shopping list
|
2020-10-25 22:15:27 -07:00 |
|
Aaron Sun
|
a3e72d3699
|
Shopping list can now display actual image of item
|
2020-10-25 21:47:48 -07:00 |
|
|
|
04a944f2d5
|
Update total price when quantities change and items are removed
|
2020-10-25 23:06:56 -04:00 |
|
|
|
caf929a71e
|
Floating total price bar
|
2020-10-25 22:52:35 -04:00 |
|
|
|
07db1c833a
|
Fix duplicate lists displaying
|
2020-10-25 21:57:57 -04:00 |
|
|
|
9462bc6723
|
Price range filtering finished
|
2020-10-25 21:19:02 -04:00 |
|
Aaron Sun
|
7bc43d8249
|
Simplified a section of code for total price by store (used HashMap to access header section)
|
2020-10-25 16:15:42 -07:00 |
|
|
|
c07599ecc6
|
Add threads in awaited for loops. Remove new threads from Requestor.getObject calls
|
2020-10-25 16:53:51 -04:00 |
|
Aaron Sun
|
8afa81db59
|
Total prices change on the spot after changing quantity and removing items
|
2020-10-24 16:14:17 -07:00 |
|
Aaron Sun
|
6fe3110c29
|
Can now display the total price of the items from each store in shopping list
|
2020-10-24 12:40:28 -07:00 |
|
