ClaytonWWilson/Listify
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Listify.git synced 2025-12-15 18:28:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
469 Commits 22 Branches 0 Tags 35 MiB
share-confirm-done
Commit Graph

469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NMerz
6e653b4ae2 Finish share confirmation page 
Adding nav and info passing
 2020-12-03 10:10:51 -05:00
NMerz
e6af05a6b4 Fix gradle config 2020-12-03 08:24:27 -05:00
NMerz
ebb2fe4fcc Merge branch 'share-confirm' 2020-12-03 08:24:20 -05:00
Adam Ding
ebdea163ee
Merge pull request #158 from ClaytonWWilson/update-user-location 
Added location finder in main.activity
 2020-12-02 23:20:47 -05:00
Adam Ding
3b1b787a7a Added location finder in main.activity 2020-12-02 23:18:37 -05:00
Aaron Sun
72c35dfe71
Merge pull request #156 from ClaytonWWilson/aaron-branch-2 
Merge pull request #155 from ClaytonWWilson/master
 2020-12-02 15:29:13 -08:00
Aaron Sun
4379216667
Merge pull request #155 from ClaytonWWilson/master 
Merge pull request #154 from ClaytonWWilson/aaron-branch-2
 2020-12-02 15:28:52 -08:00
Aaron Sun
5e7222a2f1
Merge pull request #154 from ClaytonWWilson/aaron-branch-2 
Merge pull request #153 from ClaytonWWilson/master
 2020-12-02 15:28:04 -08:00
Aaron Sun
93978c46d8
Merge pull request #153 from ClaytonWWilson/master 
Merge pull request #152 from ClaytonWWilson/aaron-branch-2
 2020-12-02 15:27:35 -08:00
Aaron Sun
8c11a3328f
Merge pull request #152 from ClaytonWWilson/aaron-branch-2 
Aaron branch 2
 2020-12-02 15:27:07 -08:00
Aaron Sun
19731cebcf Removed owner from sharee list 2020-12-02 15:20:06 -08:00
Aaron Sun
fe8d6cbae6 Sharee lists updates on the spot after adding or deleting sharee 2020-12-02 15:12:50 -08:00
Aaron Sun
a01c6f6d9c
Merge pull request #151 from ClaytonWWilson/master 
Merge pull request #150 from ClaytonWWilson/aaron-branch-2
 2020-12-02 15:03:36 -08:00
Aaron Sun
6987a251fb
Merge pull request #150 from ClaytonWWilson/aaron-branch-2 
Aaron branch 2
 2020-12-02 15:03:09 -08:00
Aaron Sun
76b7aace39
Merge branch 'master' into aaron-branch-2 2020-12-02 15:02:59 -08:00
Nathan Merz
ad12fd3947
Merge pull request #149 from ClaytonWWilson/fix-listshare 
Fix skipping second member
 2020-12-02 17:58:52 -05:00
NMerz
634234b219 Fix skipping second member 
(and missing list entry)
 2020-12-02 17:43:20 -05:00
NMerz
722a5828ff Share confirm base layout 2020-12-02 17:01:37 -05:00
Adam Ding
167b369749
Merge pull request #148 from ClaytonWWilson/test-new-lambdas 
Adding new lambda tests
 2020-12-01 21:13:10 -05:00
Adam Ding
7bdd65b122 Uncommented code in List.java and ListGetter.java to prevent merge conflict 2020-12-01 21:12:42 -05:00
Adam Ding
337c2e117b Picture tests addec 2020-12-01 21:11:25 -05:00
Adam Ding
8385888075 ChainGetter tests added 2020-12-01 21:00:10 -05:00
Adam Ding
e3d4e931b0 TestSearchHistory tests added 2020-12-01 20:53:32 -05:00
Adam Ding
9e22d5388d ListItemSearcher tests added 2020-12-01 20:42:50 -05:00
Adam Ding
16e4805d2c ListReposition tests added 2020-12-01 20:26:36 -05:00
Adam Ding
0c3839cec3 ListDuplicate tests added 2020-12-01 20:09:49 -05:00
Adam Ding
4b1f06cdcd ListDuplicate tests added 2020-12-01 20:09:08 -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
Aaron Sun
9570e1e180 Displays email of sharer next to shared list 2020-11-30 13:53:02 -08:00
Adam Ding
bf1b0e0a98 Mocked List Adder 2020-11-30 16:42:50 -05:00
Aaron Sun
49ab4e7ff1
Merge pull request #146 from ClaytonWWilson/master 
Merge from master
 2020-11-30 09:23:50 -08: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