Commit Graph

414 Commits

Author SHA1 Message Date
Aaron Sun
8fc461bb7a
Merge pull request #139 from ClaytonWWilson/master
Merge pull request #138 from ClaytonWWilson/aaron-branch-2
2020-11-29 18:44:49 -08:00
Aaron Sun
46b31b7103
Merge pull request #138 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-29 18:44:22 -08:00
Aaron Sun
5cb920f494 Can now share list in Sharee page 2020-11-29 16:46:25 -08:00
Aaron Sun
78186ffbc4 Can now view sharee IDs in Sharee page (need to change to email) 2020-11-29 16:04:27 -08:00
Aaron Sun
2c077698f7
Merge pull request #137 from ClaytonWWilson/master
Merge pull request #136 from ClaytonWWilson/aaron-branch-2
2020-11-29 13:01:30 -08:00
Aaron Sun
dc3d233711
Merge pull request #136 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-29 13:00:49 -08:00
Aaron Sun
2d453612cf
Merge branch 'master' into aaron-branch-2 2020-11-29 13:00:37 -08:00
Nathan Merz
c95b7259d1
Merge pull request #135 from ClaytonWWilson/profile-picture
Profile picture
2020-11-29 15:46:49 -05:00
NMerz
8ecee59da9 Make ListShareGET work
Fix absolute functionality-breaking bugs. There is still a fair amount of funkiness and lack of polish (such as having other and entried in the Lambda return).

In addition, the NULL uiPositions that got put in the database may need cleaning up manually.
2020-11-29 15:45:08 -05:00
NMerz
70195632f8 Store Profile Picture on AWS
Save the profile picture to AWS so that the user need not retrieve it every time.
2020-11-29 15:19:10 -05:00
NMerz
bede2fc1a0 ListShare compiling
Make ListShare compile again
2020-11-29 14:06:02 -05:00
578d360319
Merge pull request #134 from ClaytonWWilson/export-lists
Export lists to other apps
2020-11-29 13:42:02 -05:00
Clayton Wilson
d9dbe45d7b Export lists to other apps 2020-11-29 13:40:46 -05:00
d117bfd05f
Merge pull request #121 from ClaytonWWilson/improvements
Improvements
2020-11-29 12:56:27 -05:00
24253ec391
Merge branch 'master' into improvements 2020-11-29 12:56:12 -05:00
Clayton Wilson
b12509cf5b Display android sharesheet 2020-11-29 12:55:30 -05:00
6feef0ef22
Merge pull request #133 from ClaytonWWilson/duplicate-lists
Duplicate lists
2020-11-29 12:53:12 -05:00
Aaron Sun
5e48ba90ff Can now remove sharee from sharee list 2020-11-28 19:06:47 -08:00
Clayton Wilson
99a8d4ca9f Finished pull-to-refresh on list activity 2020-11-28 21:14:57 -05:00
Aaron Sun
19c925700a Can now view the Sharee page 2020-11-28 18:11:01 -08:00
Aaron Sun
96bac9b5bb Removed sharing option from list swiping (no longer needed) 2020-11-28 13:49:57 -08:00
Aaron Sun
ba8f249346 Displays ID of sharer next to shared list (need to change to email) 2020-11-28 11:43:19 -08:00
Clayton Wilson
cf4791badc Removed share button from sliding lists 2020-11-27 18:21:26 -05:00
Clayton Wilson
c0a93e3684 Rename list functionality 2020-11-27 18:13:37 -05:00
NMerz
b81f3b3fd6 Add profile picture on client
Display and allow for selection of profile picture
2020-11-27 17:35:17 -05:00
Clayton Wilson
0550ae4faf duplicate lists functionality 2020-11-27 15:08:21 -05:00
Aaron Sun
5b149f63ce
Merge pull request #132 from ClaytonWWilson/master
Merge pull request #131 from ClaytonWWilson/aaron-branch-2
2020-11-25 20:12:27 -08:00
Aaron Sun
f5d71a0fff
Merge pull request #131 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-25 20:11:59 -08:00
Aaron Sun
f573f9ff2c Message is displayed when shopping list is empty 2020-11-25 18:02:30 -08:00
Aaron Sun
a68ff731bb Shrunk the store headers a bit 2020-11-25 17:44:07 -08:00
Aaron Sun
1b8fba506f Changed background color of store headers 2020-11-25 17:05:11 -08:00
Aaron Sun
0d886a2c9c Store header now disappears in shopping list when all its items are removed 2020-11-25 16:38:11 -08:00
Aaron Sun
4f25ef564e
Merge pull request #130 from ClaytonWWilson/master
Merge pull request #129 from ClaytonWWilson/aaron-branch-2
2020-11-25 12:39:06 -08:00
Aaron Sun
f3a54336b9
Merge pull request #129 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-25 12:38:39 -08:00
Aaron Sun
ef527aef42 Added URL links to stores' official sites 2020-11-25 12:37:24 -08:00
Aaron Sun
95251d7115 Populated Store page with names of available stores 2020-11-25 12:28:16 -08:00
Aaron Sun
d7fb380b8a Populated Store page with package com.example.listify.ui.store; 2020-11-25 12:25:24 -08:00
Aaron Sun
efb0fe4cc3 Changed Store page icon 2020-11-24 19:25:47 -08:00
Aaron Sun
dc964d5cbd Added Stores page 2020-11-24 17:56:48 -08:00
Aaron Sun
b842dcb46e Alert now shows upon unsuccessful account deletion 2020-11-24 16:38:47 -08:00
Aaron Sun
9fa5f19b98 Auth error message no longer shifts button or password field 2020-11-24 12:19:39 -08:00
Aaron Sun
fe498ec0dc
Merge pull request #128 from ClaytonWWilson/master
Merge pull request #127 from ClaytonWWilson/aaron-branch-2
2020-11-24 10:58:58 -08:00
Aaron Sun
2e515e687f
Merge pull request #127 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-24 10:58:30 -08:00
Aaron Sun
5770ccf299 Fixed compilation errors 2020-11-24 10:57:57 -08:00
Aaron Sun
392a67eb45
Merge pull request #126 from ClaytonWWilson/master
Merge from master
2020-11-21 11:33:53 -08:00
Aaron Sun
2630fcf6b4
Merge pull request #125 from ClaytonWWilson/aaron-branch-2
Aaron branch 2
2020-11-21 11:33:19 -08:00
Nathan Merz
c596a87373
Merge pull request #118 from ClaytonWWilson/list-duplication
List duplication
2020-11-20 15:57:26 -05:00
Nathan Merz
0e6cdf85aa
Merge pull request #120 from ClaytonWWilson/list-renaming
List renaming
2020-11-20 15:57:08 -05:00
Nathan Merz
e3d0b639c3
Merge branch 'master' into list-renaming 2020-11-20 15:56:57 -05:00
Nathan Merz
b1184b1bf4
Merge pull request #117 from ClaytonWWilson/intra-list-ordering
Intra list ordering
2020-11-20 15:54:38 -05:00