{"push_id":2040214704,"size":19,"distinct_size":1,"ref":"refs/heads/iteration-2","head":"b7ac1b5b1839ad24e9cc5044395d7f6314ef2e6a","before":"b76f6a952f7909f9ddb1f506ebf38c31f3511d19","commits":[{"sha":"e46d5487a2086cc3b2d63b70efc98b4892a0357e","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"test\n\ntest","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/e46d5487a2086cc3b2d63b70efc98b4892a0357e"},{"sha":"306d506afbe40e38af8a2ed8fa4ddd6a31ae0612","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"developmental changes - view offer\n\nview offer in progress","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/306d506afbe40e38af8a2ed8fa4ddd6a31ae0612"},{"sha":"df7692f1a7e12e97a76bfe8171789d8f58cfd0a3","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"Merge remote-tracking branch 'refs/remotes/origin/iteration-1' into seb\n\n# Conflicts:\n#\tapp/src/main/java/com/riversidecorps/rebuy/adapter/ItemAdapter.java","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/df7692f1a7e12e97a76bfe8171789d8f58cfd0a3"},{"sha":"d7b5239b09581de9095e00716309f88f79bd4b8e","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"list item and OfferAdapter fixes - still WIP","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/d7b5239b09581de9095e00716309f88f79bd4b8e"},{"sha":"a9b73913d30352dee8a68025793281c4b961eb01","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"more changes to OfferAdapter - preparing to merge Iteration-2","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/a9b73913d30352dee8a68025793281c4b961eb01"},{"sha":"f8149b447853566f021a0b1991d99e837f72402a","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"Merge remote-tracking branch 'origin/yijun' into seb\n\n# Conflicts:","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/f8149b447853566f021a0b1991d99e837f72402a"},{"sha":"4cbfead3a4305c7cb031eebe9851e2764f602c48","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"Merge remote-tracking branch 'origin/iteration-2' into seb\n\nAlso made a few changes for offer. Currently listing has broken the offer code fatally. Working on debugging this week.\n\n# Conflicts:\n#\t.idea/modules.xml\n#\tapp/src/main/java/com/riversidecorps/rebuy/CreateListingActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/RegisterActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/SingleListingActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/adapter/ItemAdapter.java\n#\tapp/src/main/res/layout/content_create_listing.xml\n#\tapp/src/main/res/values/strings.xml","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/4cbfead3a4305c7cb031eebe9851e2764f602c48"},{"sha":"c482d385a9d690a61dc159de6aba71f0236fd630","author":{"name":"Seannycow","email":"a54193b86b0abe399115c4f5423c30994206fe5a@gmail.com"},"message":"View Offer Stuff","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/c482d385a9d690a61dc159de6aba71f0236fd630"},{"sha":"65ea19e00cb2e8c9cf12c4e5b32b1dee25081aa5","author":{"name":"Seanny Cow","email":"a54193b86b0abe399115c4f5423c30994206fe5a@gmail.com"},"message":"weird stuff i need to get rid of","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/65ea19e00cb2e8c9cf12c4e5b32b1dee25081aa5"},{"sha":"b80915662ae8c64b5df982d562374f3a70cef928","author":{"name":"Seanny Cow","email":"a54193b86b0abe399115c4f5423c30994206fe5a@gmail.com"},"message":"View Offer Changes","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/b80915662ae8c64b5df982d562374f3a70cef928"},{"sha":"fbc62261bf0e3ee241a6fa0246d3d240ba67b559","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"view offer is now functional - Sean & Josh & Seb - layout needs some tweaks","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/fbc62261bf0e3ee241a6fa0246d3d240ba67b559"},{"sha":"5ff97d6c30d2cb3b18fa0d902fc97512c3242803","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"Merge branch 'iteration-2' into seb\n\n# Conflicts:\n#\t.gradle/3.3/taskArtifacts/fileHashes.bin\n#\t.gradle/3.3/taskArtifacts/fileSnapshots.bin\n#\t.gradle/3.3/taskArtifacts/taskArtifacts.bin\n#\t.gradle/3.3/taskArtifacts/taskArtifacts.lock\n#\t.idea/workspace.xml\n#\tapp/src/main/java/com/riversidecorps/rebuy/CreateListingActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/MyAccountActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/RegisterActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/SingleListingActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/ViewListingsActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/ViewOffersActivity.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/adapter/ItemAdapter.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/adapter/OfferAdapter.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/models/Listing.java\n#\tapp/src/main/java/com/riversidecorps/rebuy/models/Offer.java\n#\tapp/src/main/res/layout/content_view_offers.xml\n#\tapp/src/main/res/layout/dialog_view_offer.xml\n#\tapp/src/main/res/layout/list_item.xml\n#\tapp/src/main/res/menu/activity_nav_menu.xml\n#\tapp/src/main/res/values/strings.xml\n#\tbuild/intermediates/dex-cache/cache.xml","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/5ff97d6c30d2cb3b18fa0d902fc97512c3242803"},{"sha":"0e59c4af17ce36fc325edb197c0df9b3548ccc4e","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"setup .gitignore on my branch, modified content listing to older","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/0e59c4af17ce36fc325edb197c0df9b3548ccc4e"},{"sha":"5abd5a11c79c894eccfb80dc6c52df47eb8643b3","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"Merge remote-tracking branch 'origin/iteration-2' into seb\n\n# Conflicts:\n#\t.gradle/3.3/taskArtifacts/fileHashes.bin\n#\t.gradle/3.3/taskArtifacts/fileSnapshots.bin\n#\t.gradle/3.3/taskArtifacts/taskArtifacts.bin\n#\t.gradle/3.3/taskArtifacts/taskArtifacts.lock\n#\t.idea/workspace.xml","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/5abd5a11c79c894eccfb80dc6c52df47eb8643b3"},{"sha":"4614c102423b7856c411a4b38c0bd171b3d749db","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"Merge remote-tracking branch 'origin/iteration-2' into seb\n\n# Conflicts:\n#\tbuild/intermediates/dex-cache/cache.xml","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/4614c102423b7856c411a4b38c0bd171b3d749db"},{"sha":"fc66917bdf86b51c68c29b230b371532f04f573f","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"commit current changes","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/fc66917bdf86b51c68c29b230b371532f04f573f"},{"sha":"2b0064741cb70ce593850ec654c872b7e0a37206","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"Merge remote-tracking branch 'origin/iteration-2' into seb\n\n# Conflicts:\n#\tapp/src/main/java/com/riversidecorps/rebuy/SingleListingActivity.java","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/2b0064741cb70ce593850ec654c872b7e0a37206"},{"sha":"d418790bc980fd656d7c1055293a909f26b606e2","author":{"name":"bazerama","email":"3624c09285451d36ddc54d9cb4f38196c0086fad@student.uts.edu.au"},"message":"layout fix","distinct":false,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/d418790bc980fd656d7c1055293a909f26b606e2"},{"sha":"b7ac1b5b1839ad24e9cc5044395d7f6314ef2e6a","author":{"name":"Seannycow","email":"a54193b86b0abe399115c4f5423c30994206fe5a@gmail.com"},"message":"Merge pull request #20 from apksdk/seb\n\nSeb","distinct":true,"url":"https://api.github.com/repos/apksdk/SEP-MobileApp/commits/b7ac1b5b1839ad24e9cc5044395d7f6314ef2e6a"}]}
{"actor":{"display_login":"Seannycow"}}