Commit Graph

  • cd13f96be4 Merge pull request #54 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-08 18:59:27 -07:00
  • 725724738e Halfway through removing items from database Aaron Sun 2020-10-08 18:58:50 -07:00
  • 5cf3a6a647 Allow for deleting an instance of a class NMerz 2020-10-08 21:40:09 -04:00
  • 22a39c7ed7 Merge pull request #53 from ClaytonWWilson/APIUnitTests Nathan Merz 2020-10-08 21:28:54 -04:00
  • 69df93fb9f Clean up double toStrings NMerz 2020-10-08 21:28:28 -04:00
  • 2099fb72b1 Merge pull request #52 from ClaytonWWilson/master DreamCoder23 2020-10-08 18:22:50 -07:00
  • 2028e5c628 Merge pull request #51 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-08 18:21:55 -07:00
  • 6e57f34581 Can now change password Aaron Sun 2020-10-08 18:21:27 -07:00
  • 981fb9ebda Update search results and item details layout Clayton Wilson 2020-10-08 20:54:12 -04:00
  • 379a45fcd0 Merge pull request #46 from ClaytonWWilson/connect-to-db Clayton Wilson 2020-10-08 20:11:04 -04:00
  • 2c9eaee1be Removed hardcoded db interaction Clayton Wilson 2020-10-08 20:10:28 -04:00
  • 53e603dc46 Merge pull request #50 from ClaytonWWilson/master DreamCoder23 2020-10-08 17:04:40 -07:00
  • 6311a8cdde Merge pull request #49 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-08 17:04:02 -07:00
  • 98eadc6a70 Merge pull request #45 from ClaytonWWilson/PasswordReset DreamCoder23 2020-10-08 17:03:26 -07:00
  • 720415d832 Merge pull request #48 from ClaytonWWilson/master DreamCoder23 2020-10-08 16:58:39 -07:00
  • 5b8e255a7e Merge pull request #47 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-08 16:58:06 -07:00
  • 83a929fd51 Can now delete account Aaron Sun 2020-10-08 16:57:01 -07:00
  • 73639b50e2 Connect ListsFragment to ListPage Clayton Wilson 2020-10-08 19:37:48 -04:00
  • e16fafeaa0 Merge branch 'master' into connect-to-db Clayton Wilson 2020-10-08 19:29:11 -04:00
  • 96c3f2772d Fixes for create list dialog Clayton Wilson 2020-10-08 19:27:16 -04:00
  • 35dd4a5106 Add backend password reset functionality NMerz 2020-10-08 19:26:05 -04:00
  • 96760bd9f1 Merge pull request #44 from ClaytonWWilson/master DreamCoder23 2020-10-08 16:12:18 -07:00
  • b68e22ee23 Merge pull request #43 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-08 16:11:28 -07:00
  • 3f0f415806 Merge branch 'master' into aaron-branch DreamCoder23 2020-10-08 16:11:15 -07:00
  • 38d954fb28 Merge pull request #41 from ClaytonWWilson/APIUnitTests Nathan Merz 2020-10-08 19:10:29 -04:00
  • 9c1eb06f02 Merge branch 'master' into APIUnitTests Nathan Merz 2020-10-08 19:10:16 -04:00
  • d3571cec3d db connections finished hardcoded Clayton Wilson 2020-10-08 19:08:20 -04:00
  • d14383ff2e Test id retrieval NMerz 2020-10-08 19:07:02 -04:00
  • b07fead480 Lambda Delete Tests NMerz 2020-10-08 19:01:09 -04:00
  • d071a0ceb3 Update Item to contract NMerz 2020-10-08 18:42:32 -04:00
  • c9c07607b6 Update ListEntry contract NMerz 2020-10-08 18:40:09 -04:00
  • d293864d04 Fixing List UI-API connection v.1 Aaron Sun 2020-10-08 15:34:10 -07:00
  • 508818c700 Lambda unit test infrastructure NMerz 2020-10-08 18:34:06 -04:00
  • 762e7907b8 Connect search, lists, and itemDetails to db with hardcoded user Clayton Wilson 2020-10-08 18:03:06 -04:00
  • c5bb117136 User delete lambda Clayton Wilson 2020-10-08 17:49:50 -04:00
  • 3feb8a4317 Shift ItemEntry columns for listID NMerz 2020-10-08 17:08:10 -04:00
  • 925a249b4c user delete debugging Clayton Wilson 2020-10-08 12:34:14 -04:00
  • 2d80ff2282 Connected List UI with API Aaron Sun 2020-10-07 21:21:59 -07:00
  • fad60c6b90 Merge pull request #42 from ClaytonWWilson/hamburger-menu-additions Clayton Wilson 2020-10-07 22:06:04 -04:00
  • bdaeb94daf Add create list dialog to various buttons Clayton Wilson 2020-10-07 21:59:23 -04:00
  • 55f8cf60d2 Merge branch 'master' into hamburger-menu-additions Clayton Wilson 2020-10-07 21:08:44 -04:00
  • 053992f909 Merge pull request #33 from ClaytonWWilson/item-details-page Clayton Wilson 2020-10-07 20:57:29 -04:00
  • c9751d4f95 Add Core Lambda Unit tests NMerz 2020-10-07 00:04:17 -04:00
  • 0ef75e3461 Merge pull request #38 from ClaytonWWilson/ClientLambdas Nathan Merz 2020-10-06 21:55:37 -04:00
  • a43776e5dc Enforce schema matching NMerz 2020-10-06 21:54:04 -04:00
  • 56c9a3f99d Switch to millis for times NMerz 2020-10-06 21:39:23 -04:00
  • 6b3a645b4a Merge pull request #40 from ClaytonWWilson/master DreamCoder23 2020-10-06 18:37:24 -07:00
  • da14953daf Merge pull request #39 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-06 18:36:52 -07:00
  • dcea8aa58e Can now remove items from list Aaron Sun 2020-10-06 18:36:14 -07:00
  • 797d657632 Added function to get product id's Krogger-getProduct-api Adam Ding 2020-10-06 20:04:48 -04:00
  • 94e636f1d5 Can now change quantity of items Aaron Sun 2020-10-06 14:39:21 -07:00
  • 68051fdaca Item Search V1 NMerz 2020-10-05 22:54:43 -04:00
  • 366f347e03 Merge pull request #37 from ClaytonWWilson/master DreamCoder23 2020-10-05 19:38:14 -07:00
  • abe0328f96 Merge pull request #36 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-05 19:37:48 -07:00
  • d5cd854dc9 Merge remote-tracking branch 'origin/master' into aaron-branch Aaron Sun 2020-10-05 19:37:10 -07:00
  • 92c9108f90 Merge pull request #30 from ClaytonWWilson/ClientLambdas Nathan Merz 2020-10-05 22:30:24 -04:00
  • c96a40f0df Disable examples NMerz 2020-10-05 22:30:12 -04:00
  • 8c526d3b8d SignOut and forced signout on delete NMerz 2020-10-05 22:27:24 -04:00
  • 59764eb41b Merge pull request #35 from ClaytonWWilson/master DreamCoder23 2020-10-05 19:07:42 -07:00
  • ce24e2861c Merge pull request #34 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-05 19:07:03 -07:00
  • 9f992ee8ee Merge remote-tracking branch 'origin/master' into aaron-branch Aaron Sun 2020-10-05 19:06:29 -07:00
  • c2bac194f8 Remove auto-generated Android Studio files Clayton Wilson 2020-10-05 21:58:04 -04:00
  • e0fa35bb45 Merge branch 'aaron-branch' into ClientLambdas NMerz 2020-10-05 21:52:20 -04:00
  • b16f0ce413 Merge branch 'master' into item-details-page Clayton Wilson 2020-10-05 21:51:23 -04:00
  • ea9eabd398 Create-new-list dialog added to item details page Clayton Wilson 2020-10-05 21:49:21 -04:00
  • 5fe666fbbb Add-to-list dialog and functionality on item details page Clayton Wilson 2020-10-05 21:24:50 -04:00
  • 99cb715500 Merge pull request #32 from ClaytonWWilson/Krogger-Auth-Token Adam Ding 2020-10-05 20:13:19 -04:00
  • 12bee4c48c Add floating action button to lists fragment Clayton Wilson 2020-10-05 19:57:39 -04:00
  • fe846fb81f Delete Lambda prototype NMerz 2020-10-05 12:29:28 -04:00
  • dd13995ffe Fix bug in search results sorting Clayton Wilson 2020-10-04 21:17:02 -04:00
  • 4a1bab2001 Display users lists Clayton Wilson 2020-10-04 19:48:00 -04:00
  • cfa558bb34 Removed main method out of file Krogger-Auth-Token Adam Ding 2020-10-04 15:48:22 -04:00
  • 4636a1b419 Added get function to get Krogger Auth token Adam Ding 2020-10-04 15:45:21 -04:00
  • 64d4fb0192 Fix search results not filtering by store selection Clayton Wilson 2020-10-04 00:47:27 -04:00
  • afe15703ee Adapter and ShoppingList class for displaying shopping lists Clayton Wilson 2020-10-04 00:13:31 -04:00
  • 1907dc6ce5 Merge branch 'master' into ClientLambdas NMerz 2020-10-03 23:05:26 -04:00
  • 81b4673766 Lamdba Integration NMerz 2020-10-03 23:00:19 -04:00
  • b269bc6e78 Item details layout Clayton Wilson 2020-10-03 21:50:21 -04:00
  • 1f361cf401 Finish V1 of List and Item Lambdas NMerz 2020-10-03 18:35:27 -04:00
  • 790d935e40 Layout for item details page Clayton Wilson 2020-10-03 17:48:28 -04:00
  • f107ab023d GET strcuture NMerz 2020-10-03 17:37:46 -04:00
  • b951983112 Fix for long titles on search results Clayton Wilson 2020-10-03 16:52:11 -04:00
  • 6051be68d8 Merge pull request #29 from ClaytonWWilson/master DreamCoder23 2020-10-03 13:29:22 -07:00
  • 27f22a9724 Merge pull request #28 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-03 13:28:52 -07:00
  • 9228f6876a Able to display List page Aaron Sun 2020-10-03 13:28:13 -07:00
  • 69572b3a1f Generify endpoint groups as IntelliJ Modules NMerz 2020-10-03 11:22:35 -04:00
  • b498220d9f Fixed search results not being cleared after new search Clayton Wilson 2020-10-03 01:34:26 -04:00
  • 387afc9670 Merge pull request #27 from ClaytonWWilson/master DreamCoder23 2020-10-02 20:02:34 -07:00
  • c0c2d599f8 Merge pull request #26 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-02 20:01:38 -07:00
  • a013a75924 Connected auth API to UI Aaron Sun 2020-10-02 20:00:52 -07:00
  • fb7fb9b98f Merge pull request #25 from ClaytonWWilson/master DreamCoder23 2020-10-01 12:57:49 -07:00
  • 47dab12c24 Merge pull request #24 from ClaytonWWilson/aaron-branch DreamCoder23 2020-10-01 12:54:54 -07:00
  • d9f1130c97 Added List UI page Aaron Sun 2020-10-01 12:54:10 -07:00
  • dff6c9deb3 Merge pull request #23 from ClaytonWWilson/display-search-results Clayton Wilson 2020-10-01 15:45:34 -04:00
  • 2119b63696 Merge remote-tracking branch 'origin/master' into display-search-results Clayton Wilson 2020-10-01 15:43:05 -04:00
  • ef2a58d23f Layout for sort and filter dialog on search results page Clayton Wilson 2020-10-01 15:34:34 -04:00
  • 68524fbc76 Added Code page and restructured the button flow DreamCoder23 2020-09-30 17:41:58 -07:00
  • 5f05c8bc26 Merge pull request #21 from ClaytonWWilson/aaron-branch DreamCoder23 2020-09-30 17:41:19 -07:00
  • 1b8c08bb62 Added Code page and restructured the button flow Aaron Sun 2020-09-30 17:37:35 -07:00
  • fcbec9617b Added Forgot Password and Reset Password pages DreamCoder23 2020-09-30 11:58:46 -07:00