Mercurial > hg > soundsoftware-site
diff app/models/.svn/entries @ 246:eeebe205a056 cannam
* Merge from default branch, bringing us up to SVN trunk rev 4993
author | Chris Cannam |
---|---|
date | Thu, 03 Mar 2011 12:02:03 +0000 |
parents | 5e974759e8b2 051f544170fe |
children | 753f1380d6bc |
line wrap: on
line diff
--- a/app/models/.svn/entries Thu Jan 20 09:59:02 2011 +0000 +++ b/app/models/.svn/entries Thu Mar 03 12:02:03 2011 +0000 @@ -1,15 +1,15 @@ 10 dir -4732 +4993 http://redmine.rubyforge.org/svn/trunk/app/models http://redmine.rubyforge.org/svn -2011-01-16T15:36:42.998302Z -4730 -jplang +2011-03-01T10:27:30.170724Z +4982 +tmaruyama @@ -35,11 +35,11 @@ -2010-09-23T14:37:44.471831Z -6edd75717c818c718387e30ec7aee840 -2010-02-01T18:57:12.733490Z -3358 -edavis10 +2011-03-03T11:05:09.000000Z +190c117fe2ccfc4b1ebe70ae94e0d779 +2011-01-23T16:47:59.732003Z +4759 +jplang has-props @@ -61,7 +61,7 @@ -1995 +2197 mail_handler.rb file @@ -69,11 +69,11 @@ -2011-01-13T14:09:10.000000Z -122f4a542fc3b0425bacdf2365e83004 -2011-01-10T19:57:41.641529Z -4682 -jplang +2011-03-03T11:40:18.000000Z +ed655ccb5c306f548b3997d2dd3e3d60 +2011-02-12T10:08:11.630366Z +4820 +jbbarth has-props @@ -95,7 +95,7 @@ -13721 +13778 repository.rb file @@ -103,10 +103,10 @@ -2011-01-19T15:03:32.000000Z -ef582464c7d04e61c0149608ea3dd11c -2011-01-14T22:51:12.547821Z -4712 +2011-03-03T11:40:18.000000Z +a3fb46324c320aab8869e523c2a35d2a +2011-03-01T10:27:30.170724Z +4982 tmaruyama has-props @@ -129,7 +129,7 @@ -7023 +8497 time_entry.rb file @@ -137,7 +137,7 @@ -2011-01-19T15:03:32.000000Z +2011-03-03T11:05:09.000000Z db327d70b8e3bcf04992bf7c69522467 2011-01-14T18:04:16.470040Z 4708 @@ -171,7 +171,7 @@ -2010-09-23T14:37:44.487730Z +2011-03-03T11:05:09.000000Z 441a5648e149e471c91928dc7f3f29a6 2009-06-02T17:24:50.360628Z 2778 @@ -205,7 +205,7 @@ -2010-11-19T13:04:46.956816Z +2011-03-03T11:05:09.000000Z 7d895b3a013ce8f4e63dd4e7aab7eb20 2010-09-28T20:20:00.843023Z 4221 @@ -239,10 +239,10 @@ -2010-09-23T14:37:44.467732Z -87f2ff0401993963de36fe7502cd6949 -2010-02-26T09:13:12.187275Z -3492 +2011-03-03T11:40:18.000000Z +82898965a0c07d8fa25a52cfced3139f +2011-02-26T13:09:25.657748Z +4950 jplang has-props @@ -273,7 +273,7 @@ -2010-09-24T12:48:25.923798Z +2011-03-03T11:05:09.000000Z 01332c0957f952b76c01e7c7ebd112f0 2010-09-10T18:46:23.747988Z 4076 @@ -307,7 +307,7 @@ -2010-09-23T14:37:44.491776Z +2011-03-03T11:05:09.000000Z 6bf31c0491d87fff1481a91519f66363 2009-11-15T15:22:55.021661Z 3064 @@ -341,7 +341,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z cd405a055651d29541f2ebcf4e22f8dc 2007-03-15T22:11:02.843262Z 337 @@ -375,7 +375,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z da42817b3f290549a03ada82a93dc5d0 2007-12-07T10:26:07.864320Z 955 @@ -409,7 +409,7 @@ -2010-09-23T14:37:44.467732Z +2011-03-03T11:05:09.000000Z 622826f16c01373c631876eb1e480a65 2010-07-24T00:19:32.307471Z 3860 @@ -443,7 +443,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z 90ec955317994a58df9a5a7f85b810e7 2009-12-25T17:13:58.090736Z 3240 @@ -477,10 +477,10 @@ -2011-01-19T15:03:32.000000Z -910893e1e82a08d072a65d7c7c3dc8a8 -2011-01-15T14:12:18.630628Z -4723 +2011-03-03T11:40:18.000000Z +de5e44263227d075bddb23d8f478e24d +2011-02-27T13:34:41.060565Z +4954 jplang has-props @@ -503,7 +503,7 @@ -32309 +32300 member_role.rb file @@ -511,7 +511,7 @@ -2010-09-23T14:37:44.475780Z +2011-03-03T11:05:09.000000Z 95caba31fc55fea2d5ff257e70cf14b2 2009-12-26T16:14:55.591181Z 3250 @@ -545,7 +545,7 @@ -2010-09-23T14:37:44.487730Z +2011-03-03T11:05:09.000000Z d5549b2847a255d4bdd7185a670988b5 2009-10-21T22:35:03.091600Z 2952 @@ -579,7 +579,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z 028b9a9be35e74573921f9865f953439 2009-12-25T17:13:58.090736Z 3240 @@ -613,7 +613,7 @@ -2010-09-23T14:37:44.475780Z +2011-03-03T11:05:09.000000Z 50c2305c38ffecfb2138cd437e1c255c 2009-12-13T14:26:54.396245Z 3169 @@ -647,7 +647,7 @@ -2010-09-23T14:37:44.491776Z +2011-03-03T11:05:09.000000Z c72443f206052fafae720378fba40163 2009-12-13T12:39:22.716082Z 3167 @@ -681,7 +681,7 @@ -2010-11-19T13:04:46.956816Z +2011-03-03T11:05:09.000000Z 3cac6a9c934a472fcbdf99cd00e5bfbb 2010-10-27T16:27:06.240747Z 4296 @@ -715,7 +715,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z 56631baa5560f63cbb213855761c8fcc 2009-10-25T10:31:01.135799Z 2970 @@ -749,11 +749,11 @@ -2010-11-19T13:04:46.956816Z -a45da72d99c7bc05ce93eb86205942e5 -2010-10-27T16:27:06.240747Z -4296 -edavis10 +2011-03-03T11:40:18.000000Z +f95a3be2b4090d0bd5b7d74b9e1d0a7c +2011-02-27T12:35:31.414622Z +4952 +jplang has-props @@ -775,7 +775,7 @@ -6720 +6539 comment.rb file @@ -783,7 +783,7 @@ -2010-09-23T14:37:44.467732Z +2011-03-03T11:05:09.000000Z 0ca314834c39ddc12f2993caf5722e79 2007-04-25T15:06:20.062636Z 479 @@ -817,7 +817,7 @@ -2010-09-23T14:37:44.491776Z +2011-03-03T11:05:09.000000Z a6804cb0c0abc6de72a184e7384ed36d 2009-05-17T09:55:13.601447Z 2749 @@ -851,10 +851,10 @@ -2011-01-13T14:09:10.000000Z -05f6de2ec101b91c331e3b69602f73de -2010-12-21T21:46:54.984442Z -4553 +2011-03-03T11:40:18.000000Z +886a34f5ef28f29a9eadb6e24dee89d6 +2011-02-20T13:03:32.835478Z +4888 jplang has-props @@ -877,7 +877,7 @@ -26177 +26359 member.rb file @@ -885,7 +885,7 @@ -2010-09-23T14:37:44.475780Z +2011-03-03T11:05:09.000000Z 84d28844bbac90dab2c56a27ed58db18 2010-08-09T05:10:00.803890Z 3929 @@ -919,7 +919,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z 60dadf29c4da2a4e97f463a647b8e98d 2009-10-21T22:34:22.740755Z 2945 @@ -953,10 +953,10 @@ -2010-11-19T13:04:46.956816Z -1c4b2494e527ab830998b06f67b18f52 -2010-11-06T13:23:23.456511Z -4373 +2011-03-03T11:05:09.000000Z +f7340d6a500dabc6fa0aae801539d5e5 +2011-01-23T10:22:00.456857Z +4752 jplang has-props @@ -979,7 +979,7 @@ -18490 +18498 journal.rb file @@ -987,7 +987,7 @@ -2010-09-24T12:48:25.923798Z +2011-03-03T11:05:09.000000Z f3797cd6a4b7e4d256aba15e317e98b1 2010-09-05T22:57:20.669640Z 4062 @@ -1021,7 +1021,7 @@ -2010-09-23T14:37:44.491776Z +2011-03-03T11:05:09.000000Z 4561dfcb12b3fa066a9516c59a9eef94 2010-04-30T12:19:51.238583Z 3709 @@ -1055,7 +1055,7 @@ -2010-09-23T14:37:44.487730Z +2011-03-03T11:05:09.000000Z 47067c42f4d6607335adf75d11c3323b 2007-03-12T17:59:02.654744Z 333 @@ -1089,7 +1089,7 @@ -2010-09-23T14:37:44.487730Z +2011-03-03T11:05:09.000000Z 7dbc4f88d9fcd8f1057ea6d5982a1099 2008-07-22T18:52:00.008047Z 1689 @@ -1123,7 +1123,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z a81e0b41100d375e6327075ab1f59242 2010-12-31T15:30:50.544770Z 4599 @@ -1157,11 +1157,11 @@ -2010-09-23T14:37:44.487730Z -5a0ad520fc95e7fefd2c6e6a1c9c3e76 -2010-02-12T22:08:02.981984Z -3417 -edavis10 +2011-03-03T11:40:18.000000Z +2815413f18c2ff6c015f0742ac28710a +2011-02-21T09:41:34.953350Z +4899 +tmaruyama has-props @@ -1183,7 +1183,7 @@ -5164 +5188 user.rb file @@ -1191,10 +1191,10 @@ -2011-01-19T15:03:32.000000Z -f1782d2190897c738b4abde29795c25c -2011-01-16T15:36:42.998302Z -4730 +2011-03-03T11:40:18.000000Z +8616fc89354fef549fdfc741600c1118 +2011-02-23T17:27:31.762248Z +4936 jplang has-props @@ -1217,7 +1217,7 @@ -17792 +19152 auth_source.rb file @@ -1225,11 +1225,11 @@ -2010-09-23T14:37:44.467732Z -837db713425e094779466a392a668679 -2010-05-23T03:16:37.499264Z -3745 -edavis10 +2011-03-03T11:40:18.000000Z +f746a9534698bb8db5abf4bb7c9dd5ef +2011-02-26T13:09:25.657748Z +4950 +jplang has-props @@ -1251,7 +1251,7 @@ -1811 +2013 news_observer.rb file @@ -1259,7 +1259,7 @@ -2010-09-23T14:37:44.475780Z +2011-03-03T11:05:09.000000Z b98015db4679606ee5f8d75e55574745 2009-03-28T00:38:57.780983Z 2637 @@ -1293,10 +1293,10 @@ -2010-09-23T14:37:44.475780Z -66b09263cf7988c661307523991d83d5 -2010-02-06T12:54:13.653502Z -3373 +2011-03-03T11:05:09.000000Z +82f0a68c26f05f4ed6aa94418a447a00 +2011-01-23T16:47:59.732003Z +4759 jplang has-props @@ -1319,7 +1319,7 @@ -3576 +3789 wiki_redirect.rb file @@ -1327,7 +1327,7 @@ -2010-09-23T14:37:44.491776Z +2011-03-03T11:05:09.000000Z 4e4c64bab677a9e081fc1230ff6a3773 2007-09-09T17:05:38.846724Z 720 @@ -1361,7 +1361,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z e79f69fb89a7015471e190050ba97847 2010-12-04T18:10:02.635321Z 4467 @@ -1395,7 +1395,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z b76852d33bcfab19bb6c4e3e727da0ed 2009-03-28T00:38:57.780983Z 2637 @@ -1429,7 +1429,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z 9fdcb569734799b2fface5b9c6207856 2010-12-23T14:58:52.304263Z 4574 @@ -1463,7 +1463,7 @@ -2010-09-23T14:37:44.475780Z +2011-03-03T11:05:09.000000Z 478dceec50480a17a7f2c321fc59e794 2009-10-21T22:34:22.740755Z 2945 @@ -1497,7 +1497,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z aaa3cd558c500d4db3bb506878e12fc1 2010-11-27T12:42:11.793330Z 4431 @@ -1531,11 +1531,11 @@ -2010-09-23T14:37:44.467732Z -56226fcf13a57b18ed9faf979b5cf1bc -2010-06-19T03:54:28.250424Z -3774 -edavis10 +2011-03-03T11:05:09.000000Z +527c189ff333588f46ed31db163dcc5c +2011-01-23T10:41:43.320139Z +4755 +jplang has-props @@ -1557,7 +1557,7 @@ -6702 +6756 group_custom_field.rb file @@ -1565,7 +1565,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z 2c07c440361210f71d2eb821ce95ce12 2009-09-12T08:36:46.650954Z 2869 @@ -1599,10 +1599,10 @@ -2011-01-13T14:09:10.000000Z -b659d10bfe8c0debcf69013051422682 -2010-12-31T15:30:50.544770Z -4599 +2011-03-03T11:40:18.000000Z +4670d7c2c9ef9e23b0812e79c84c02de +2011-02-20T15:38:07.840581Z +4895 jplang has-props @@ -1625,7 +1625,7 @@ -3392 +3396 time_entry_activity.rb file @@ -1633,7 +1633,7 @@ -2010-09-23T14:37:44.487730Z +2011-03-03T11:05:09.000000Z 2508e3911e5bb016a9925502244b358f 2009-12-25T17:13:58.090736Z 3240 @@ -1667,7 +1667,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z e7d08a30fb7e14fd7486a7d7e04efccb 2010-12-31T15:30:50.544770Z 4599 @@ -1701,10 +1701,10 @@ -2010-09-23T14:37:44.475780Z -4b700215d4c3bf72071a45448fa2b0e3 -2007-04-24T18:26:42.003879Z -478 +2011-03-03T11:40:18.000000Z +5f341c076b3e061541111187994969c8 +2011-02-27T13:34:41.060565Z +4954 jplang has-props @@ -1727,7 +1727,7 @@ -1028 +864 group.rb file @@ -1735,7 +1735,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z a6be23c5316bf4e17cd5601624202b18 2010-11-27T14:46:51.426568Z 4437 @@ -1769,7 +1769,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z d4026d660fcb2601834d26268468aec2 2009-03-28T00:38:57.780983Z 2637 @@ -1803,10 +1803,10 @@ -2011-01-13T14:09:10.000000Z -31b78fcec84fafc7077e80a8782e8889 -2011-01-02T09:45:05.291687Z -4613 +2011-03-03T11:40:18.000000Z +949462e61d78ec8bd5afc1af77363985 +2011-02-28T12:09:32.515358Z +4962 tmaruyama has-props @@ -1829,7 +1829,7 @@ -8976 +9103 role.rb file @@ -1837,7 +1837,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z 15c62eb20c0904d6061c427984ea5ad6 2010-12-31T15:30:50.544770Z 4599 @@ -1871,7 +1871,7 @@ -2010-09-23T14:37:44.479733Z +2011-03-03T11:05:09.000000Z 926ef98901f13ba13688fdc3ab0184fc 2007-03-12T17:59:02.654744Z 333 @@ -1905,7 +1905,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z c1467b11ffdf01173add19cbdcbecccd 2011-01-10T18:32:04.408692Z 4680 @@ -1939,7 +1939,7 @@ -2010-11-19T13:04:46.960863Z +2011-03-03T11:05:09.000000Z 6938d61d0f9e1fc190bb1d0e6c05546e 2010-11-07T14:15:01.891476Z 4382 @@ -1973,7 +1973,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z 85527d6304192255d188255b78b10fb5 2011-01-06T20:36:31.826591Z 4645 @@ -2007,7 +2007,7 @@ -2010-09-23T14:37:44.471831Z +2011-03-03T11:05:09.000000Z aeaf540cf9f940cbec4ddfc984dd6af5 2009-12-25T17:13:58.090736Z 3240 @@ -2041,7 +2041,7 @@ -2011-01-13T14:09:10.000000Z +2011-03-03T11:05:09.000000Z ce0648ce457209d4a582b3076287bf01 2010-12-12T17:00:52.100205Z 4505 @@ -2075,10 +2075,10 @@ -2010-09-23T14:37:44.487730Z -41ea06399352eb7b8c2903357abe1ab0 -2008-07-04T17:58:14.743502Z -1623 +2011-03-03T11:40:18.000000Z +feac9af79af67a78c767bd3def262255 +2011-02-21T09:53:29.844413Z +4900 jplang has-props @@ -2101,5 +2101,5 @@ -1513 +1671