Commit Graph

Select branches

Hide Pull Requests

Krogger-Auth-Token

Krogger-getProduct-api

aaron-branch

aaron-branch-2

chain-get-ids

duplicate-lists

fix-listshare

fix-price-reset2

intra-list-ordering

lambda-robustness

list-duplication

list-renaming

master

profile-picture

readmes

rearrange-lists

search-history

share-confirm-done

sharing-permissions

test-new-lambdas

update-tests-to-mockito

update-user-location

#1

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#110

#111

#112

#113

#115

#117

#118

#119

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• 8cc83d9259 Removed extra spaces aaron-branch-2 Aaron Sun 2021-02-17 12:47:43 -0800
• cbc9db73cd Changed (unused) gallery and slideshow code to Kotlin Aaron Sun 2021-02-17 11:40:47 -0800
• 5da20048a5 Changed forgot password code to Kotlin Aaron Sun 2021-02-16 19:46:10 -0800
• 9801420be8 Changed sign up code to Kotlin Aaron Sun 2021-02-16 19:39:24 -0800
• 1a58b9213d Changed log in code to Kotlin Aaron Sun 2021-02-16 19:29:30 -0800
• a9bfd86ed5 Changed splash screen code to Kotlin in new repo Aaron Sun 2021-02-16 19:07:58 -0800
• 60784629b7 Reverted Kotlin back to Java for this repo Aaron Sun 2021-02-16 18:38:00 -0800
• aee8596a0a Added back old code for splash screen as a backup Aaron Sun 2021-02-16 10:35:34 -0800
• c42bd9a572 Added screenshots of application to README Aaron Sun 2021-02-15 22:03:49 -0800
• bc9a91fdbf Changed splash screen code to Kotlin Aaron Sun 2021-02-15 22:01:38 -0800
• 9a0baa3930
  Update README.md master Clayton Wilson 2021-01-07 06:14:14 -0500
• 2e940b7b0e Added screenshots Clayton Wilson 2021-01-07 06:02:09 -0500
• f5a09af505
  Merge pull request #178 from aaronrsun/aaron-branch-2 Aaron Sun 2020-12-16 19:37:18 -0800
• 1b39cfa17e
  Merge pull request #177 from aaronrsun/master Aaron Sun 2020-12-16 19:36:22 -0800
• 4c3f04bc3f Reconfigured AWS Aaron Sun 2020-12-16 19:33:20 -0800
• f109a23ae1
  Merge pull request #2 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-16 10:41:05 -0800
• 8ee769eaf7
  Merge pull request #1 from ClaytonWWilson/master Aaron Sun 2020-12-16 10:40:24 -0800
• 7a52792fd3
  Merge pull request #176 from ClaytonWWilson/master Aaron Sun 2020-12-16 10:39:21 -0800
• 6a05fe1f44
  Merge pull request #175 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-16 10:38:49 -0800
• 3a6ebce1c5
  Merge pull request #160 from ClaytonWWilson/search-suggestions Clayton Wilson 2020-12-04 13:47:29 -0500
• a25c435985
  Merge pull request #174 from ClaytonWWilson/master Aaron Sun 2020-12-04 10:01:53 -0800
• cf6f935a23
  Merge pull request #173 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-04 10:01:08 -0800
• 2d4f4faf9f
  Merge pull request #172 from ClaytonWWilson/test-new-lambdas Adam Ding 2020-12-04 12:30:33 -0500
• ba4489eea1 Fixed testlistadder test test-new-lambdas Adam Ding 2020-12-04 12:29:19 -0500
• c81355d6cb
  Merge pull request #171 from ClaytonWWilson/test-new-lambdas Adam Ding 2020-12-04 12:26:04 -0500
• 77e8e9f8dc Merge branch 'master' of https://github.com/ClaytonWWilson/Listify NMerz 2020-12-04 12:25:18 -0500
• 645cdc90f9 Ready for presentation NMerz 2020-12-04 12:25:14 -0500
• 7434ddfdde Merge branch 'master' into test-new-lambdas Adam Ding 2020-12-04 12:09:04 -0500
• 6ed94ea4e5 Fixed failing tests Adam Ding 2020-12-04 12:08:19 -0500
• e6e163b826
  Move Chain module readme Nathan Merz 2020-12-04 11:47:37 -0500
