{"push_id":952101740,"size":204,"distinct_size":1,"ref":"refs/heads/feature/152_wimi_invitations","head":"9d8813d8ae5f7145f2ee755d2c9e0142f3011421","before":"7cbf18575844f66b407239f52980012fe3f0780b","commits":[{"sha":"b0a9a0d8e474f2a88e12ddfdee22f3cf0c6a4cd6","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"Merge branch 'feature/59_Arbeitsstunden' into feature/48_stundenzettel_bestaetigen\n\n# Conflicts:\n#\tapp/controllers/users_controller.rb\n#\tapp/controllers/welcome_controller.rb\n#\tapp/models/user.rb\n#\tconfig/routes.rb","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/b0a9a0d8e474f2a88e12ddfdee22f3cf0c6a4cd6"},{"sha":"7ad36831ef4ca27151494f2c183957918b157021","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"resolved merge conflict","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/7ad36831ef4ca27151494f2c183957918b157021"},{"sha":"3df5fce119f2db0b004d47ff84c1a578d96554f7","author":{"email":"ca7c1b9154aba07e963a2a0def54ddc5ba6f42b4@gmail.com","name":"Tim Oesterreich"},"message":"Merge remote-tracking branch 'origin/feature/32_2_administrator' into feature/48_stundenzettel_bestaetigen","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/3df5fce119f2db0b004d47ff84c1a578d96554f7"},{"sha":"ec7c8d97be268eab23b220a2446258066fa19054","author":{"email":"ca7c1b9154aba07e963a2a0def54ddc5ba6f42b4@gmail.com","name":"Tim Oesterreich"},"message":"Merge remote-tracking branch 'origin/feature/59_Arbeitsstunden' into feature/48_stundenzettel_bestaetigen","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/ec7c8d97be268eab23b220a2446258066fa19054"},{"sha":"ba54222104c7b2f3232257631a09d612f87bed49","author":{"email":"ca7c1b9154aba07e963a2a0def54ddc5ba6f42b4@gmail.com","name":"Tim Oesterreich"},"message":"implemented accepted functionality","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/ba54222104c7b2f3232257631a09d612f87bed49"},{"sha":"40f8ffec513f99f36df471f9ac5ab1a74590b4aa","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"Merge branch 'dev' into feature/48_stundenzettel_bestaetigen\n\n# Conflicts:\n#\tapp/controllers/users_controller.rb\n#\tapp/controllers/welcome_controller.rb\n#\tapp/models/user.rb\n#\tconfig/routes.rb","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/40f8ffec513f99f36df471f9ac5ab1a74590b4aa"},{"sha":"505b711dcd0cb2d7153dd644cf00f163467791e8","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"resolved merge conflicts","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/505b711dcd0cb2d7153dd644cf00f163467791e8"},{"sha":"63219ca3659618c128f451fa291184ed8f0ce3e6","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"Modified Timesheets\n\nAdded Timesheet status\nAdded last modified date\nPresentation and operations of Timesheets depens now on state\nWimi can now see all handed in Timesheets","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/63219ca3659618c128f451fa291184ed8f0ce3e6"},{"sha":"f93fff335378bca59792a9f68637e82bb4d8e6a2","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"Merge branch 'dev' into feature/48_stundenzettel_bestaetigen\n\n# Conflicts:\n#\tapp/controllers/users_controller.rb\n#\tapp/models/time_sheet.rb\n#\tapp/models/travel_expense_report_item.rb\n#\tapp/models/user.rb\n#\tapp/views/work_days/index.html.erb\n#\tconfig/routes.rb\n#\tdb/schema.rb\n#\tspec/factories/travel_expense_report_items.rb\n#\tspec/models/travel_expense_report_item_spec.rb","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/f93fff335378bca59792a9f68637e82bb4d8e6a2"},{"sha":"0d014f9ee64aada85df32b337a854fedd4ac5cbc","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"solved merge conflicts","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/0d014f9ee64aada85df32b337a854fedd4ac5cbc"},{"sha":"8cd52e4391b69b11ecd7a2ee395607571dbd10eb","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"creates basic layout for dashboard","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/8cd52e4391b69b11ecd7a2ee395607571dbd10eb"},{"sha":"1f24956bc65e259c497f2a07ffbde955669f4c90","author":{"email":"2b552eb0415ff55749794ff7918d4c5601c78739@student.hpi.uni-potsdam.de","name":"Jonas Bounama"},"message":"Added view for handed in TimeSheets in profil, can now accept and reject Timesheets and hand them in\n\nAls wimi kann man nun eingereichte Stundenzettel von anderen Nutzern\ndes gleichen Projekts einsehen bestätigen und Ablehnen mit Anmerkung.\nJeder Nutzer kann zu seinem Projekt stundenzettel einreichen und deren\nStatus einsehen und ablegehnte editieren und wieder einreichen","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/1f24956bc65e259c497f2a07ffbde955669f4c90"},{"sha":"9b25fd67ea1b4e4d5927bb8ee4ba0ee9b68d6517","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"adds links to projects","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/9b25fd67ea1b4e4d5927bb8ee4ba0ee9b68d6517"},{"sha":"5fb2ec3c272ded0521bfeae64be97f9dbe37b6f5","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"adds translations for headers","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/5fb2ec3c272ded0521bfeae64be97f9dbe37b6f5"},{"sha":"9e569b016468fefbeaee89a85489cf9f5e246db4","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"adds a partial page for hiwi and wimi actions","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/9e569b016468fefbeaee89a85489cf9f5e246db4"},{"sha":"ad0687a7a6e143ac601cacb5690c865f1685d16a","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"Merge branch 'feature/100_HiwiWimi_dashboard' into feature/37_wimi_dashboard","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/ad0687a7a6e143ac601cacb5690c865f1685d16a"},{"sha":"ebd9abe2b398bb13a3d0f8e694590daff1961656","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"add actions for wimi","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/ebd9abe2b398bb13a3d0f8e694590daff1961656"},{"sha":"ebe95b5953b1d3dd6feadf728ef69c35a28ca817","author":{"email":"5bbfb046a6a7e01b7a7169c485a8bff09f689a6c@users.noreply.github.com","name":"Jan van Dieken"},"message":"added partial form for hiwi_actions","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/ebe95b5953b1d3dd6feadf728ef69c35a28ca817"},{"sha":"4668ff0c8825a2c46e6c81ff25ebaddb612d16f0","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"Merge branch 'feature/38_hiwi_dashboard' into feature/100_HiwiWimi_dashboard","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/4668ff0c8825a2c46e6c81ff25ebaddb612d16f0"},{"sha":"4f01a6ef92234ad8e81c68a3509a8dcafaca0066","author":{"email":"88df3e610b703cde2af8fcd3c3da2352bfa22b68@gmail.com","name":"Moritz Eissenhauer"},"message":"mergs 37_wimi_dashboard","distinct":false,"url":"https://api.github.com/repos/hpi-swt2/wimi-portal/commits/4f01a6ef92234ad8e81c68a3509a8dcafaca0066"}]}