8bb08c4491fe30c5fb209951633d9ec8150e1f2b Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/23ec976d17e5b0fd79257352684ff9b4d9d7671b 23ec976d17e5b0fd79257352684ff9b4d9d7671b 2009-04-22T14:48:41-07:00 2009-04-22T14:48:41-07:00 Reboostrapped RSpec 917f13cf26f15fb44b240d9fc8077b941f87a258 Michael Hartl michael@michaelhartl.com 8764d0977c15fe360e34b82e54ca76639c73472f Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b9d175124557e8f6f84a46a173433e1b88a0253a b9d175124557e8f6f84a46a173433e1b88a0253a 2009-04-22T11:40:21-07:00 2009-04-22T11:40:21-07:00 Axed FCKeditor on About page 139b8200cf05259ca2eb5e8e9ab8583155d88523 Michael Hartl michael@michaelhartl.com 427044abe15729a0592c8cd81affe32355a45e1f Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/fae388e9f07a758e89145318075aab6c83791bd2 fae388e9f07a758e89145318075aab6c83791bd2 2008-09-29T12:01:26-07:00 2008-09-29T12:01:26-07:00 Fixed sample data load 9a6e30c4d685c20299b01ac489575159f598570f 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 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 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 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 5e5dd89748b3ffd325d0128b88f435cfd4846e7d Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/5ec68af08bca2d73f79db5a6765673882455f671 5ec68af08bca2d73f79db5a6765673882455f671 2008-09-17T11:07:08-07:00 2008-09-17T11:07:08-07:00 Fixed sample_data load to use unsafe_create! method aed6cf3f570069a8a2751f4434692f39648fde4e Michael Hartl michael@michaelhartl.com 4a9a63e887fded65098143f04596027d3135a659 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/6cf92e3c6b25a39b2437459c0cce8b82bdd30048 6cf92e3c6b25a39b2437459c0cce8b82bdd30048 2008-09-05T11:48:30-07:00 2008-09-05T11:48:30-07:00 Added db creation to install task 4e3c6df80462ce33c443b47dbe8c01ed330223f4 Michael Hartl michael@michaelhartl.com 68e976d291c639209c696c9fc04d7f2a378f2f3d Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/a2f5f143fb41d302994196e5bbed8786374e5f5d a2f5f143fb41d302994196e5bbed8786374e5f5d 2008-08-23T18:20:32-07:00 2008-08-23T18:20:32-07:00 Fixed a couple more conflicts 8b8aa8fd89b33daad3580d4e24f67564ab688c25 Michael Hartl michael@michaelhartl.com 162e02088c83a4f1b23e9e714076df5badda4ea9 1ddb3f7b800968fc55166c90e205b6b0396346e8 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/68e976d291c639209c696c9fc04d7f2a378f2f3d 68e976d291c639209c696c9fc04d7f2a378f2f3d 2008-08-23T18:05:40-07:00 2008-08-23T18:05:40-07:00 Merge branch 'master' into bill_merge Fixed some conflicts, but not all Conflicts: .gitignore app/controllers/people_controller.rb app/views/layouts/application.html.erb app/views/messages/_message.html.erb app/views/messages/show.html.erb app/views/people/_common_contacts.html.erb app/views/people/show.html.erb config/environment.rb db/migrate/013_add_admin.rb db/migrate/023_add_email_verified.rb db/migrate/025_fix_up_page_views.rb lib/tasks/sample_data.rake vendor/plugins/footnotes-edge/lib/textmate_footnotes.rb f33da6713db0177aa36f09c6f5682223e5c12d5f Michael Hartl michael@michaelhartl.com 0d822608800087a92a1be20b38900b994906de35 90202c84d967bdb539c7c834450bfce7ee8e6efe Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/efdb12604992da3627e6e7bac7df701a2635c3c4 efdb12604992da3627e6e7bac7df701a2635c3c4 2008-08-06T19:24:49-07:00 2008-08-06T19:24:49-07:00 Merge branch 'edge' d5d3c5c69f3b966cdd665f1d65d9ef165eabc3bc Michael Hartl michael@michaelhartl.com 0749339591f1ddfc40bb97362120afc9fbabe4f5 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/0d822608800087a92a1be20b38900b994906de35 0d822608800087a92a1be20b38900b994906de35 2008-08-04T15:12:36-07:00 2008-08-04T15:12:36-07:00 Removed incorrect comment in Rake install task 7b48455c4236bca028c3a8ff1c194dc9781e30d8 Michael Hartl michael@michaelhartl.com 13e6bb416337cd9effbeb47167d9b485626fb215 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/a7d9922d997bd6c0a7c99c2747b5aa06b07ebd20 a7d9922d997bd6c0a7c99c2747b5aa06b07ebd20 2008-08-04T11:26:57-07:00 2008-08-04T11:26:57-07:00 Added some helpful output to sample data load 1fcdddb80453887fc405fffe1e2b4ecea3789b96 Michael Hartl michael@michaelhartl.com f9fbdb19b602b651fc1e441b3c0180cc2cf36248 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/8b11bc9397cf72f14e8dcb73252ac305957f2110 8b11bc9397cf72f14e8dcb73252ac305957f2110 2008-08-04T09:25:18-07:00 2008-07-23T14:07:14-07:00 Fixed db_recycle cba9dbffa13877b49e12376f567bf6109d044048 Michael Hartl michael@michaelhartl.com 16c0cfe59e7bb047d534a0bf1479dc27c44e51e3 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/f9fbdb19b602b651fc1e441b3c0180cc2cf36248 f9fbdb19b602b651fc1e441b3c0180cc2cf36248 2008-08-04T09:25:04-07:00 2008-07-19T18:07:37-07:00 Added long overdue db recycle task fcd88aa4b1f262fb3d8cfac51e6eaee9a1de5e0c Michael Hartl michael@michaelhartl.com 82300f769d8737f1cb740b53b9f3fd882969f492 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7ca200a205bcc0f98eb71d26b0821096709eef6e 7ca200a205bcc0f98eb71d26b0821096709eef6e 2008-07-31T16:30:49-07:00 2008-07-31T16:30:49-07:00 Punted on putting the bootstrap directly in a migration It's a subtle thing: Communication gets the new conversation_id column, but its child class Message doesn't. 217c8e968e560b18c1831f77841c31d683d2bfe0 Michael Hartl michael@michaelhartl.com 2d1dda2d227c39fc6a4f7481d3aafda22d5d9bf1 f4303ae46bc109591594d1bb17904261b8937765 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/9fdc8c96535685a4a03eec71d734504735424312 9fdc8c96535685a4a03eec71d734504735424312 2008-07-30T14:53:36-07:00 2008-07-30T14:53:36-07:00 Merge branch 'optimizing' into edge f9873a437677746a5a2e82e5ac9d03a551583b7b Michael Hartl michael@michaelhartl.com e12959be7b76515c1df2f4ece4b4764e631db57f Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/f4303ae46bc109591594d1bb17904261b8937765 f4303ae46bc109591594d1bb17904261b8937765 2008-07-30T14:37:51-07:00 2008-07-30T14:37:33-07:00 Ripped out less monkeypatching 9d521fb571918fd2f7c06742abeea6e90b272142 Michael Hartl michael@michaelhartl.com 76990a81aad044a7e1ea6ff3745e12095df8530a 3c47af426040bfee42918053f3abac6358090a40 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/f577f211c86e21d2c05f482482d514961f516a30 f577f211c86e21d2c05f482482d514961f516a30 2008-07-29T17:21:41-07:00 2008-07-29T17:21:41-07:00 Merge branch 'optimizing' into edge 4a4fc66e8346fb53185fad04725028e1bce1c5be Michael Hartl michael@michaelhartl.com ed337e42bd8163603dd3c9c8b087d43b43484e2d Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/3c47af426040bfee42918053f3abac6358090a40 3c47af426040bfee42918053f3abac6358090a40 2008-07-29T17:20:51-07:00 2008-07-29T17:20:51-07:00 Refactored improved activity logger 016a875e7d2c297107b787a0fec1833763e6c659 Michael Hartl michael@michaelhartl.com fa208e3f5b36de5e139b2e1856dedc4bdad83f12 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c14929864d6b9b0aeeed1c85b6c17a1f7ef8bb7e c14929864d6b9b0aeeed1c85b6c17a1f7ef8bb7e 2008-07-29T09:37:30-07:00 2008-07-29T09:37:30-07:00 Got feed insert working e9bed566fd9e8851769ef975e8456e3df095ec35 Michael Hartl michael@michaelhartl.com 84158d66e6480f11b64032d3832ef05826f0851e fa208e3f5b36de5e139b2e1856dedc4bdad83f12 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/87419be15726c951397d54cf66569bafdf89b573 87419be15726c951397d54cf66569bafdf89b573 2008-07-23T14:08:28-07:00 2008-07-23T14:08:28-07:00 Merge branch 'master' into edge_master Conflicts: lib/tasks/db_recycle.rake a7a443a5da5a18b3a725efbb9bafd07ffb26aa1e Michael Hartl michael@michaelhartl.com dc394d1617bdcda65e00dd77a45da39e64fb97e9 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/fa208e3f5b36de5e139b2e1856dedc4bdad83f12 fa208e3f5b36de5e139b2e1856dedc4bdad83f12 2008-07-23T14:07:14-07:00 2008-07-23T14:07:14-07:00 Fixed db_recycle cb0bd50326516ea1e3653bee502ae790d85dc32c Michael Hartl michael@michaelhartl.com a886e7db53c67e7da3b270f6030c8d8ce22635fa Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/99f1433d1df41e273621c6d7764c592f9f7f120f 99f1433d1df41e273621c6d7764c592f9f7f120f 2008-07-23T13:36:59-07:00 2008-07-19T18:07:37-07:00 Added long overdue db recycle task 7e297818d78cbfadae42382b417a5c4b3747a3af Michael Hartl michael@michaelhartl.com e278a06c2f02eb6f27f845d8056f1e8384eccc92 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/16c0cfe59e7bb047d534a0bf1479dc27c44e51e3 16c0cfe59e7bb047d534a0bf1479dc27c44e51e3 2008-07-20T14:24:48-07:00 2008-07-20T14:24:48-07:00 cleaning up spec errors, reran model annotation, tweak sample_data task 156688dad29fa0f23343f81a3dbe90d48c4ade05 blazar blazar+git@gmail.com 521ac575f283f49092b86ce3cf38eeacc7c7bc4d blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/e278a06c2f02eb6f27f845d8056f1e8384eccc92 e278a06c2f02eb6f27f845d8056f1e8384eccc92 2008-07-20T13:37:33-07:00 2008-07-20T13:37:33-07:00 fixed create_people sample_data rake function error c86789cd44e4ba26c9d97ce7b0825fdd870abbb7 blazar blazar+git@gmail.com 0207c87b92cbba2d16087b8e6ae355b22cf6903b bafb6df45ee1ad96fe33f9d20d1cd186042eaf48 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/84158d66e6480f11b64032d3832ef05826f0851e 84158d66e6480f11b64032d3832ef05826f0851e 2008-07-19T18:40:34-07:00 2008-07-19T18:40:34-07:00 Merge branch 'sphinx' into edge c0a9a37f3b31e98f545553e24c8ab60f7f435990 Michael Hartl michael@michaelhartl.com dde69d0f6ab4770af1109f846f8924541adcdc9e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/42824e07ca6190ee8e71946633ca4a61d10f4939 42824e07ca6190ee8e71946633ca4a61d10f4939 2008-07-19T18:13:28-07:00 2008-07-19T18:13:28-07:00 Fixed render error for blank search 0961f2eb8483a171c7b01724893f1dd17c06c4f3 Michael Hartl michael@michaelhartl.com a172d1723720c4cba40001eb4770fa2e3f8e3ad6 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/dde69d0f6ab4770af1109f846f8924541adcdc9e dde69d0f6ab4770af1109f846f8924541adcdc9e 2008-07-19T18:07:37-07:00 2008-07-19T18:07:37-07:00 Added long overdue db recycle task 76a98e6ddcfddcf87387dc4a93e44e99160ccf98 Michael Hartl michael@michaelhartl.com c1642f976e8260ba90e1de61ba4f35a0fbd6b23e 5aa52120fcf7d0323c82c1e0f4f5654c0c3a1423 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/8a0458eebef6999c7d4779cff369254d0a6251af 8a0458eebef6999c7d4779cff369254d0a6251af 2008-07-16T14:28:17-07:00 2008-07-16T14:28:17-07:00 Merge branch 'sphinx' into edge_sphinx 2e385a590882362b27a1c74a567e5392fa9520f4 Michael Hartl michael@michaelhartl.com e80b8953bfb00261040fb67dae7f1a8112080df9 Long Nguyen long@dr4gn.com http://github.com/insoshi/insoshi/commit/c59953aebf8d679bf492b3ed1dbdeaeec04c8d9a c59953aebf8d679bf492b3ed1dbdeaeec04c8d9a 2008-07-16T14:10:25-07:00 2008-07-16T13:58:48-07:00 Additional ferret cleanup part 3 53c17223068bdf3e8c435c905eb702ec823a2195 Michael Hartl michael@michaelhartl.com c096ac769f336258cd8d8cc43731817b157e978e Long Nguyen long@dr4gn.com http://github.com/insoshi/insoshi/commit/19c8f78b4b69c1cfb6addbb869b25c4ba341b045 19c8f78b4b69c1cfb6addbb869b25c4ba341b045 2008-07-16T14:09:58-07:00 2008-07-16T13:35:30-07:00 Additional ferret cleanup 6d2b642dbf66135c4884328a0736ad57be759584 Michael Hartl michael@michaelhartl.com c86a7dd66acbaa851caf787e7981e66ab97d2937 c22e2e5bce6bc7cc0a4461946753ed464b2f76b5 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c35eb68f27897a71804dec31c81f7294bb8933c2 c35eb68f27897a71804dec31c81f7294bb8933c2 2008-07-15T16:33:55-07:00 2008-07-15T16:33:55-07:00 Merge branch 'sphinx' into edge_sphinx Conflicts: README.rdoc 6460d81c3d9c4e502919c21676d718725c092adb Michael Hartl michael@michaelhartl.com