07097a3b5a797b4c3d0e3ba53a0ad98a8861db79 e22a2714cd4cfeed86b62421a48776e80f8da30f Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/9fe47efdd5642220d09772c8bd183195a85b2ce1 9fe47efdd5642220d09772c8bd183195a85b2ce1 2008-10-28T10:37:49-07:00 2008-10-28T10:37:49-07:00 Merge branch 'master' of scm@67.207.136.60:instantsocial ce145fcffe153b1e991b838b352c29b29d0a2f07 Michael Hartl michael@michaelhartl.com 8f3d4ddd11e084709107eb5271fbd47d40c29ed5 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/07097a3b5a797b4c3d0e3ba53a0ad98a8861db79 07097a3b5a797b4c3d0e3ba53a0ad98a8861db79 2008-10-28T10:32:21-07:00 2008-10-28T10:32:21-07:00 Rendering nothing for connections#show for the bots' sake 4f200c43958dec13f6fe40fa4a8f332e68482bd3 Michael Hartl michael@michaelhartl.com b3b6f5fd92055add22e7a690805076e45aff9552 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/8f3d4ddd11e084709107eb5271fbd47d40c29ed5 8f3d4ddd11e084709107eb5271fbd47d40c29ed5 2008-10-28T10:28:10-07:00 2008-10-28T10:28:10-07:00 Fixed session#create being hit by a bot 44e0d65f1e7a02a2359ba32ef84f304ec1f8f699 Michael Hartl michael@michaelhartl.com b3b6f5fd92055add22e7a690805076e45aff9552 Long Nguyen long@alpha.local http://github.com/insoshi/insoshi/commit/e22a2714cd4cfeed86b62421a48776e80f8da30f e22a2714cd4cfeed86b62421a48776e80f8da30f 2008-10-23T11:15:08-07:00 2008-10-23T11:12:54-07:00 Updates for local repository configuration script 82e09b55a803cbce99689d1e34b28cc19eafb7b9 Long Nguyen long@alpha.local 7dee110254eac596769aea1bf76b3c9af9b5a7e5 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b3b6f5fd92055add22e7a690805076e45aff9552 b3b6f5fd92055add22e7a690805076e45aff9552 2008-10-22T13:06:12-07:00 2008-10-22T13:06:12-07:00 Decided not to have configure_insoshi_local in repo after all 31ebb88c6e2ccf7ca9bdf1c44e77a6d9c346aa26 Michael Hartl michael@michaelhartl.com 4e67300e4fa1ce6b681f96a9cf1ba4b81a528bd0 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7dee110254eac596769aea1bf76b3c9af9b5a7e5 7dee110254eac596769aea1bf76b3c9af9b5a7e5 2008-10-22T12:56:32-07:00 2008-10-22T12:56:32-07:00 Made configure_insoshi_local executable 4cfe435e64dbd87409e2a9f30c2f57a7c22ebf26 Michael Hartl michael@michaelhartl.com 55788e96d953daf1d56fbe6cfee837d6f5d52d6e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/4e67300e4fa1ce6b681f96a9cf1ba4b81a528bd0 4e67300e4fa1ce6b681f96a9cf1ba4b81a528bd0 2008-10-22T12:55:04-07:00 2008-10-22T12:55:04-07:00 Added configure_insoshi_local script c5b9c489c32fdc6e6b045dfbbc4c9acbd2fc45cb Michael Hartl michael@michaelhartl.com ed838c373a4417d3fe4d367c9d3729564d809eea Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/55788e96d953daf1d56fbe6cfee837d6f5d52d6e 55788e96d953daf1d56fbe6cfee837d6f5d52d6e 2008-10-15T18:14:39-07:00 2008-10-15T18:14:39-07:00 Fixed horribly broken common_contacts_with method Conflicts: app/controllers/people_controller.rb app/models/person.rb app/views/people/_common_contacts.html.erb 31ebb88c6e2ccf7ca9bdf1c44e77a6d9c346aa26 Michael Hartl michael@michaelhartl.com c6e150c302042e52ced8dc306534edaea1fdf5f4 9299dc0f21ee9f83483590930159581e8c46a3f1 Long Nguyen long@alpha.local http://github.com/insoshi/insoshi/commit/ed838c373a4417d3fe4d367c9d3729564d809eea ed838c373a4417d3fe4d367c9d3729564d809eea 2008-10-15T08:08:34-07:00 2008-10-15T08:08:34-07:00 Merge branch 'edge' 14f0ce29ee5a5b1fd95f6daf47da0323c51e8054 Long Nguyen long@alpha.local b68e9e73f5f60f9e4e678931186b29df6300f070 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c6e150c302042e52ced8dc306534edaea1fdf5f4 c6e150c302042e52ced8dc306534edaea1fdf5f4 2008-10-03T17:57:00-07:00 2008-10-03T17:56:40-07:00 Catching Ultrasphinx::UsageError exception 57cc13746a79f53804b480eb9db1ecc345af1626 Michael Hartl michael@michaelhartl.com 3bcfe7a23af30a83f00654c36c047b8abd5a49c9 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/9299dc0f21ee9f83483590930159581e8c46a3f1 9299dc0f21ee9f83483590930159581e8c46a3f1 2008-10-03T17:56:54-07:00 2008-10-03T17:56:40-07:00 Catching Ultrasphinx::UsageError exception 14f0ce29ee5a5b1fd95f6daf47da0323c51e8054 Michael Hartl michael@michaelhartl.com 67c55497afc6ba130f2e3ffd6c9bbbca5cf406c8 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/3bcfe7a23af30a83f00654c36c047b8abd5a49c9 3bcfe7a23af30a83f00654c36c047b8abd5a49c9 2008-09-26T18:18:17-07:00 2008-09-26T18:18:01-07:00 Added conversation to Message unsafe_create 2787d0acb763214d16069993d400cbf9f1a14035 Michael Hartl michael@michaelhartl.com 3af3206a215f31f0a667aa5651f6e984628a08e8 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b68e9e73f5f60f9e4e678931186b29df6300f070 b68e9e73f5f60f9e4e678931186b29df6300f070 2008-09-26T18:18:01-07:00 2008-09-26T18:18:01-07:00 Added conversation to Message unsafe_create 466299d4592cccf780e091400e9ac090d3e4f5ee Michael Hartl michael@michaelhartl.com 062adceba49de25b435fd665122dae6f4fcf9d54 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/67c55497afc6ba130f2e3ffd6c9bbbca5cf406c8 67c55497afc6ba130f2e3ffd6c9bbbca5cf406c8 2008-09-26T11:02:48-07:00 2008-09-26T11:02:48-07:00 Updated the recycle task to reuse existing rake tasks 442b33467311118ef11769639f92d3b9e0c8f8c6 Michael Hartl michael@michaelhartl.com 210c5841f685f1d738bb747c7c9f2c6b9da784b4 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/062adceba49de25b435fd665122dae6f4fcf9d54 062adceba49de25b435fd665122dae6f4fcf9d54 2008-09-26T10:54:01-07:00 2008-09-25T16:25:30-07:00 Moved the database creation to the install script For some reason the 'Rake::Task["db:create:all"].invoke' line won't exectute if the databases already exist, even if they need to be migrated 4204aeecb6754eff9c1fe941139c4d113ac4e7cd Michael Hartl michael@michaelhartl.com 54b5d071e82e027fbcc173d725e3f967f60c38d3 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/210c5841f685f1d738bb747c7c9f2c6b9da784b4 210c5841f685f1d738bb747c7c9f2c6b9da784b4 2008-09-26T10:51:52-07:00 2008-09-26T10:51:38-07:00 Added formatting note to wall 78d29a7261322d8a94d6d2f9d46d5e70cefa402c Michael Hartl michael@michaelhartl.com e97512b4dbd01b86701792413103cea7f5d6c95a Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/3af3206a215f31f0a667aa5651f6e984628a08e8 3af3206a215f31f0a667aa5651f6e984628a08e8 2008-09-26T10:51:38-07:00 2008-09-26T10:51:38-07:00 Added formatting note to wall fffbf50cb0496da440d222bc8b5819b6fa3a4b53 Michael Hartl michael@michaelhartl.com 9f95d26d5876cacd3cb430e0e4d2a370037beeec Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/e97512b4dbd01b86701792413103cea7f5d6c95a e97512b4dbd01b86701792413103cea7f5d6c95a 2008-09-25T16:25:30-07:00 2008-09-25T16:25:30-07:00 Moved the database creation to the install script For some reason the 'Rake::Task["db:create:all"].invoke' line won't exectute if the databases already exist, even if they need to be migrated 548acaec3f43f301f5170513b63c662cdf796c9e Michael Hartl michael@michaelhartl.com 16e8867ae6983135ffa251043aa5b8c6c9a6fdfc 9f95d26d5876cacd3cb430e0e4d2a370037beeec Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/54b5d071e82e027fbcc173d725e3f967f60c38d3 54b5d071e82e027fbcc173d725e3f967f60c38d3 2008-09-23T12:42:20-07:00 2008-09-23T12:42:20-07:00 Merge branch 'blank_activity_mystery' into edge 744cde63429a35bf868c9ed49a07b978a9f3fcc0 Michael Hartl michael@michaelhartl.com f56a5e83d4bf56b69062d6e7f5447d5e5ddd941d Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/9f95d26d5876cacd3cb430e0e4d2a370037beeec 9f95d26d5876cacd3cb430e0e4d2a370037beeec 2008-09-23T12:35:47-07:00 2008-09-23T12:35:47-07:00 Added a spec to test for comment activity destruction This was solved by the BlogPost comment :dependent => :destroy dependency 562293f0dbb687bb897e720d641c2e0aa4f90feb Michael Hartl michael@michaelhartl.com 427e1437117796efe260dc86261534e929367b86 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/f56a5e83d4bf56b69062d6e7f5447d5e5ddd941d f56a5e83d4bf56b69062d6e7f5447d5e5ddd941d 2008-09-23T12:31:39-07:00 2008-09-23T12:31:39-07:00 Fixed a weird activity rendering error, and removed the unnecessary views 905863ec1f064bdab44a16ac170f8eeedef71b8c Michael Hartl michael@michaelhartl.com 10416d89500f86c7ec5717598a820306915d5895 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/427e1437117796efe260dc86261534e929367b86 427e1437117796efe260dc86261534e929367b86 2008-09-23T12:25:38-07:00 2008-09-23T12:25:38-07:00 Added a comments index redirect 9fc8abd423bd37a0f408e998d86aa015eb97699d Michael Hartl michael@michaelhartl.com 5376cbcaf54e2a8280b87130e76c0432cd7dc67c Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/10416d89500f86c7ec5717598a820306915d5895 10416d89500f86c7ec5717598a820306915d5895 2008-09-23T12:20:54-07:00 2008-09-23T12:20:54-07:00 Made blog comments dependent, which somehow they weren't 3c8ac55349e11ac51504353ce14f5f4a392ec154 Michael Hartl michael@michaelhartl.com ad249b09a7d377fd6b4e8c08134d125f9232f76c 07d30904eada3eaae4ac72ea427d1c0c076fd0b7 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/16e8867ae6983135ffa251043aa5b8c6c9a6fdfc 16e8867ae6983135ffa251043aa5b8c6c9a6fdfc 2008-09-21T17:29:06-07:00 2008-09-21T17:29:06-07:00 Merge branch 'mass_assignment' into edge c0631bd12701578d4f93b04fdb20409aa78cc171 Michael Hartl michael@michaelhartl.com 1725db2dce785ec44af4fc905918bd75cfa578fe 07d30904eada3eaae4ac72ea427d1c0c076fd0b7 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/5376cbcaf54e2a8280b87130e76c0432cd7dc67c 5376cbcaf54e2a8280b87130e76c0432cd7dc67c 2008-09-21T17:29:00-07:00 2008-09-21T17:29:00-07:00 Merge branch 'mass_assignment' 561f34d673925a9743e80125e74f60a6e59155ae Michael Hartl michael@michaelhartl.com 7f60b162dbd345e232d3dcb5d816a46d93229aae Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/07d30904eada3eaae4ac72ea427d1c0c076fd0b7 07d30904eada3eaae4ac72ea427d1c0c076fd0b7 2008-09-21T17:28:53-07:00 2008-09-21T17:28:53-07:00 Fixed an assignment bug de3d6de291d4aef5d518b2f381989061fb3072dd Michael Hartl michael@michaelhartl.com a2763fbcd1ae1bb51e778d9b2bf2faa64895b405 7f60b162dbd345e232d3dcb5d816a46d93229aae Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/ad249b09a7d377fd6b4e8c08134d125f9232f76c ad249b09a7d377fd6b4e8c08134d125f9232f76c 2008-09-21T17:25:22-07:00 2008-09-21T17:25:22-07:00 Merge branch 'mass_assignment' into edge b2e5f50bd0e8424c89ab08310383f2cc16e7d00d Michael Hartl michael@michaelhartl.com 5ec68af08bca2d73f79db5a6765673882455f671 7f60b162dbd345e232d3dcb5d816a46d93229aae Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/1725db2dce785ec44af4fc905918bd75cfa578fe 1725db2dce785ec44af4fc905918bd75cfa578fe 2008-09-21T17:25:13-07:00 2008-09-21T17:25:13-07:00 Merge branch 'mass_assignment' 7afed44ec168aeaba9a243a749941baef6477092 Michael Hartl michael@michaelhartl.com efc521deb1a96082499b10a1f182e6cc56f2e9df Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7f60b162dbd345e232d3dcb5d816a46d93229aae 7f60b162dbd345e232d3dcb5d816a46d93229aae 2008-09-21T16:27:27-07:00 2008-09-21T16:27:27-07:00 Polished up unsafe build/create methods fa98330a7ad3f8cf6eb4704fd7e68621ec6490b8 Michael Hartl michael@michaelhartl.com 1844e7b94df8a0273e0b37a4fe84a288dfe6b242 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/efc521deb1a96082499b10a1f182e6cc56f2e9df efc521deb1a96082499b10a1f182e6cc56f2e9df 2008-09-21T16:09:25-07:00 2008-09-21T16:09:25-07:00 Replaced mass_assignment_vulnerabilities script with find_mass_assignment plugin 6d81d59664bf052b5216fbf895f866e4d5859316 Michael Hartl michael@michaelhartl.com