{"shas":[["9797e0495714fbb12a43928e8f7292cb9a373e50","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change\n\nConflicts:\n\tapp/controllers/users_controller.rb\n\tconfig/locales/diaspora/en.yml\n\tdb/schema.rb\n\tspec/controllers/users_controller_spec.rb\n\tspec/mailers/notifier_spec.rb","Raphael Sofaer"],["b01ffb4489882ee9b7c5650e7b23ca8a58f2a889","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","We don't use perform_delegate anymore","Raphael Sofaer"],["e5c8ebf6e276f269536cfd7da9e93d25df235634","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","Add cucumber feature for changing email address","Raphael Sofaer"],["5d998a8e939ba927ccb4b98493bcb7e9a396de65","0858f9de670a3b5cffc41eeea17bc57f215b3fbf@fsfe.org","Fix issue #1410, remove cancel button in messages conversation","Jan-Christoph Borchardt"],["d650845161867cdc2a8f5777df79740a3800074d","baa02ffcd42be398234137a938b503463f67cf87@gmail.com","Edited RTL CSS SASS style sheet","Anass Ahmed"],["f3b7cf1391d34a7b92fec796ee32e5a24e122591","4f9083aa0045f20f871ba8a241e606b9d7bafa15@gmail.com","Merge pull request #1623 from anassahmed/master\n\nFix Issue #991: RTL SASS Stylesheet ","Jonne Hass"],["cb0124f48ef2c088602033fd25b5c9f07f7b5cc5","53b6adccf1284e7b735d68ff31f2c12c26d32073@gmx.de","fixing #1602","Jakob Kramer"],["8abfe67ed45ad81bec2f2a0097b80a5f3a699018","baa02ffcd42be398234137a938b503463f67cf87@gmail.com","Edited RTL conversations stylesheet","Anass Ahmed"],["4de2ca995838c9f39fb4218df6480086d01d0b2f","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","Get websocket pushing posts","Raphael Sofaer"],["a5fd01cc0901ed65b1ba9b4781dc48a600e61ebe","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","Fix comment socketing","Raphael Sofaer"],["333e56b4d97b21b5898192e1d428e5c6c4ebeb5f","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","Fix post socketing","Raphael Sofaer"],["8eea37cbdbaca2c0eb94abca6c3c3e749f69e14c","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","Fix people socketing","Raphael Sofaer"],["1ba49caeca3ab4a24bc1ae83c9e219b7f203f736","ec67638a84dca5d1ffa2be696be98fba4d39bfb8@joindiaspora.com","Fix like socketing to use GUIDs","Raphael Sofaer"],["df62f58156c7f501f6916ecde900845a798fdf6e","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","fixed the safe_buffer issues","Maxwell Salzberg"],["eee2225f04fedfbed6ca8081069108ce222c83d1","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","rspec is green","Maxwell Salzberg"],["0cc018dd6ba54d13cb7b815d287e64954a3aac4a","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","i think this works.  there is some weird stuff in vannacontroller, but that might have always been there","Maxwell Salzberg"],["9ac88a8c393ced332c14bd2c15e81be6d4dbd917","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","update gemfile","Maxwell Salzberg"],["757c9169fc7583134c02845f90ec9a475a2043fc","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","updated gemfile","Maxwell Salzberg"],["ad8ccbbeb9653fd2ab7b275c87fcd8dc63d952cb","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","added test for admin inviter","Maxwell Salzberg"],["09a43418efa771950b67f5b70f4d8a49ccaab0c3","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","dont try to fix vanna max\\!","Maxwell Salzberg"]],"ref":"refs/heads/master","size":337,"head":"725c91fbb34e8febcb770c8ee297c1c492acfd8a","push_id":38992533}