• 0087068a13
  Merge pull request #170 from ClaytonWWilson/master Aaron Sun 2020-12-03 23:02:24 -0800
• 21277e1f76
  Merge pull request #169 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-03 23:02:01 -0800
• 075a8d8d36
  Merge pull request #168 from ClaytonWWilson/master Aaron Sun 2020-12-03 23:01:35 -0800
• eedb1a6895
  Merge pull request #167 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-03 23:01:03 -0800
• 433ad774f3 Restored list page code back to version ba8f249 Aaron Sun 2020-12-03 22:51:05 -0800
• 5312bd3b8e Changed share indication on list page Aaron Sun 2020-12-03 20:17:26 -0800
• 283401370f
  Merge pull request #166 from ClaytonWWilson/master Aaron Sun 2020-12-03 19:51:17 -0800
• f8e2a2f0fe
  Merge pull request #165 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-03 19:50:16 -0800
• 964864f0fc Fixed the links to the store sites Aaron Sun 2020-12-03 19:49:30 -0800
• cc2c82961d Merge branch 'master' of https://github.com/ClaytonWWilson/Listify NMerz 2020-12-03 22:05:57 -0500
• 6f003fe56c Add profile picture deletion NMerz 2020-12-03 22:05:49 -0500
• 6723f5afd7
  Delete .DS_Store Nathan Merz 2020-12-03 22:04:30 -0500
• a57e4888ce
  Delete .DS_Store Nathan Merz 2020-12-03 22:03:59 -0500
• 337372f5f3
  Merge pull request #164 from ClaytonWWilson/readmes Nathan Merz 2020-12-03 22:03:39 -0500
• daed849163
  Create User module readme readmes Nathan Merz 2020-12-03 22:03:04 -0500
• dd2a8413a9
  ListShare module readme Nathan Merz 2020-12-03 21:49:13 -0500
• 8df214de65
  Create ListEntry module readme Nathan Merz 2020-12-03 21:35:49 -0500
• 754935171e
  Create List module readme Nathan Merz 2020-12-03 21:25:52 -0500
• 2bda779fe9
  Delete Lists.jar Nathan Merz 2020-12-03 21:24:12 -0500
• a81eed7946
  Spelling fix Nathan Merz 2020-12-03 21:06:28 -0500
• 042679d4a9
  Add ItemSearch readme Nathan Merz 2020-12-03 21:01:42 -0500
• f4d823f096
  Finish specifying parameter values for Chain module Nathan Merz 2020-12-03 20:54:20 -0500
• d067392458
  Make link point at master Nathan Merz 2020-12-03 20:52:57 -0500
• 3ea118ace2
  Create README.md Nathan Merz 2020-12-03 20:52:33 -0500
• d56fed35a0
  Create Chain module readme Nathan Merz 2020-12-03 20:43:43 -0500
• c23b980ff2 Added links to store sites in Store page Aaron Sun 2020-12-03 17:34:56 -0800
• 81a69291fe Moved share option into shopping list menu Aaron Sun 2020-12-03 17:10:59 -0800
• 9a025c99ca
  Merge pull request #163 from ClaytonWWilson/master Aaron Sun 2020-12-03 16:50:09 -0800
• 3053ce5913
  Merge pull request #162 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-03 16:49:30 -0800
• 71b84a9854 Limit list text view so it doesn't go over number of items text Aaron Sun 2020-12-03 16:26:36 -0800
• 4c2fd8844d Display logos in Stores page Aaron Sun 2020-12-03 15:51:34 -0800
• 12db93ae81 List Lambda compilable NMerz 2020-12-03 18:10:15 -0500
• 35f6d9daa0 Fix null id on user retrieval NMerz 2020-12-03 17:49:32 -0500
• 7c23d3dfdf
  Merge pull request #161 from ClaytonWWilson/update-user-location Adam Ding 2020-12-03 14:55:30 -0500
• 65e0b30eb2 Added temporary fix to ACCESS_FINE_LOCATION permission error update-user-location Adam Ding 2020-12-03 14:54:57 -0500
• 2df2d0bfff
  Merge branch 'master' into search-suggestions Clayton Wilson 2020-12-03 14:23:09 -0500
