38f9349dc6ea9315f53d88db44a2c5e9671bd800 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/faa79d7985bb97a11df7509e31f3d8390ce3677f faa79d7985bb97a11df7509e31f3d8390ce3677f 2008-10-16T15:00:37-07:00 2008-10-16T15:00:37-07:00 Added explanatory note for model declaration b81e2846e98b9e734f062cc5b8247c993379fea6 Michael Hartl michael@michaelhartl.com ae6f455c939a9a243a56ff13ae0c80ce0d9a8e17 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/25837070218a1b74abe0b873f6f8dbdfb2ae5478 25837070218a1b74abe0b873f6f8dbdfb2ae5478 2008-10-14T19:11:00-07:00 2008-10-14T19:11:00-07:00 Rejiggered f0d7d90d2b587c68f8a1bd33634eb4b64262f704 Michael Hartl michael@michaelhartl.com 2839daf4f71b9a79d58a7c3d4e51977667970a15 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/afbf23f0da22af0ee6e5e855ab927b888bc084be afbf23f0da22af0ee6e5e855ab927b888bc084be 2008-10-14T18:58:18-07:00 2008-10-14T18:58:18-07:00 Got photo migrations working 8fafb8b43084b013009b4f85b24f04bbf625224e Michael Hartl michael@michaelhartl.com 8530f2c250dbfbf03d11fa4fcc1c3618671fc878 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/2839daf4f71b9a79d58a7c3d4e51977667970a15 2839daf4f71b9a79d58a7c3d4e51977667970a15 2008-10-14T18:31:00-07:00 2008-10-14T18:31:00-07:00 Skipping the log_activity callback b77c747c04725aad5fcafc14448e1ed623b28b1c Michael Hartl michael@michaelhartl.com 85d87d9e5962e55c50e1376a3aa09fdb342b0c7b Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/8530f2c250dbfbf03d11fa4fcc1c3618671fc878 8530f2c250dbfbf03d11fa4fcc1c3618671fc878 2008-10-14T18:08:55-07:00 2008-10-14T18:08:55-07:00 Photo migrations 3194175846945753e64e99b5f1cc2cddf420aeea 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 e4809c0573bed999bf5da250925ee6c613278319 4a43a3f549d46c238f5ac4d74e8217d7fb10d134 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/582c50c583f6d150804a0e3dc67c2e43c67303a2 582c50c583f6d150804a0e3dc67c2e43c67303a2 2008-09-19T16:35:16-07:00 2008-09-19T16:35:16-07:00 Merge commit 'herestomwiththeweather/master' into openid Conflicts: app/views/sessions/new.html.erb 0faa7c040bf1edb50beb4b644a3d7988003567c0 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 0c6b922557ddcb30da775064298d91849f49ad92 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/81e2acb788b181088b6d1641452e1fdb123d2a74 81e2acb788b181088b6d1641452e1fdb123d2a74 2008-09-15T17:24:01-07:00 2008-09-15T17:24:01-07:00 Removed superfluous blog_post_comments_count column 91c4ef842b40d0729ede2aaa207039d91d4852ac Michael Hartl michael@michaelhartl.com 1652833b0b0246832cd4da27573242f73a73ae17 Tom Brown herestomwiththeweather@gmail.com http://github.com/insoshi/insoshi/commit/ffcb50a95d2233fb5f6a491e116558e8aec61381 ffcb50a95d2233fb5f6a491e116558e8aec61381 2008-09-11T16:26:41-07:00 2008-09-11T16:26:41-07:00 basic whitelist configured through admin interface. if on, all accounts are created in a deactivated state. 88bdefa0cc0020f67b25dfd2be0f1159e9c55f37 Tom Brown herestomwiththeweather@gmail.com 7cdef27b3e9317685b9d21722cdb8aec208401fc Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/3cba7c7163fcb7fcdcbd65802c9f06bd8c92843a 3cba7c7163fcb7fcdcbd65802c9f06bd8c92843a 2008-09-10T12:43:26-07:00 2008-08-24T08:26:38-07:00 Adding cache counter d9e68ad174ba400297d5b47f7aed355a40953f89 Jorge Dias pana@qvitta.net 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 ae84a83bedd259459536c9e4c46e2a5b1ee6fb8b Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/d6303fb72cbb92f77aed3a28934f5187dd571c63 d6303fb72cbb92f77aed3a28934f5187dd571c63 2008-09-10T12:43:25-07:00 2008-08-19T16:02:44-07:00 People can attend or unattend an event b9b1748c58e335c69efa2e48d847078a88e2a507 Jorge Dias pana@qvitta.net 34c0921ff24faef3e6f68f6bbc258e376bdcb293 Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/ae84a83bedd259459536c9e4c46e2a5b1ee6fb8b ae84a83bedd259459536c9e4c46e2a5b1ee6fb8b 2008-09-10T12:43:25-07:00 2008-08-19T13:31:41-07:00 First Commit of events, right now very rough. Doesn't do anything yet 8d1900589f241dc298eb148199acd88af5fcb39c Jorge Dias pana@qvitta.net 98ba5f9b76368061df4203e10752580c240b3115 Tom Brown herestomwiththeweather@gmail.com http://github.com/insoshi/insoshi/commit/b3545446b9068f63271ff04c8017387091d3b88b b3545446b9068f63271ff04c8017387091d3b88b 2008-09-03T02:42:37-07:00 2008-09-03T02:42:37-07:00 openid migration 1f9e3368d399859215c52441c2a0c71b56d5cf4c Tom Brown herestomwiththeweather@gmail.com 153d1971787a2471ae7cc79a4fcd47ffc83dc44e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/cdb094533fb5850d65c5a12c37a592e9766c8ec7 cdb094533fb5850d65c5a12c37a592e9766c8ec7 2008-08-26T11:41:12-07:00 2008-08-26T11:34:51-07:00 Untangled migrations 854ea4d3ec656d0f450c351b7c7f266b632df52f Michael Hartl michael@michaelhartl.com 26ed693c64679dbdef773372653543ab931ec669 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/153d1971787a2471ae7cc79a4fcd47ffc83dc44e 153d1971787a2471ae7cc79a4fcd47ffc83dc44e 2008-08-26T11:14:36-07:00 2008-08-26T11:14:36-07:00 Added in migrations from master e25e7c4d04fe7abaa34bf4fcb2ade2f6df7261e5 Michael Hartl michael@michaelhartl.com a2f5f143fb41d302994196e5bbed8786374e5f5d Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/26ed693c64679dbdef773372653543ab931ec669 26ed693c64679dbdef773372653543ab931ec669 2008-08-26T11:13:31-07:00 2008-08-26T11:13:31-07:00 Removing migrations in preparation for rebuilding them 7bc02269c4d6ecfe27efff43e958b7213929a072 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 7fa9387a3a94e983c2a07e6965715b2328c65fb5 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/bf1aa37bbd95c49ae64a4853416ac06abbf0b03e bf1aa37bbd95c49ae64a4853416ac06abbf0b03e 2008-08-03T09:29:38-07:00 2008-08-03T09:28:48-07:00 Fixed sample data load by adding blog creation in admin migration 61a099bc464f43ca5ec0c82064b498f773aa3b0a Michael Hartl michael@michaelhartl.com 2ed90e22ae7b2f2236db5d75c66c3e5c5daf6b5e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7fa9387a3a94e983c2a07e6965715b2328c65fb5 7fa9387a3a94e983c2a07e6965715b2328c65fb5 2008-08-03T09:08:23-07:00 2008-08-03T09:08:23-07:00 Fixed admin migration bootstrapping problem. 33b308cac449586c6f134cc12d701ce56133571d Michael Hartl michael@michaelhartl.com 7ca200a205bcc0f98eb71d26b0821096709eef6e Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/1967a1aa8e5158552af5276c515f9992069a0ba0 1967a1aa8e5158552af5276c515f9992069a0ba0 2008-07-31T21:30:21-07:00 2008-07-31T21:30:04-07:00 Only bootstrapping message conversations when necessary 0e47e1e0802efaca11bc737b2652e7e6fd3d3dbc 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 10ce2fafb6f6b3b40597eccc9d6e0c69593a3eef Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7b80d80327c84529e3a09c46dbc34aa837aa3e66 7b80d80327c84529e3a09c46dbc34aa837aa3e66 2008-07-31T15:04:04-07:00 2008-07-31T15:04:04-07:00 Added conversation_id index d32359fab8703d7a7bf6bb73f525aac006efc121 Michael Hartl michael@michaelhartl.com 7a346a2b55d1cef4682d15d1709dd34da261cce5 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/10ce2fafb6f6b3b40597eccc9d6e0c69593a3eef 10ce2fafb6f6b3b40597eccc9d6e0c69593a3eef 2008-07-31T14:52:42-07:00 2008-07-31T14:52:42-07:00 Moved conversation bootstrap to its own migration c4ffa6bba11385b97b2554c9e7db569ae410b3bd Michael Hartl michael@michaelhartl.com f3c5dcf02417ec689fe2b88dc0a600ef59296576 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7a346a2b55d1cef4682d15d1709dd34da261cce5 7a346a2b55d1cef4682d15d1709dd34da261cce5 2008-07-31T14:29:51-07:00 2008-07-31T14:29:51-07:00 Added proper ordering in message migration 23488f196b736962429a7e273ab748de3302a1b3 Michael Hartl michael@michaelhartl.com 37519c4e552a743a6cd667efa961a008b9b92fde bd9bb2c23934a5b538ea3070b7e88fa9eeb39e49 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/58b09b80c2b3e02252119f3459515c77d22680fd 58b09b80c2b3e02252119f3459515c77d22680fd 2008-07-31T12:22:10-07:00 2008-07-31T12:22:10-07:00 Merge branch 'messages' into edge Conflicts: config/environment.rb config/initializers/custom_requires.rb b1bf0e817ca6a7de8072e7c168ca94d2427f7f48 Michael Hartl michael@michaelhartl.com 16ab669c86eb604fb60771d38eb19821bb363df0 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/74ff25704092dd2c8563754c3132ee7d1366fcf0 74ff25704092dd2c8563754c3132ee7d1366fcf0 2008-07-31T12:02:33-07:00 2008-07-31T12:02:33-07:00 Added Conversation model and associations b926ddb66760a38dca03671a229bbbde8b69652c Michael Hartl michael@michaelhartl.com cbf89faa1ae5b9542eb0fcf4c169da097f37302b Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/16ab669c86eb604fb60771d38eb19821bb363df0 16ab669c86eb604fb60771d38eb19821bb363df0 2008-07-31T10:05:31-07:00 2008-07-31T10:05:31-07:00 Added a conversations model and some corresponding pending specs d69ed16423da64a27d025fe49a3997fb0b58d31b Michael Hartl michael@michaelhartl.com 0749339591f1ddfc40bb97362120afc9fbabe4f5 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/b6b0be755b072752facd73a5ee5889be5a6d7f80 b6b0be755b072752facd73a5ee5889be5a6d7f80 2008-07-30T20:39:56-07:00 2008-07-30T20:39:56-07:00 Converted the communications table parent_id to an integer Amazingly, it works as a string, which is why it took a while to notice the problem. Even more amazingly, this conversion works even for an existing database; it's smart enough to preserve the information by converting the strings to ints. 86201cb91f0f0f8b0afe0ade2847a9f522d19728 Michael Hartl michael@michaelhartl.com 84158d66e6480f11b64032d3832ef05826f0851e Evan Dorn evan@evan-dorns-power-mac-g5.local http://github.com/insoshi/insoshi/commit/81633e05d3ee83d959d2c4c9afb230692ccc958d 81633e05d3ee83d959d2c4c9afb230692ccc958d 2008-07-20T22:39:38-07:00 2008-07-20T22:39:38-07:00 Declared models in migrations for robustness vs. future changes c6eca2a19aa72197e2f8754e2fba6ed92e2447ca Evan Dorn evan@evan-dorns-power-mac-g5.local d695576868e15cd9bf556917cdbc48a5d51437ac blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/1a1252ef4b8fe332afd7e2bec75e165704e501db 1a1252ef4b8fe332afd7e2bec75e165704e501db 2008-07-19T20:43:20-07:00 2008-07-19T20:43:20-07:00 deleted migration files f3d664d4a224136901d6d7e549f446f7e0c00588 blazar blazar+git@gmail.com 4317bfb9875e4c7c1a81ac22701d12921900e7f1 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/f943e7195642260306b94bcc52088f55e5e79489 f943e7195642260306b94bcc52088f55e5e79489 2008-07-19T15:04:00-07:00 2008-07-19T15:04:00-07:00 some non0changes for michael a9f526c5699c6f754e3e8a66afe2d3466153b6ed blazar blazar+git@gmail.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 09f96388483ef132ae9feed821b06392b85c72c4 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/dc5de1a04f229a6597488928795aad4e738c614f dc5de1a04f229a6597488928795aad4e738c614f 2008-06-27T16:09:46-07:00 2008-06-27T16:09:46-07:00 small changeset on galleries/photos 7f064f1c86a35790f75c9479caa3bcdf037195c0 blazar blazar+git@gmail.com