{"shas":[["155290fb5138b6f6b56a3a52847809ee4c5cc8cf","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","updating Gemfile.lock","maxwell"],["e9a843b095ec3cf9bfc2d4dfcf21c4a48dc441f7","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","email prefs are now saved.  need more tests and use it in user#mail","maxwell"],["52b970098ba866cc48a24149c0196a412ca7653f","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","add specs for updating email settings in the controller, and user#mail","maxwell"],["580f0576c8706e7aef096c24338100daf9e072c6","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","added test for edit","maxwell"],["d825eeaaa091a3e733fb7165b10a0001e6260d33","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","updated to listen to disable mail","maxwell"],["00b0edcd392b8ef182eb829defca6efabfaadd4f","39284feba8a5bd51fdc653c8c8f08bac4232bb07@softcatala.org","Fix typo.","Jordi Mallach"],["b7eec2e843e44a6adde389a74a481d0badb794d2","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","update schema.rb","maxwell"],["1c94600b661cc87fe495ce84e7e89886f3187734","4f9083aa0045f20f871ba8a241e606b9d7bafa15@gmail.com","Merge branch 'master' of github.com:diaspora/diaspora","MrZYX"],["50d9d7656209fbbb9eb0d8170a41719c687448cd","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","update translations for email settings, and missing translation for aspect#new","maxwell"],["0745a5ed7caf482389b8c47cd23e1df2749abd4a","39284feba8a5bd51fdc653c8c8f08bac4232bb07@softcatala.org","Catalan translation update.","Jordi Mallach"],["2d5dc81854995aa5aa15b887ac996684fe6130b3","39284feba8a5bd51fdc653c8c8f08bac4232bb07@softcatala.org","Merge branch 'master' of git://github.com/diaspora/diaspora","Jordi Mallach"],["fd6545b6099d661f09de6a4ea0c6e96f457fe21d","39284feba8a5bd51fdc653c8c8f08bac4232bb07@softcatala.org","Fix typos.","Jordi Mallach"],["59820d19944520f49d5556a89bf61a87b1036cfb","39284feba8a5bd51fdc653c8c8f08bac4232bb07@softcatala.org","Update Catalan translation to fd6545b.","Jordi Mallach"],["ab997e2d21eeffa3e34ddf2fb6b5dbe41afe25c4","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","js hack to see bigger version of photo thumbnails in the stream without being abnoxious","maxwell"],["e52d14f1e97f2c6d4c86ced5e1fcc6c9262497c3","9c421d03fe8562827bcf573310051844a65da0fc@joindiaspora.com","attempting to fix bug #913","maxwell"],["ed8d4db3a86b53b82d9e17f89778366d7c84ebb0","4f9083aa0045f20f871ba8a241e606b9d7bafa15@gmail.com","some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones","MrZYX"],["7c3a17301092fc85e40f19d4d159f73c19652a5a","1b7f8ad2373cecd1613d2276e8f214fb630ad608@gmail.com","Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post","Kiran Soumya"],["67affa2f5fa2f8ab5137fa6b9ba660a69aa2ea15","af0c74a3364bba7e391f6a8396b6d6ee67a4fdf8@gmail.com","wrench","William Theaker"],["63caff1f40fcf9285a97733109c0d3aedfbad596","4f9083aa0045f20f871ba8a241e606b9d7bafa15@gmail.com","updated locales","MrZYX"],["fb6e32e3bff2db2a07b8da6a7dea7f59096dff32","4f9083aa0045f20f871ba8a241e606b9d7bafa15@gmail.com","Merge branch 'master' of https://github.com/williamtheaker/diaspora into pull","MrZYX"]],"repo":"geraspora/diaspora","actor":"denschub","ref":"refs/heads/master","size":61,"head":"25c8c3736131543b4319869f55dd4937dca0bfb7","actor_gravatar":"b9d9ae4b54893d540e68e57abde86518","push_id":26798170}