{"push_id":663790784,"size":44,"distinct_size":44,"ref":"refs/heads/master","head":"d267e446fea520057cd3d109377226489436b491","before":"f8364234bf1d6b756a57b7054f26853b09a77777","commits":[{"sha":"0ea4b582810e4ba02e426fad9297b8034bb64081","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"add some github api notes","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/0ea4b582810e4ba02e426fad9297b8034bb64081"},{"sha":"dfdb3969c3da448d6310643e597f4b3b38e03c1a","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"add database folder and untrack all tracked uploads","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/dfdb3969c3da448d6310643e597f4b3b38e03c1a"},{"sha":"0ffdb4b43192e4ab88b1bc9cd956daf282d19903","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"added two submodules: uploads and database","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/0ffdb4b43192e4ab88b1bc9cd956daf282d19903"},{"sha":"b729ed5d73b76c4e678f2311c179106822f3d76d","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"add database modification tool","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/b729ed5d73b76c4e678f2311c179106822f3d76d"},{"sha":"d0f0cdbc02c56a49bae21c70451ad53a2630b76f","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"Merge branch 'github_database' into restructure_directories\n\nConflicts:\n\tuploads","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/d0f0cdbc02c56a49bae21c70451ad53a2630b76f"},{"sha":"e11dac93eb3d459694dda528eadeddaf791d74da","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"upload_form now has \"working\" github API uses","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/e11dac93eb3d459694dda528eadeddaf791d74da"},{"sha":"554717ca72759c392082a893273b454041d7c6b4","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"minor changes to upload_form","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/554717ca72759c392082a893273b454041d7c6b4"},{"sha":"c2af8cd4bcc1981c524543c2ef91e4d592ea745e","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"Merge branch 'master' of gh-adamginsburg:camelot-project/frontend into restructure_directories\n\nConflicts:\n\tupload_form.py\n\tuploads","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/c2af8cd4bcc1981c524543c2ef91e4d592ea745e"},{"sha":"dcc7c5e573c8ea6d1cb0483c151d3693cf7b63dd","author":{"email":"6edc160e9e3c7639d23eaeec759d77cce4b7868f@uni-heidelberg.de","name":"Simon Glover"},"message":" Basic infrastructure for dealing with entries in the uploaded data file that duplicate\n (in terms of name, ID) entries that are already in the database.\n\n TODO: allow the user to select the option they want","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/dcc7c5e573c8ea6d1cb0483c151d3693cf7b63dd"},{"sha":"73dbfbddec0b95a7314e18c5194018b7b0fda6d5","author":{"email":"6edc160e9e3c7639d23eaeec759d77cce4b7868f@uni-heidelberg.de","name":"Simon Glover"},"message":" Merge with upstream\n\nMerge branch 'master' of https://github.com/camelot-project/frontend into detect_duplicates","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/73dbfbddec0b95a7314e18c5194018b7b0fda6d5"},{"sha":"81184a0ac51e0ad0298be8fbd3f06ff136dba90e","author":{"email":"6edc160e9e3c7639d23eaeec759d77cce4b7868f@uni-heidelberg.de","name":"Simon Glover"},"message":"Stub in a function to handle the duplicate logic","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/81184a0ac51e0ad0298be8fbd3f06ff136dba90e"},{"sha":"82627d5c6da92d17f7a8272ce0ee60ae9d803787","author":{"email":"6edc160e9e3c7639d23eaeec759d77cce4b7868f@uni-heidelberg.de","name":"Simon Glover"},"message":" Merge with upstream\n\nMerge branch 'master' of https://github.com/camelot-project/frontend into detect_duplicates","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/82627d5c6da92d17f7a8272ce0ee60ae9d803787"},{"sha":"6f630becc0bd6e580c19ce00324d0b7de7bdd672","author":{"email":"6edc160e9e3c7639d23eaeec759d77cce4b7868f@uni-heidelberg.de","name":"Simon Glover"},"message":"Correct a comment","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/6f630becc0bd6e580c19ce00324d0b7de7bdd672"},{"sha":"b0adde2c2412aaaaf1df7f999b78bb52511d2303","author":{"email":"6edc160e9e3c7639d23eaeec759d77cce4b7868f@uni-heidelberg.de","name":"Simon Glover"},"message":" Merge with master\n\nMerge branch 'master' of https://github.com/camelot-project/frontend into unit_conversion","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/b0adde2c2412aaaaf1df7f999b78bb52511d2303"},{"sha":"e71085a5497b2636672b005a47dd59c4f47434fe","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg (keflavich)"},"message":"add camelot to user agent in header","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/e71085a5497b2636672b005a47dd59c4f47434fe"},{"sha":"fa977310da6e98e7d420e9df4b51e8295086bcff","author":{"email":"6edc160e9e3c7639d23eaeec759d77cce4b7868f@uni-heidelberg.de","name":"Simon Glover"},"message":"Merge pull request #28 from scog1234/unit_conversion\n\nUnit conversion","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/fa977310da6e98e7d420e9df4b51e8295086bcff"},{"sha":"dabe09a029348ffe8c3c88c0dc182451907238e4","author":{"email":"35cf5ce312263c22a553e345ce0783f4890aa307@gmail.com","name":"jmdkastro"},"message":"Added checkbox functionality in query form + default values in query form. Rename ClearPlotOutput to ClearOutput to account for extended functionality. Need to adjust to new directory structure, so WIP.","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/dabe09a029348ffe8c3c88c0dc182451907238e4"},{"sha":"f4f8e043be0a3f26834ce6ee6fc78ef694ba6c4b","author":{"email":"35cf5ce312263c22a553e345ce0783f4890aa307@gmail.com","name":"jmdkastro"},"message":"Merge branch 'master' of https://github.com/camelot-project/frontend\n\nConflicts:\n\tupload_form.py","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/f4f8e043be0a3f26834ce6ee6fc78ef694ba6c4b"},{"sha":"2f6a318cff71c5cd719c46bb089157389fdc2043","author":{"email":"82ace27492e7092befb61911f4482825a5468530@gmail.com","name":"Adam Ginsburg"},"message":"Merge pull request #29 from jmdkastro/master\n\nAdded checkbox functionality in query form + default values in query …","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/2f6a318cff71c5cd719c46bb089157389fdc2043"},{"sha":"d4ea94f3f2251706e05ed36463d28781e582acb0","author":{"email":"35cf5ce312263c22a553e345ce0783f4890aa307@gmail.com","name":"jmdkastro"},"message":"typo sorry","distinct":true,"url":"https://api.github.com/repos/e-koch/frontend/commits/d4ea94f3f2251706e05ed36463d28781e582acb0"}]}