{"shas":[["b6dbf4b81dda166130023d03329dba498227b17d","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","Iteration 3\nMerge branch 'master' of github.com:fadendaten/Donnervogu into rootstream\n\nConflicts:\n\t.gitignore\n\tGemfile.lock\n\tapp/controllers/home_controller.rb\n\tapp/controllers/profile_controller.rb\n\tapp/controllers/users_controller.rb\n\tapp/helpers/application_helper.rb\n\tapp/helpers/emailaccount_helper.rb\n\tapp/helpers/groups_helper.rb\n\tapp/helpers/home_helper.rb\n\tapp/helpers/overview_helper.rb\n\tapp/helpers/user_sessions_helper.rb\n\tapp/helpers/users_helper.rb\n\tapp/models/emailaccount.rb\n\tapp/models/group.rb\n\tapp/views/emailaccounts/edit.html.haml\n\tapp/views/emailaccounts/show.html.haml\n\tapp/views/groups/_form.html.erb\n\tapp/views/groups/edit.html.erb\n\tapp/views/groups/index.html.erb\n\tapp/views/groups/new.html.erb\n\tapp/views/groups/show.html.erb\n\tapp/views/home/index.html.haml\n\tapp/views/profile/zip.haml\n\tnotes\n\tpublic/javascripts/markdown.js\n\tpublic/stylesheets/style.css\n\ttest/fixtures/emailaccounts.yml\n\ttest/functional/emailaccounts_controller_test.rb\n\ttest/functional/groups_controller_test.rb\n\ttest/unit/file_creator_test.rb\n\ttest/unit/group_test.rb\n\ttest/unit/helpers/home_helper_test.rb","Felix Langenegger"],["d91953f54f00516f9a4c8a616edb589d8a4bedee","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","modified for rootsream merge:   Gemfile","Felix Langenegger"],["dcc6e1068742e5a7e64b5e477f7c22ffed2c9203","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","Iteration 3. modified for server usage!","Felix Langenegger"],["984db5acc138f8ac26f1871e835ab85606e5992f","99cc1031546340b2b8ced5fe338b5890677a56ca@students.unibe.ch","Added view and controller methods\n\nEmailaccount can now overwrite own pref with groups and group can reset\nall members. Also the Gemfile is cleaned a bit","Aaron Karper"],["9a9b74d221c67dadaf9486f852adbcc1845afe83","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","New Design for TBMS\n- added new colors\n- added new errordesign\n- added pagination\n- added logo\n- added jquery\n- cleanup off css\n...","Felix Langenegger"],["b7aaf2cb7edd54cc0fcfb4334198f4406673182f","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","Deleted some erbs :)","Felix Langenegger"],["84f6c5b7dbc574002dc919264df01b803e965dc0","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","Hope this solve the 0 byte issue\n\tmodified:   config/environments/production.rb","Felix Langenegger"],["ca6fab9d4a04e9ba523e0a0b2717f5da13e18a6e","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","\tmodified:   groups.yml","Felix Langenegger"],["f976388caf12f8ef830b91f0e60ce5affed5d090","fee6e70229c2c266b13a98db02785967f278329d@gmail.com","Added a new pagination gem","Felix Langenegger"],["6acede4545fc1d284f625a462526b9697b5d5e8c","99cc1031546340b2b8ced5fe338b5890677a56ca@students.unibe.ch","Readable Uptodate information\n\nYou can see if a emailaccount has been recently updated (currently 4\ndays old), by looking at the background colour of the table row (same\nfor subaccounts). Also I fixed the bug of downloading zips and thus\ncreating an infinitude of ids. Now every emailaccount has at least one\nsubaccount.","Aaron Karper"],["eb4002545c2686bb123c0aab1b0ea4d23442f611","99cc1031546340b2b8ced5fe338b5890677a56ca@students.unibe.ch","Started with the Templating System\n\nIt uses something like \":::INFO:::\" as placeholder and a simple dict as\ninformation.","Aaron Karper"],["3702112e59d9357d9f27d9990e64696304b67d69","99cc1031546340b2b8ced5fe338b5890677a56ca@students.unibe.ch","Merge branch 'master' of github.com:PSE02/Donnervogu","Aaron Karper"],["d1d9b4acbed02eb376ceecb1b07c0d822d696e28","99cc1031546340b2b8ced5fe338b5890677a56ca@students.unibe.ch","Merge branch 'master' into groups\n\nConflicts:\n\t.gitignore\n\tGemfile\n\tGemfile.lock\n\tTBMS/.gitignore\n\tTBMS/app/helpers/users_helper.rb\n\tTBMS/app/views/profile/zip.haml\n\tTBMS/app/views/users/show.html.haml\n\tTBMS/public/javascripts/markdown.js\n\tTBMS/test/integration/zip_files_test.rb\n\tapp/controllers/emailaccounts_controller.rb\n\tapp/controllers/groups_controller.rb\n\tapp/controllers/home_controller.rb\n\tapp/controllers/profile_controller.rb\n\tapp/helpers/overview_helper.rb\n\tapp/models/emailaccount.rb\n\tapp/models/group.rb\n\tapp/views/emailaccounts/_form.html.haml\n\tapp/views/emailaccounts/index.html.haml\n\tapp/views/emailaccounts/show.html.haml\n\tapp/views/shared/_preferences.haml\n\tconfig/routes.rb\n\ttest/functional/emailaccounts_controller_test.rb","Aaron Karper"],["f3cadd12b30677b03adfe447afa0c9705a6c1028","99cc1031546340b2b8ced5fe338b5890677a56ca@students.unibe.ch","Merged with master\n\nIt wasn't easy and most code got deranged, but I hope I fixed it all.","Aaron Karper"],["00f317c263512db23099dae01ade74e3fb872cd5","99cc1031546340b2b8ced5fe338b5890677a56ca@students.unibe.ch","Merge branch 'templates' into groups","Aaron Karper"],["6e6eac3aa0666444fac81248effaf8918d2764d3","cda4be900e8d9e910944f458a711fe45db462eca@gmail.com","Fixed some minor issues:\n\n- See all members in Show Group: table style fixed\n- Listing groups: Fontsize h2 equal to Email Accounts\n- Overview: Number of Accounts will be shown correctly","destiroid"],["974117e2db1ba84fe2b6e775d0d4cb4ca5cb83f7","cda4be900e8d9e910944f458a711fe45db462eca@gmail.com","deleted some unnecessary stuff I accidently pushed...","destiroid"],["f96d8c03b0ffe1f2210095588dee517ce65fe905","cda4be900e8d9e910944f458a711fe45db462eca@gmail.com","Fixed Login/Logout-Button Issue.\n\nIf logged in the button will be \"Logout\" else \"Login\".","destiroid"],["27701e739b59b43c03f5685e054b9130b105d620","cda4be900e8d9e910944f458a711fe45db462eca@gmail.com","Fixed more issues:\n\n- delete emailaccounts and groups works again\n- error message if uploading nil csv file","destiroid"],["0ba0813e6fc939157601137600df4fa2834247c5","a5657cd028ce12a1c89d18299fbe00c4385ec995@gmx.ch","It's not possible to delete \"No Group\" now\n(again needs some CSS for flash[:error]","d3orn"]],"repo":"fadendaten/Donnervogu","actor":"flangenegger","ref":"refs/heads/tbconf","size":90,"head":"6056a4cfe65f27d97b445a96265d3cea92c2459e","actor_gravatar":"2ee857bc7e22feb8c05ebbf2cb73d52d","push_id":31406275}