{"push_id":1093302025,"size":19,"distinct_size":3,"ref":"refs/heads/web-admin-ben","head":"abba77dc565deb8e6e3c1581e498347691353f73","before":"a1f21d86d0af38e640545b57f464759c10ac2f83","commits":[{"sha":"da8501156cd1858fd90c48b07e279e9ca35b10d6","author":{"email":"e67fc259327b6b6e90cd911b9c10157ef7d529c2@vt.edu","name":"Daniel Gilley"},"message":"Moved BadParamExceptions from EventWorker to EventController to keep Glassfish from eating them.","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/da8501156cd1858fd90c48b07e279e9ca35b10d6"},{"sha":"70ff6ea0013b74d798b3f9ba9e49c476c773d7fe","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Merge branch 'Endpoints-daniel' into Endpoints-greg\n\n* Endpoints-daniel:\n  Moved BadParamExceptions from EventWorker to EventController to keep Glassfish from eating them.","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/70ff6ea0013b74d798b3f9ba9e49c476c773d7fe"},{"sha":"74adf8a7a5b7b16ff8e9da6773404c7788f2d7f6","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Merge branch 'auth-greg' into Endpoints-greg\n\n* auth-greg:\n  Comments\n  small bug fix\n  Added dummy data and credentials\n  Basic working configuration for auth Auth handles by JWT Currently will short circuit REST auth if request is coming from localhost\n  Transition to JWT\n  Still having some issues with injection into the filter\n  #AuthIsHard\n  Basic Auth JPA Entities setup\n  initial auth file\n\n# Conflicts:\n#\tsrc/java/com/abcdaycare/restcontroller/EventController.java","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/74adf8a7a5b7b16ff8e9da6773404c7788f2d7f6"},{"sha":"75888793a71aaf90c5277503d27889920faf8650","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Event Service rework\nChanged the Event Worker so the it now parses using GSON","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/75888793a71aaf90c5277503d27889920faf8650"},{"sha":"a978aea7bf6beea375efe0b986ce030bc076f464","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"removed dummy endpoint","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/a978aea7bf6beea375efe0b986ce030bc076f464"},{"sha":"9f3d6f73a65a186f946826ae7777ebab8c8540cb","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Merge branch 'auth-greg' into Endpoints-greg\n\n* auth-greg:\n  Changed user auth method for web\n  Updated dummy data to have username as the email","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/9f3d6f73a65a186f946826ae7777ebab8c8540cb"},{"sha":"9e685ee83ea6a66d11164493cf9729c0b5db5269","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Merge branch 'master' into Endpoints-greg\n\n* master:\n  Fixed local file path\n  Removed print statement\n  done with sql statements.\n  events join child almost done\n  updated all sql statements except eventJoinChild. Will do that later. Also made some comments in the sql statements about things we should think about.\n  this literally takes forever\n  sql statements actually take awhile to think of things\n  still working on the sql statements (making more \"real\")\n  Added Database schemas to repo","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/9e685ee83ea6a66d11164493cf9729c0b5db5269"},{"sha":"bf066c895078848025c7137a8124001ec7211307","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Tag updates are reflected in the child medical status","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/bf066c895078848025c7137a8124001ec7211307"},{"sha":"dbfef71a84240515b87d3fca84ebdb742156f355","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Cleaned up child controller","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/dbfef71a84240515b87d3fca84ebdb742156f355"},{"sha":"7dd8178cbae53daa36a337bb3f5097708094fc86","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Improved error handling with events\nFixed bug that allowed children to be added to the provider group\nimplmented forced event types for checkin and check out events","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/7dd8178cbae53daa36a337bb3f5097708094fc86"},{"sha":"9abc9f854d1f1e2c8d85e25ce1fd6e276baee379","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Betbeans is stupid","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/9abc9f854d1f1e2c8d85e25ce1fd6e276baee379"},{"sha":"33fdd1f0a847275fe53381b23020a40d5de68ca6","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Error checking for to groups","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/33fdd1f0a847275fe53381b23020a40d5de68ca6"},{"sha":"856e5bd2034428a856af53fe02f35c7acf1b9ac6","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Merge branch 'master' into Endpoints-greg\n\n* master:\n  Update V1_0__Create_Tables.sql\n  fixed persistence\n  No refresh on change state\n  No refresh on change state\n  Can now activate/archive child\n  Showing archived and prospective children\n  Login/Logout/MyProfile\n  Fixed glassfish-web merge\n  Updated provider photos\n  Testing\n  Testing\n\n# Conflicts:\n#\tweb/WEB-INF/glassfish-web.xml","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/856e5bd2034428a856af53fe02f35c7acf1b9ac6"},{"sha":"5b58134162119a9c2988a9b306c06644c5497038","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Documentation?  whats that?","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/5b58134162119a9c2988a9b306c06644c5497038"},{"sha":"519c97e2b854b1ed98a4f73880c80d3e37c18385","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Child checkout constraints.\nEnforced that a child can only be checked out by an authorized guardian","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/519c97e2b854b1ed98a4f73880c80d3e37c18385"},{"sha":"a13a28fe421e165af17c9fb2408a791102d5d91a","author":{"email":"57dd573ae6afaceab8b08467cdec1a8a00521ffd@gmail.com","name":"Greg Piper"},"message":"Merge branch 'web-admin-ben' into Endpoints-greg\n\n* web-admin-ben:\n  Disallowed adding archived provider to a group\n  Archive/Activate Provider\n  Create Provider\n  Merge with web-master\n  modified the sql statements to allow for achiving providers. providers all set to \"active\" in the db. no dummy data for archived provider.\n  Email on accept/deny\n  working guardian section for child profiles\n  Email Functionality\n\n# Conflicts:\n#\tsrc/java/com/abcdaycare/services/ProviderService.java","distinct":false,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/a13a28fe421e165af17c9fb2408a791102d5d91a"},{"sha":"e6575bedd4868da81e12ef632ef03acc7888a700","author":{"email":"b541472dfd42182765badfb6b81729e42886ae6a@vt.edu","name":"Benjamin Sweeney"},"message":"a","distinct":true,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/e6575bedd4868da81e12ef632ef03acc7888a700"},{"sha":"3fd2aa912d49e70d5e88b3e201680a383bdb20b4","author":{"email":"b541472dfd42182765badfb6b81729e42886ae6a@vt.edu","name":"Benjamin Sweeney"},"message":"a","distinct":true,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/3fd2aa912d49e70d5e88b3e201680a383bdb20b4"},{"sha":"abba77dc565deb8e6e3c1581e498347691353f73","author":{"email":"b541472dfd42182765badfb6b81729e42886ae6a@vt.edu","name":"Benjamin Sweeney"},"message":"Providers cannot archive themselves","distinct":true,"url":"https://api.github.com/repos/CS4704-ChildCare/ABCDaycareApp/commits/abba77dc565deb8e6e3c1581e498347691353f73"}]}