|
|
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 |
|
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
|
9616c7a572
|
Display checkbox listview for filtering store selection
|
2020-11-01 02:42:02 -05:00 |
|
Clayton Wilson
|
33c3d8c56e
|
Filtering search results is disabled until there are results to filter
|
2020-11-01 00:51:38 -04: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 |
|
Clayton Wilson
|
e392820404
|
Default can be sorted descending
|
2020-10-31 19:36:45 -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 |
|