• e40eceb0c2
  Merge pull request #159 from ClaytonWWilson/share-confirm-done Nathan Merz 2020-12-03 10:11:15 -0500
• 6e653b4ae2 Finish share confirmation page share-confirm-done NMerz 2020-12-03 10:10:51 -0500
• e6af05a6b4 Fix gradle config NMerz 2020-12-03 08:24:27 -0500
• ebb2fe4fcc Merge branch 'share-confirm' NMerz 2020-12-03 08:24:20 -0500
• ebdea163ee
  Merge pull request #158 from ClaytonWWilson/update-user-location Adam Ding 2020-12-02 23:20:47 -0500
• 3b1b787a7a Added location finder in main.activity Adam Ding 2020-12-02 23:18:37 -0500
• 2478a6c49a
  Merge pull request #157 from ClaytonWWilson/master Aaron Sun 2020-12-02 15:29:41 -0800
• 72c35dfe71
  Merge pull request #156 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-02 15:29:13 -0800
• 4379216667
  Merge pull request #155 from ClaytonWWilson/master Aaron Sun 2020-12-02 15:28:52 -0800
• 5e7222a2f1
  Merge pull request #154 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-02 15:28:04 -0800
• 93978c46d8
  Merge pull request #153 from ClaytonWWilson/master Aaron Sun 2020-12-02 15:27:35 -0800
• 8c11a3328f
  Merge pull request #152 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-02 15:27:07 -0800
• 19731cebcf Removed owner from sharee list Aaron Sun 2020-12-02 15:20:06 -0800
• fe8d6cbae6 Sharee lists updates on the spot after adding or deleting sharee Aaron Sun 2020-12-02 15:12:50 -0800
• a01c6f6d9c
  Merge pull request #151 from ClaytonWWilson/master Aaron Sun 2020-12-02 15:03:36 -0800
• 6987a251fb
  Merge pull request #150 from ClaytonWWilson/aaron-branch-2 Aaron Sun 2020-12-02 15:03:09 -0800
• 76b7aace39
  Merge branch 'master' into aaron-branch-2 Aaron Sun 2020-12-02 15:02:59 -0800
• ad12fd3947
  Merge pull request #149 from ClaytonWWilson/fix-listshare Nathan Merz 2020-12-02 17:58:52 -0500
• 634234b219 Fix skipping second member fix-listshare NMerz 2020-12-02 17:43:20 -0500
• 722a5828ff Share confirm base layout NMerz 2020-12-02 17:01:37 -0500
• 167b369749
  Merge pull request #148 from ClaytonWWilson/test-new-lambdas Adam Ding 2020-12-01 21:13:10 -0500
• 7bdd65b122 Uncommented code in List.java and ListGetter.java to prevent merge conflict Adam Ding 2020-12-01 21:12:42 -0500
• 337c2e117b Picture tests addec Adam Ding 2020-12-01 21:11:25 -0500
• 8385888075 ChainGetter tests added Adam Ding 2020-12-01 21:00:10 -0500
• e3d4e931b0 TestSearchHistory tests added Adam Ding 2020-12-01 20:53:32 -0500
• 9e22d5388d ListItemSearcher tests added Adam Ding 2020-12-01 20:42:50 -0500
• 16e4805d2c ListReposition tests added Adam Ding 2020-12-01 20:26:36 -0500
• 0c3839cec3 ListDuplicate tests added Adam Ding 2020-12-01 20:09:49 -0500
• 4b1f06cdcd ListDuplicate tests added Adam Ding 2020-12-01 20:09:08 -0500
• a60e26dc3a
  Merge pull request #147 from ClaytonWWilson/update-tests-to-mockito Adam Ding 2020-12-01 01:47:17 -0500
• f9cc1b40a4 Fixed merge conflict in List.java update-tests-to-mockito Adam Ding 2020-12-01 01:46:22 -0500
• fcc243faef Added back curly brace to avoid illegal start of expression in List.java Adam Ding 2020-11-30 19:19:28 -0500
• 2b6af43cef updated typo Adam Ding 2020-11-30 19:16:05 -0500
• 56ab66a3fc Uncommented code to allow merge, in ListGetter and List Adam Ding 2020-11-30 19:11:17 -0500