13e496e6dfd2ae62e6950b9fa51fdceb33da735a Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/8bb08c4491fe30c5fb209951633d9ec8150e1f2b 8bb08c4491fe30c5fb209951633d9ec8150e1f2b 2009-04-22T14:48:30-07:00 2009-04-22T14:47:49-07:00 Removed FCKEditor support files 70ec014d5f0d218752fec77dd6436cfa017503b3 Michael Hartl michael@michaelhartl.com 55ad289216b47e24ac47ba3fff880681398c2883 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/89ddb1663a7f4b8a7a0f334894def6aeacb607ae 89ddb1663a7f4b8a7a0f334894def6aeacb607ae 2009-03-19T16:47:36-07:00 2009-02-28T11:45:21-08:00 FCKeditor plugin 589e531303928bd09d8e574e46cbef36f7cfcb0d 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 2b3ac2348247fc1e8cb06a3ac170f24ee51d6b21 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b140954edcc88d286e17601112dcdf3147d7e409 b140954edcc88d286e17601112dcdf3147d7e409 2009-03-19T16:47:34-07:00 2009-02-28T11:12:01-08:00 Put Rails 2.2.2 in vendor 7b3e42266977230adcbebf94b1a9702d348b6309 Michael Hartl michael@michaelhartl.com 4438daa2ba5cf5434a398ac165450e1fa9d0e566 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/5a8f9e30d2c19cd16dd252c356929ef5173c729c 5a8f9e30d2c19cd16dd252c356929ef5173c729c 2008-11-10T11:35:22-08:00 2008-11-09T16:17:57-08:00 Updated to new find_mass_assignment plugin a4417ad96fd29561d77fde21e3afb09b3439515c Michael Hartl michael@michaelhartl.com 1f9aedd578aeb4a5297f45890ee38177e2c9ec0b Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/170e28cc786818932f6333bd59282bc1bb725580 170e28cc786818932f6333bd59282bc1bb725580 2008-10-08T18:16:42-07:00 2008-10-08T18:16:42-07:00 Removed New Relic 2c7913a5faa0c7d3214693673ee875e717223b93 Michael Hartl michael@michaelhartl.com cca9b4525e2673ba1e70e3b6f3c2854421cdfb11 16e8867ae6983135ffa251043aa5b8c6c9a6fdfc Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7f1bcd317586412ddde184be16c1419f7c1d61ff 7f1bcd317586412ddde184be16c1419f7c1d61ff 2008-09-21T19:32:54-07:00 2008-09-21T19:32:54-07:00 Merge branch 'edge' into bill_merge 04821cfa8d60daa9d91a1eeab74e52bd2797bdde 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 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 ed0a94cdb2490f4523be0cd5b561d9d1670f1ba9 def761fb4eb4769ccdcbbbe1deb1e582e676718d Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b3555c8442132fb8db573db0f13dd3216e386d7c b3555c8442132fb8db573db0f13dd3216e386d7c 2008-09-19T18:46:35-07:00 2008-09-19T18:46:35-07:00 Merge branch 'edge' into temp Conflicts: app/models/person.rb app/models/preference.rb app/views/admin/preferences/edit.html.erb app/views/admin/preferences/show.html.erb app/views/layouts/application.html.erb config/routes.rb f21522885ec3e4540c6462255fca5cb694039b5b Michael Hartl michael@michaelhartl.com 8aea424d56f5e65578eea6bd0374b6ad31862544 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/65ac02680ab92f27e82586c4176b156b2df6ea6c 65ac02680ab92f27e82586c4176b156b2df6ea6c 2008-09-19T18:03:49-07:00 2008-09-19T18:03:49-07:00 Added code to fix InvalidAuthenticityToken exception 86a6d3b7124918ee9ca6ccd6c05e6d3f84bcb888 Michael Hartl michael@michaelhartl.com 582c50c583f6d150804a0e3dc67c2e43c67303a2 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/8aea424d56f5e65578eea6bd0374b6ad31862544 8aea424d56f5e65578eea6bd0374b6ad31862544 2008-09-19T17:25:02-07:00 2008-09-19T17:25:02-07:00 Added open_id_authentication plugin 3b92cb237785dd43f64562cf67681a387984abdf 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 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 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 f66656cd2875c3abc390066140128fbb1600dbed Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/7cdef27b3e9317685b9d21722cdb8aec208401fc 7cdef27b3e9317685b9d21722cdb8aec208401fc 2008-09-10T12:43:26-07:00 2008-08-24T08:18:44-07:00 Adding privacy Settings, some changes in the views. 9477ebb47ccd5410c909ddacaac4c752bc708e69 Jorge Dias pana@qvitta.net d6303fb72cbb92f77aed3a28934f5187dd571c63 Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/13bc0bae539a700eed9570bb27f71a9fd7bf585b 13bc0bae539a700eed9570bb27f71a9fd7bf585b 2008-09-10T12:43:25-07:00 2008-08-20T13:46:59-07:00 Improving searches on events. Calendar helpers, Date Select Helpers ab0f207bfd74956a178300725d7dc1213c7f2755 Jorge Dias pana@qvitta.net c596d8ecbdb9e8bdad2e87ad74c950ff201ef489 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/d6e076457b541b5af570fc1ec05b7bfcf5a6c284 d6e076457b541b5af570fc1ec05b7bfcf5a6c284 2008-09-05T19:57:30-07:00 2008-09-05T13:32:33-07:00 Upgraded to Rails 2.1.1 0f53202bd4636b19ff11d9d8beaa49b341ebcf1c 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 202acac1cb45dcaa98f2d7ed04d932778be945c3 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/cfce2816d1ca55b36c6f4dc1c86c596232636c0f cfce2816d1ca55b36c6f4dc1c86c596232636c0f 2008-08-13T16:30:59-07:00 2008-08-13T16:30:59-07:00 Added a log warning for caught TamperedWithCookie exceptions 3f9eae286ae0f771a695fde924b5234804adda3e Michael Hartl michael@michaelhartl.com bbf61c1510a663103b283b662c8a0d1bf0c9b256 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/202acac1cb45dcaa98f2d7ed04d932778be945c3 202acac1cb45dcaa98f2d7ed04d932778be945c3 2008-08-12T17:28:08-07:00 2008-08-12T17:28:08-07:00 Catching TamperedWithCookie exception caused by change in 'secret' cookie key. bb72c1cdaf3a5215df9ddec1357047809c50dd35 Michael Hartl michael@michaelhartl.com 7b80d80327c84529e3a09c46dbc34aa837aa3e66 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/82300f769d8737f1cb740b53b9f3fd882969f492 82300f769d8737f1cb740b53b9f3fd882969f492 2008-07-31T15:08:30-07:00 2008-07-31T15:08:30-07:00 Removed deprecated cache_template_extensions eb800b0ace315146f4f5691bb6d8cf4c2d4b611b Michael Hartl michael@michaelhartl.com 825ca094af08bf123ac19cd1a1c8a95457c97a15 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c5a5bf6c5ec53453a0cb3e4887669ea13e7835ad c5a5bf6c5ec53453a0cb3e4887669ea13e7835ad 2008-07-31T14:05:42-07:00 2008-07-31T14:03:39-07:00 Removed footnotes They produce invalid HTML, which I hate. Individual users who want footnotes should install them and use the updated .gitignore to ignore them a89990abf57328bd3ae503e9f2267098bbf4a35b Michael Hartl michael@michaelhartl.com 29c6de8a932b9b2a030529aa5ac94627b3353118 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/dd27682a2c32827e9c8749002857663bbde9ea09 dd27682a2c32827e9c8749002857663bbde9ea09 2008-07-31T12:41:51-07:00 2008-07-31T12:41:51-07:00 Removed BlueCloth vendor gem 94823873d64ce3f8e8a7d63e3998670ffbc5a751 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 228b4886f7fb11d128fa493665aac607d6b9a524 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/e12959be7b76515c1df2f4ece4b4764e631db57f e12959be7b76515c1df2f4ece4b4764e631db57f 2008-07-30T14:36:46-07:00 2008-07-30T14:36:46-07:00 Added newrelic 993c2e73036dbda8dfdb8c0d64810282d6eb8c9f Michael Hartl michael@michaelhartl.com fa16f478447274704269df3517b61e12df09e932 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/228b4886f7fb11d128fa493665aac607d6b9a524 228b4886f7fb11d128fa493665aac607d6b9a524 2008-07-30T14:36:14-07:00 2008-07-30T14:36:07-07:00 Ignoring profiling files 8837292ee0162b82ee46c8a2963e410cfe55f970 Michael Hartl michael@michaelhartl.com 6736f4cd88dd27c6cd945fd54ac0fe3162d58869 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/521ac575f283f49092b86ce3cf38eeacc7c7bc4d 521ac575f283f49092b86ce3cf38eeacc7c7bc4d 2008-07-20T13:15:02-07:00 2008-07-20T13:15:02-07:00 mainly style/position cleanups 38decb9b4a68424b396610a191f35f47aa5a207e blazar blazar+git@gmail.com c35eb68f27897a71804dec31c81f7294bb8933c2 c096ac769f336258cd8d8cc43731817b157e978e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c1642f976e8260ba90e1de61ba4f35a0fbd6b23e c1642f976e8260ba90e1de61ba4f35a0fbd6b23e 2008-07-16T07:26:58-07:00 2008-07-16T07:26:58-07:00 Merge branch 'sphinx' into edge_sphinx 115720e0d685f174729daa47759115550e0d7c0c Michael Hartl michael@michaelhartl.com 6c4fb31f9b21dbbf43663a33b9c52032bdc12610 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c096ac769f336258cd8d8cc43731817b157e978e c096ac769f336258cd8d8cc43731817b157e978e 2008-07-16T07:26:45-07:00 2008-07-16T07:26:45-07:00 Ripped out Ferret stuff 69628d7cad791b347cbb54280b023186aee7c243 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 fa44ff0331f31254271d6d8d2e179d60dde43433 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/c22e2e5bce6bc7cc0a4461946753ed464b2f76b5 c22e2e5bce6bc7cc0a4461946753ed464b2f76b5 2008-07-15T16:32:35-07:00 2008-07-15T16:32:35-07:00 Added updated Ultrasphinx from git://github.com/DrMark/ultrasphinx.git 4dd7913caed772ed237477e957c4a94ecc7839c2 Michael Hartl michael@michaelhartl.com 660d16d6807a703bd78f9e75748785e5e9019b55 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/4317bfb9875e4c7c1a81ac22701d12921900e7f1 4317bfb9875e4c7c1a81ac22701d12921900e7f1 2008-07-14T07:58:56-07:00 2008-07-14T07:58:56-07:00 rebuilt migrations 7c6fb0c3c4f94bf03f8c969a6b3c4b0753ea653f blazar blazar+git@gmail.com