Adam Ding
65e0b30eb2
Added temporary fix to ACCESS_FINE_LOCATION permission error
2020-12-03 14:54:57 -05:00
Adam Ding
3b1b787a7a
Added location finder in main.activity
2020-12-02 23:18:37 -05:00
Adam Ding
a60e26dc3a
Merge pull request #147 from ClaytonWWilson/update-tests-to-mockito
...
Update tests to mockito
2020-12-01 01:47:17 -05:00
Adam Ding
f9cc1b40a4
Fixed merge conflict in List.java
2020-12-01 01:46:22 -05:00
Adam Ding
fcc243faef
Added back curly brace to avoid illegal start of expression in List.java
2020-11-30 19:19:28 -05:00
Adam Ding
2b6af43cef
updated typo
2020-11-30 19:16:05 -05:00
Adam Ding
56ab66a3fc
Uncommented code to allow merge, in ListGetter and List
2020-11-30 19:11:17 -05:00
Adam Ding
81bb6623f9
Removed unused dependancy in TestItemGetter
2020-11-30 19:07:37 -05:00
Adam Ding
4048ca1ea6
Mocked TestItemGetter
2020-11-30 19:06:52 -05:00
Adam Ding
89ecda9f6b
Mocked ListShareTest
2020-11-30 18:53:05 -05:00
Adam Ding
8f3840e0d7
Mocked testlistentrydeleter
2020-11-30 18:45:10 -05:00
Adam Ding
00d740631c
Mocked testlistentryadder
2020-11-30 18:32:31 -05:00
Adam Ding
cff2bee7a5
Removed old tests
2020-11-30 17:35:56 -05:00
Adam Ding
b04be3a3c7
Mocked Test List Getter
2020-11-30 17:32:14 -05:00
Adam Ding
c5313f5753
Mocked List Delete
2020-11-30 17:25:40 -05:00
Adam Ding
bf1b0e0a98
Mocked List Adder
2020-11-30 16:42:50 -05:00
Aaron Sun
4c1446cc39
Merge pull request #145 from ClaytonWWilson/aaron-branch-2
...
Merge pull request #143 from ClaytonWWilson/master
2020-11-30 09:23:19 -08:00
Nathan Merz
98596389ee
Merge pull request #144 from ClaytonWWilson/lambda-robustness
...
Update list sharing
2020-11-30 12:22:19 -05:00
Nathan Merz
4e90bce03e
Merge branch 'master' into lambda-robustness
2020-11-30 12:17:35 -05:00
NMerz
be80129de6
Update list sharing
...
Fix quite a variety of bugs with list sharing, mostly relating to ListShareGET not conforming to its contract
2020-11-30 12:16:29 -05:00
Aaron Sun
47253d8e9e
Merge pull request #143 from ClaytonWWilson/master
...
Merge from master
2020-11-30 07:49:23 -08:00
Aaron Sun
c9ba570f96
Merge pull request #142 from ClaytonWWilson/aaron-branch-2
...
Merge pull request #139 from ClaytonWWilson/master
2020-11-30 07:48:38 -08:00
Nathan Merz
bea868628c
Merge pull request #141 from ClaytonWWilson/lambda-robustness
...
Fix other user email retrieval
2020-11-30 10:41:22 -05:00
NMerz
d8f722c4ac
Fix other user email retrieval
...
The id argument needs to actually be used
2020-11-30 10:40:38 -05:00
Nathan Merz
a4dafad334
Merge pull request #140 from ClaytonWWilson/lambda-robustness
...
Lambda robustness
2020-11-30 10:36:11 -05:00
NMerz
53570b3356
User retrieval updates
...
Make sure AuthManager always has the user email.
Make UserGET always return a User object.
2020-11-30 10:35:46 -05:00
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
NMerz
e528830474
Handle no access to list
...
Handle user not having access to list with many sharees
2020-11-29 21:42:53 -05:00
NMerz
0b85980d2a
User ease of use
...
Make email retrieveable client-facing
2020-11-29 21:41:38 -05: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
