6bc7bfed0c8c79b4cbb45f68b84e4fce0fe3f4d7 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b5f2e7cce5fda04139b8c4b9cdbbf1c7f865c735 b5f2e7cce5fda04139b8c4b9cdbbf1c7f865c735 2009-04-22T14:44:59-07:00 2009-04-22T14:44:59-07:00 Removed unused message edit page 8cd1ebd4b24b09e58d79fd063053405034b06dec Michael Hartl michael@michaelhartl.com e47b2b88b61cc336af41deb77691ca8ebf1fbc98 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/5918ec515920388360bba0f24fdc22917888bdc6 5918ec515920388360bba0f24fdc22917888bdc6 2009-03-24T11:11:41-07:00 2009-03-24T11:11:41-07:00 Modified email regex to accept plus signs 918e61dac57a663ba2d8892d2f92a1b535a0953a Michael Hartl michael@michaelhartl.com 89ddb1663a7f4b8a7a0f334894def6aeacb607ae Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/2c8ad71625d3f3387f5f56c66c71b90733405cb7 2c8ad71625d3f3387f5f56c66c71b90733405cb7 2009-03-19T16:47:36-07:00 2009-02-28T12:06:29-08:00 Fixed weird problem with @variables in the mailer. Thank god for tests. c1b29b630e6c94f5b84ab6e05d84dfd758920779 Michael Hartl michael@michaelhartl.com b140954edcc88d286e17601112dcdf3147d7e409 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/55ad289216b47e24ac47ba3fff880681398c2883 55ad289216b47e24ac47ba3fff880681398c2883 2009-03-19T16:47:36-07:00 2009-02-28T11:32:31-08:00 Removed RSpec gems, etc. e9b3a8a03572f6bff8705fe090cec20419e07a5c Michael Hartl michael@michaelhartl.com 36bc5f8ee6b421f7f8064735f8a8bfb2d292e0bb Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/35fb6c9aefff43ea538f21cf10387497148e5f33 35fb6c9aefff43ea538f21cf10387497148e5f33 2008-10-17T16:39:30-07:00 2008-10-17T16:39:30-07:00 Fixed blog interface with correct redirects to blog tab 298c03be3a42d37fe1092ce6f86648061fe372ba Michael Hartl michael@michaelhartl.com aabcf1f482e7045e4091b71a9a7685997725193b Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/a6fc61fe1f709ef86514e0d5d5227ae09dfa7d97 a6fc61fe1f709ef86514e0d5d5227ae09dfa7d97 2008-10-15T17:43:55-07:00 2008-10-15T17:43:55-07:00 Fixed horribly broken common_contacts_with method a64737388b327e47e681a8956f1e29fe4a065f16 Michael Hartl michael@michaelhartl.com 44b254bf5a37ff6e83bf46c0c5bdbd41b360e6a7 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/607667a47a76bda53b81d9e79c1b7c1ae8764244 607667a47a76bda53b81d9e79c1b7c1ae8764244 2008-10-15T13:41:15-07:00 2008-10-15T13:41:15-07:00 Fixed failing spec 154d6f7a3445afbc0e7121447f7e93828dbc1010 Michael Hartl michael@michaelhartl.com 45fcb29345d57781076aff79d5963cd4c191cf11 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/475f6d09e0925d2ed4958c96b71809cb2a777b58 475f6d09e0925d2ed4958c96b71809cb2a777b58 2008-10-15T13:19:40-07:00 2008-10-15T13:19:40-07:00 Fixed common contacts for real this time, with tests (!) 81744e0d11b2fa0f903eea3fd2a528b3924efed5 Michael Hartl michael@michaelhartl.com 38792dae7b2ab6d1eefb81ba0a4820afe70b84aa Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/39043c17495517eb3fe683684728c72374bdc1cb 39043c17495517eb3fe683684728c72374bdc1cb 2008-10-09T15:46:06-07:00 2008-10-09T15:45:47-07:00 Handling gallery creation, including feed activity 08eb7a2b905b68a1f7c1b81999bb8f222f6bcf5c Michael Hartl michael@michaelhartl.com 9eb07450e5f47ab8dad59cac3dda902d225986bf Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/074a05d093fbe5eab4b1cb7e72e3ffb158912150 074a05d093fbe5eab4b1cb7e72e3ffb158912150 2008-10-09T14:43:35-07:00 2008-10-09T14:43:35-07:00 Protected Gallery and Event models against mass assignment 639ae874c4bf2bac7121dcdde5d12cf9aaf7ec0a Michael Hartl michael@michaelhartl.com dbf2cf4107dce6b0148dbee679c775e1c3ccdc42 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/52e13f878e99dfda045cc09c676f6ac1f923c3c5 52e13f878e99dfda045cc09c676f6ac1f923c3c5 2008-10-09T14:26:04-07:00 2008-10-09T14:26:04-07:00 Cleaned up photo create b498cfc1966554023498b313272025a60aff59d5 Michael Hartl michael@michaelhartl.com f690fda88e55ac57cca870b174c46a4a9da39f4e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/dbf2cf4107dce6b0148dbee679c775e1c3ccdc42 dbf2cf4107dce6b0148dbee679c775e1c3ccdc42 2008-10-09T13:04:23-07:00 2008-10-09T13:04:23-07:00 Protecting final gallery deletion 2901e32cecded48927cbdc19929e55364e360495 Michael Hartl michael@michaelhartl.com b3cb71b137954041623cb9180e8f164533b1721b Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/e36ba7e9e7fccfe4512cd1f4f7ea481fe8ddc738 e36ba7e9e7fccfe4512cd1f4f7ea481fe8ddc738 2008-10-07T12:56:58-07:00 2008-10-07T12:56:58-07:00 Polished interface for individual photos inside galleries b1bd538be93ecac80879c85d76f831a9637dbecf Michael Hartl michael@michaelhartl.com af8ee9d43935a0b1f50c5965dd4f1afa6699cd46 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c59edb62dace9c9cfe17aec503dd1addd1da6876 c59edb62dace9c9cfe17aec503dd1addd1da6876 2008-10-06T14:49:23-07:00 2008-10-06T14:49:23-07:00 Fixed spurious creation of thumbnails in public/thumbnails during testing This took > 1 hr. to figure out... c5b3ee9f80c6a00c87954ef0c68ca3faf8bb3496 Michael Hartl michael@michaelhartl.com e2e50b81985f960aa4cec05c97a05153bd2ab6f9 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/af8ee9d43935a0b1f50c5965dd4f1afa6699cd46 af8ee9d43935a0b1f50c5965dd4f1afa6699cd46 2008-10-06T13:50:17-07:00 2008-10-03T17:56:40-07:00 Catching Ultrasphinx::UsageError exception 66eb5a2c9ca9d6d1d9d0c29669defc8ef1fcae71 Michael Hartl michael@michaelhartl.com 68d419d4fff039f3cf0d4f879fbc48fc146e32e4 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/ef1b999e95dc4122956aa6cf90468157a554306b ef1b999e95dc4122956aa6cf90468157a554306b 2008-10-02T17:22:40-07:00 2008-10-02T17:22:40-07:00 Changed message cancellation 281678fdd766072225b8327c845bb7ec8e4ec795 Michael Hartl michael@michaelhartl.com 7f1bcd317586412ddde184be16c1419f7c1d61ff 3bcfe7a23af30a83f00654c36c047b8abd5a49c9 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b9639fe8625af58676174a7413d3957c50af8527 b9639fe8625af58676174a7413d3957c50af8527 2008-09-29T11:37:35-07:00 2008-09-29T11:37:35-07:00 Merge branch 'edge' into bill_merge Conflicts: app/views/people/_wall.html.erb 2ef2245ae859b2a5a4b29dc7eaa6f33292e120cf 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 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 4e46a559908b6c569c057608b54676f9218a4d9c 5127049d2a4e1f692ef78fb7bffaebe9e706ddc2 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/6acc4c7f8c5a8d14a7db94aa7d58b4ede475dc6d 6acc4c7f8c5a8d14a7db94aa7d58b4ede475dc6d 2008-09-17T15:39:53-07:00 2008-09-17T15:39:53-07:00 Merge branch 'edge' into temp Conflicts: app/controllers/photos_controller.rb app/helpers/activities_helper.rb app/helpers/application_helper.rb app/models/person.rb app/models/photo.rb app/views/admin/people/index.html.erb app/views/layouts/application.html.erb app/views/people/_comment.html.erb config/routes.rb lib/tasks/sample_data.rake 1e11ca6eaa39616cf70699198326f8fb982b14b2 Michael Hartl michael@michaelhartl.com 67671638140e784a5a0e776fa84b8364a1dd147b Evan Dorn evan@evan-dorns-power-mac-g5.local http://github.com/insoshi/insoshi/commit/16234049b76c013f420ce460067292e224b0e377 16234049b76c013f420ce460067292e224b0e377 2008-09-17T14:19:26-07:00 2008-09-17T14:19:26-07:00 commenting on a wall redirects back to the wall 8f4904ad0042089bd316f932bded0f07d1cd7b15 Evan Dorn evan@evan-dorns-power-mac-g5.local 81e2acb788b181088b6d1641452e1fdb123d2a74 a23b02f9b870d665322ec0c08e7d1646065de6ae Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7f1edaef14a5a9d9ca75b62f3d8e2f4847f9d3ae 7f1edaef14a5a9d9ca75b62f3d8e2f4847f9d3ae 2008-09-16T17:29:27-07:00 2008-09-16T17:29:27-07:00 Merge branch 'mass_assignment' into edge 3434a5fa1fe659535dcf16851f4387013f33c9ae Michael Hartl michael@michaelhartl.com f7b1be058f9800b25a7d403fda01b8baa870cf90 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/d208114d929b501eaddd60ec262b1e4f179eebe7 d208114d929b501eaddd60ec262b1e4f179eebe7 2008-09-16T17:07:03-07:00 2008-09-16T17:02:14-07:00 Protected Message model against mass assignment This also fixed an apparently major bug in message replies. In fact, I'm not sure how the hell they worked before. b56e300ff5de1c5f8642b1938dca189e116a11d2 Michael Hartl michael@michaelhartl.com 4d76b680d59bd9402a133142bf0faeefd67e97fb Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/f7b1be058f9800b25a7d403fda01b8baa870cf90 f7b1be058f9800b25a7d403fda01b8baa870cf90 2008-09-16T16:06:20-07:00 2008-09-16T16:06:20-07:00 Protected attributes in the Photo model from mass assignment cf0a8ffadf9b5312f2bdbdfcc705b3777173ccf5 Michael Hartl michael@michaelhartl.com cfdc04a448ea80e08ea4714abd16f71602300e49 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/4d76b680d59bd9402a133142bf0faeefd67e97fb 4d76b680d59bd9402a133142bf0faeefd67e97fb 2008-09-16T15:46:17-07:00 2008-09-16T15:46:17-07:00 Fixed mass assignment problem in Comment model Added unsafe_create and related methods to bypass attr_accessible in tests d54f1ea2b677218e36b9e59076253b77bd2f02f6 Michael Hartl michael@michaelhartl.com a1c346c0b53ce6c28343182cf4c5f5166c4c1843 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/436296d4db22e79680f8952f0fd4a31a18035f92 436296d4db22e79680f8952f0fd4a31a18035f92 2008-09-16T13:51:30-07:00 2008-09-16T13:51:30-07:00 Fixed mass assignment bug for the Topic model df27f69ebd9cadbd3a152d48ef95d6472e1342a7 Michael Hartl michael@michaelhartl.com 47752bda1269b28d6ef70468e045a57d0e54fd65 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/a1c346c0b53ce6c28343182cf4c5f5166c4c1843 a1c346c0b53ce6c28343182cf4c5f5166c4c1843 2008-09-16T13:46:20-07:00 2008-09-16T13:46:20-07:00 Fixed mass assignment bug in ForumPost model ba77b18480882c19c309a40419482b637a76f34a Michael Hartl michael@michaelhartl.com 4e0e27e243913f22dac3e4895325eb641dc78139 58c8fa2e348c1446acfd7dd86e2b11ca2d11c41e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/512a2b857e4c96ad7fe432f30b9c0cb22f268a88 512a2b857e4c96ad7fe432f30b9c0cb22f268a88 2008-09-15T16:52:40-07:00 2008-09-15T16:52:40-07:00 Merge branch 'edge' into jorge_merge cf094f129cc2db8aa140005a07c7716322ff94ea Michael Hartl michael@michaelhartl.com 650ed570c29338ec74edd52c6f668f7bb6632a64 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/58c8fa2e348c1446acfd7dd86e2b11ca2d11c41e 58c8fa2e348c1446acfd7dd86e2b11ca2d11c41e 2008-09-15T16:52:00-07:00 2008-09-15T16:49:45-07:00 Only display password reminder if the system can send email This closes http://insoshi.lighthouseapp.com/projects/9331/tickets/89-i-forgot-my-password-display e718146c349d7cae2653a1206c20eb0b36c5ecf1 Michael Hartl michael@michaelhartl.com 650ed570c29338ec74edd52c6f668f7bb6632a64 cfd254507f77770c74d6cad5143ff89767559abf Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/4e0e27e243913f22dac3e4895325eb641dc78139 4e0e27e243913f22dac3e4895325eb641dc78139 2008-09-15T16:11:12-07:00 2008-09-15T16:11:12-07:00 Merge branch 'diasjorge' into jorge_merge 89d681be16530a602e0b931446459ad52187ac15 Michael Hartl michael@michaelhartl.com c45cede62950762feee09c443ad9c0f75f02b476 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7c1f4576acd5f35811ba3a67f4ab210bbfb2465d 7c1f4576acd5f35811ba3a67f4ab210bbfb2465d 2008-09-13T11:36:26-07:00 2008-09-13T11:36:26-07:00 Refactored create_person a little 7c1451a8ddde346f469e000d692081bb8037d7d4 Michael Hartl michael@michaelhartl.com 683c071bd7e5fc3ad587987f6597132d7ca2fef6 Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/9773da8991f1ee36b904833b5299c5f692c38dcb 9773da8991f1ee36b904833b5299c5f692c38dcb 2008-09-10T12:43:26-07:00 2008-09-01T03:23:12-07:00 Adding activity when person attends event. Improved Specs beb274021b03b011ccc68abe8669130761fba66d Jorge Dias pana@qvitta.net 48c72c749d86d4b66bf0e33ae9552fc3d37d1d16 Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/683c071bd7e5fc3ad587987f6597132d7ca2fef6 683c071bd7e5fc3ad587987f6597132d7ca2fef6 2008-09-10T12:43:26-07:00 2008-08-31T08:22:37-07:00 Refactored events controller. Events register Activities. Improved specs 3047bd701e0762ec2a0465af2a2e817208b7a700 Jorge Dias pana@qvitta.net 7e8b820b6e3721c418209e9e45d32807c4ad52b6 Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/ee405ecede7c97598adc0f6440af3d4f7b6f29e2 ee405ecede7c97598adc0f6440af3d4f7b6f29e2 2008-09-10T12:43:26-07:00 2008-08-29T06:05:10-07:00 Events have comments. Showing event attendees 57c4709b9aefd6192b9e2b1048e82ed73c857074 Jorge Dias pana@qvitta.net