9a2c3ed6628f02de3c8d41157636e011f61e5fd4 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/2b3ac2348247fc1e8cb06a3ac170f24ee51d6b21 2b3ac2348247fc1e8cb06a3ac170f24ee51d6b21 2009-03-19T16:47:32-07:00 2009-02-02T12:40:06-08:00 Ignoring vim swap files 2ac0083991ddf44925540085035ef96c57333a87 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 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 9a65ecbd1e6359c6ad13cea9d8789940d6c92b17 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/bbf61c1510a663103b283b662c8a0d1bf0c9b256 bbf61c1510a663103b283b662c8a0d1bf0c9b256 2008-08-12T17:10:29-07:00 2008-08-12T17:10:29-07:00 Now generating a unique secret cookie key on a per-install basis c38d49602af96115f4bc70c1ffd330bca6708602 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 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 4cb472f3ac5861c98002d46b1695e5140ecfa7b6 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/3f9a36d139f17a00dcfc8f23bf79fba10feb527d 3f9a36d139f17a00dcfc8f23bf79fba10feb527d 2008-07-29T16:01:27-07:00 2008-07-29T16:01:27-07:00 Ignoring thumbnails aa250c4e74841d44947b2ea93be7757593372b08 Michael Hartl michael@michaelhartl.com 99f1433d1df41e273621c6d7764c592f9f7f120f Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/dc394d1617bdcda65e00dd77a45da39e64fb97e9 dc394d1617bdcda65e00dd77a45da39e64fb97e9 2008-07-23T13:39:14-07:00 2008-07-23T13:39:14-07:00 Added sphinx ignores 996418c23545aba51088b6357808708cf4b7dfd4 Michael Hartl michael@michaelhartl.com cd98d3dd68b2aa9e2e7bf959f26712283b060d9d 2678b245980fe22f715c0eaf2ad9c282e2bf4743 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/6d58af7c3b265a25067697bd3b41af9754e6ebb1 6d58af7c3b265a25067697bd3b41af9754e6ebb1 2008-06-25T11:32:57-07:00 2008-06-25T11:32:57-07:00 merge of piotr's branch after resolving conflicts 2f31311af7c8466e21c436af24a4e0f8a9348314 blazar blazar+git@gmail.com a93bc329b35572885046f260311721fa86c0bfba blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/cd98d3dd68b2aa9e2e7bf959f26712283b060d9d cd98d3dd68b2aa9e2e7bf959f26712283b060d9d 2008-06-25T09:03:44-07:00 2008-06-25T09:03:44-07:00 fckeditor, has easy, jq_ui helper, revert photo changes, add new icons e79b3be3a5f26d600c7a1879d52a90f37730eae0 blazar blazar+git@gmail.com ecda22cd28ed75443888b1330b5518b9239b775c d83e851d36c344fa94ea5adf09d55708005a0c80 Piotr Jakubowski piotrj@piotr-jakubowskis-macbook.local http://github.com/insoshi/insoshi/commit/55bd2a73994f0cf58c07639e5822aa3c9e5d8d6e 55bd2a73994f0cf58c07639e5822aa3c9e5d8d6e 2008-06-20T02:36:13-07:00 2008-06-20T02:36:13-07:00 Merge with latest official release of Insoshi a9055beecceb9fb5028e4922029f4041680f6018 Piotr Jakubowski piotrj@piotr-jakubowskis-macbook.local 6bedcad00964bbe0de2a189b34ffe1f15f1e77fe Long Nguyen long@dr4gn.com http://github.com/insoshi/insoshi/commit/d83e851d36c344fa94ea5adf09d55708005a0c80 d83e851d36c344fa94ea5adf09d55708005a0c80 2008-06-19T21:56:09-07:00 2008-06-19T21:56:09-07:00 Rebase cleanup de7a0678d22c04190ade44bc1e31d9aa0e5dd8fb Long Nguyen long@dr4gn.com 732a9cd1c38ead55cc715377e2ccf4ecc946d941 9a8cc808718c26aed97f6a69d8b4b4e176b0f6d3 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/1f601e4985859730ac1a90ee246170ec3cf8a7b5 1f601e4985859730ac1a90ee246170ec3cf8a7b5 2008-06-12T16:09:52-07:00 2008-06-12T16:09:52-07:00 fixed _topic.html.erb conflict f87662c8704a3049c5230d12307f97163f62bd57 blazar blazar+git@gmail.com 00a6f2b1e53f49b0c14cc2082a304d8c16068111 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/732a9cd1c38ead55cc715377e2ccf4ecc946d941 732a9cd1c38ead55cc715377e2ccf4ecc946d941 2008-06-12T16:07:37-07:00 2008-06-12T16:07:37-07:00 updated gitignore ad3d90ed16689e6df9f5d1ea7634dfa7300d0e04 blazar blazar+git@gmail.com d7ee9aae721c7a0d4c066d2e4e8b5d654b65bbd7 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/00a6f2b1e53f49b0c14cc2082a304d8c16068111 00a6f2b1e53f49b0c14cc2082a304d8c16068111 2008-06-12T16:07:13-07:00 2008-06-12T16:07:13-07:00 updated gitignore be8122400389253928f6ba3c95507e641b31c8e3 blazar blazar+git@gmail.com 8ec714e1f1dc7c789f003e3a63c3ba3345ff54f7 blazar blazar+git@gmail.com http://github.com/insoshi/insoshi/commit/d7ee9aae721c7a0d4c066d2e4e8b5d654b65bbd7 d7ee9aae721c7a0d4c066d2e4e8b5d654b65bbd7 2008-06-12T16:06:39-07:00 2008-06-12T16:06:39-07:00 updated gitignore 465ae16f938caccab49e7adecfd8f5428c6b45de blazar blazar+git@gmail.com a99acf7f9d2804457f400368c9ec6df1520db87f William Lazar williamlazar@Miami-Steve.local http://github.com/insoshi/insoshi/commit/1bb2961e1159c1de7756daa99cde1d68ddb2ea10 1bb2961e1159c1de7756daa99cde1d68ddb2ea10 2008-06-03T16:55:25-07:00 2008-06-03T16:51:14-07:00 Updated .gitignore 3c73953a8c93962957459f3c8ab6da65e5855427 William Lazar williamlazar@Miami-Steve.local ebda9a1f406de604ded08f25aeb6736d4442be24 William Lazar williamlazar@Miami-Steve.local http://github.com/insoshi/insoshi/commit/a99acf7f9d2804457f400368c9ec6df1520db87f a99acf7f9d2804457f400368c9ec6df1520db87f 2008-06-03T16:55:25-07:00 2008-06-03T16:37:21-07:00 Updated to ignore additional docs files 8cf3610d65267ebfaeb867602f6aca0a40db7109 William Lazar williamlazar@Miami-Steve.local 593cafd209abbfb0bc2dc29960f8319d5deb87f7 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/6a531234e43665e34544bff99bce57c684aca63a 6a531234e43665e34544bff99bce57c684aca63a 2008-04-23T20:08:52-07:00 2008-04-23T20:08:52-07:00 Generating keys in rake install af1ec02e275c1be091423044cfbee436c90a3b57 Michael Hartl michael@michaelhartl.com 43dcc968a4308c50fc98d318e477e176cf2605c3 a3bb5aa1de0de3311c609c8562047395abfc0793 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/7de8198d037a62ecfb00f5ef38c3916b74a42207 7de8198d037a62ecfb00f5ef38c3916b74a42207 2008-04-22T21:35:36-07:00 2008-04-22T21:35:36-07:00 Merge commit 'diasjorge/master' into diasjorge Conflicts: app/models/person.rb app/views/connections/index.html.erb app/views/people/_recent_activity.html.erb app/views/people/show.html.erb app/views/shared/_activity.html.erb config/routes.rb 46cedcbf79c4e0f3993146276b30f208aa2ff6f4 Michael Hartl michael@michaelhartl.com 2c8ab0ab2ba6db33d7615b730e7f7a83ee9c8051 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/43dcc968a4308c50fc98d318e477e176cf2605c3 43dcc968a4308c50fc98d318e477e176cf2605c3 2008-04-22T20:16:38-07:00 2008-04-22T20:16:23-07:00 Ignoring pids in the log directory 98df4112467307a17611ce79d23376fe84e63897 Michael Hartl michael@michaelhartl.com 83cbea77eb1a43363d55b66701f1083b4ae8953e Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/b1b6d8e26f0d10a1de5be1fca9218e44102133f1 b1b6d8e26f0d10a1de5be1fca9218e44102133f1 2008-04-19T18:30:59-07:00 2008-04-19T18:30:59-07:00 Changed common friends to common contacts Added pagination with will_paginate to common_connections_with Now this returns the common_connections not the contacts 323d9dd1054eef456444256538eda9802867ce2e Jorge Dias pana@qvitta.net 8a56b74bd5dee9fdcde17f54b281c5367f3193de Jorge Dias pana@qvitta.net http://github.com/insoshi/insoshi/commit/83cbea77eb1a43363d55b66701f1083b4ae8953e 83cbea77eb1a43363d55b66701f1083b4ae8953e 2008-04-19T14:19:01-07:00 2008-04-19T14:19:01-07:00 Added common friends to profile You can see them on a persons profile, if you have any. Also created an action to see all the common friends 0d52a9ebdc6cdd5b05845bb2d12eec57c635f9b5 Jorge Dias pana@qvitta.net b4bda9057eb43b531a6f6fe47f6ae4d61d2da455 4c46ef65f6777755519f3af47239dfed19fddef2 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/9ab47e633a929132b6400cb4d0e30c156149b42b 9ab47e633a929132b6400cb4d0e30c156149b42b 2008-04-17T18:10:07-07:00 2008-04-17T18:10:07-07:00 Merge commit 'calas/master' into calas 617a7c54e5140253fdb42b5540720cae4e2967c1 Michael Hartl michael@michaelhartl.com 2e7fc47bf9ce315f3e2921359d09bd2093c3ee53 Jorge Calás Lozano calas@qvitta.net http://github.com/insoshi/insoshi/commit/04ed5f33b50ebafafc2f308d2ba48799c11c1a55 04ed5f33b50ebafafc2f308d2ba48799c11c1a55 2008-04-17T16:27:25-07:00 2008-04-17T16:27:25-07:00 Fixed Comments bugs in feed and mini-feed * Added type column in comments table for STI * Added type field to comment fixtures 4cbbd5c8cf7b1dffbeb7257e2b59ebb550c05f35 Jorge Calás Lozano calas@qvitta.net fd47d917f0869f5035e00553fad9a57d8b817f8c 411bf343ac4ba16964939b77cd8cf65cf97d7d14 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/89308470b7a4c126d0ed02935cbd1f45ac7095e5 89308470b7a4c126d0ed02935cbd1f45ac7095e5 2008-04-15T17:06:29-07:00 2008-04-15T17:06:29-07:00 Now using Preference model instead of global constants Conflicts: app/models/preference.rb b3babf74b8e84ad7d9304fab8ab28ae450354bf9 Michael Hartl michael@michaelhartl.com 4c75a9f822209fa83736b68cf36129fc17e3e7df Kevin Ansfield kev@digitalblueprint.co.uk http://github.com/insoshi/insoshi/commit/dfa1433850367d9e60ddbd68a05ccc13760fe156 dfa1433850367d9e60ddbd68a05ccc13760fe156 2008-03-27T12:19:36-07:00 2008-03-27T11:56:25-07:00 First run through renaming Events to Activities 279f9d20de655a0ca5c326951ff30a5668c0bb03 Kevin Ansfield kev@digitalblueprint.co.uk 7419c6da4d3c88b3008bff330fcc22dad9a705d0 Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/49badd54701fa93ca1f4bb3bdae0cbdd3260b88f 49badd54701fa93ca1f4bb3bdae0cbdd3260b88f 2008-03-22T21:46:56-07:00 2008-03-22T21:46:56-07:00 Added UUID Added identifier migration ff8e9fbb1a36f401396d12a2dbe42dfd0485be39 Michael Hartl michael@michaelhartl.com 91642098ab136e83c65a77151cfc2e9b0942790c Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/22c4be0870b4b6ae7c9e15ed0725e230e0854048 22c4be0870b4b6ae7c9e15ed0725e230e0854048 2008-03-21T10:35:56-07:00 2008-03-21T10:35:56-07:00 Made email return domain a preferences setting Made example preferences file Added real preferences file to .gitignore 7ab77f2c04e8b6e967243a22050247bab88b4815 Michael Hartl michael@michaelhartl.com Michael Hartl michael@michaelhartl.com http://github.com/insoshi/insoshi/commit/189a6c6b9aac2dca36ef9ef46604db12dbf73e44 189a6c6b9aac2dca36ef9ef46604db12dbf73e44 2008-02-18T15:18:20-08:00 2008-02-18T15:18:20-08:00 init 6b5c4c92edb0caf823dcf55faa1fdfe5945a66a6 Michael Hartl michael@michaelhartl.com