diff app/models/.svn/entries @ 120:cd2282d2aa55 cannam

Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author Chris Cannam
date Thu, 13 Jan 2011 14:33:08 +0000
parents af80e5618e9b 8661b858af72
children 5e974759e8b2
line wrap: on
line diff
--- a/app/models/.svn/entries	Thu Jan 13 13:21:03 2011 +0000
+++ b/app/models/.svn/entries	Thu Jan 13 14:33:08 2011 +0000
@@ -2,13 +2,13 @@
 
 dir
 4707
-http://redmine.rubyforge.org/svn/branches/1.1-stable/app/models
+http://redmine.rubyforge.org/svn/trunk/app/models
 http://redmine.rubyforge.org/svn
 
 
 
-2011-01-13T12:10:52.246705Z
-4707
+2011-01-13T12:04:51.838288Z
+4704
 tmaruyama
 
 
@@ -35,7 +35,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 6edd75717c818c718387e30ec7aee840
 2010-02-01T18:57:12.733490Z
 3358
@@ -69,10 +69,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
-835a62e3e35bb151f4197be745456ee0
-2010-12-29T17:38:57.772516Z
-4576
+2011-01-13T14:09:10.000000Z
+122f4a542fc3b0425bacdf2365e83004
+2011-01-10T19:57:41.641529Z
+4682
 jplang
 has-props
 
@@ -95,7 +95,7 @@
 
 
 
-13658
+13721
 
 repository.rb
 file
@@ -103,10 +103,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
-8a13c5bececd449a741c20b304e6218c
-2011-01-13T12:10:52.246705Z
-4707
+2011-01-13T14:09:10.000000Z
+537f29e1342ca25d24692d4daaeb556a
+2011-01-13T12:04:30.962313Z
+4703
 tmaruyama
 has-props
 
@@ -129,7 +129,7 @@
 
 
 
-6874
+7040
 
 time_entry.rb
 file
@@ -137,7 +137,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:46.956816Z
 aa2cc7da3c19ce52813f08949e6cefec
 2010-10-22T20:40:11.668687Z
 4277
@@ -171,7 +171,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.487730Z
 441a5648e149e471c91928dc7f3f29a6
 2009-06-02T17:24:50.360628Z
 2778
@@ -205,7 +205,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:46.956816Z
 7d895b3a013ce8f4e63dd4e7aab7eb20
 2010-09-28T20:20:00.843023Z
 4221
@@ -239,7 +239,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.467732Z
 87f2ff0401993963de36fe7502cd6949
 2010-02-26T09:13:12.187275Z
 3492
@@ -273,7 +273,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-09-24T12:48:25.923798Z
 01332c0957f952b76c01e7c7ebd112f0
 2010-09-10T18:46:23.747988Z
 4076
@@ -307,7 +307,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.491776Z
 6bf31c0491d87fff1481a91519f66363
 2009-11-15T15:22:55.021661Z
 3064
@@ -341,7 +341,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 cd405a055651d29541f2ebcf4e22f8dc
 2007-03-15T22:11:02.843262Z
 337
@@ -375,7 +375,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 da42817b3f290549a03ada82a93dc5d0
 2007-12-07T10:26:07.864320Z
 955
@@ -409,7 +409,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.467732Z
 622826f16c01373c631876eb1e480a65
 2010-07-24T00:19:32.307471Z
 3860
@@ -443,7 +443,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 90ec955317994a58df9a5a7f85b810e7
 2009-12-25T17:13:58.090736Z
 3240
@@ -477,7 +477,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.487730Z
 d5549b2847a255d4bdd7185a670988b5
 2009-10-21T22:35:03.091600Z
 2952
@@ -511,7 +511,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.475780Z
 95caba31fc55fea2d5ff257e70cf14b2
 2009-12-26T16:14:55.591181Z
 3250
@@ -545,7 +545,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 20b0e57623f5e4f6c1856307a97652c1
 2010-12-12T13:11:53.259618Z
 4491
@@ -579,7 +579,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 028b9a9be35e74573921f9865f953439
 2009-12-25T17:13:58.090736Z
 3240
@@ -613,7 +613,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.475780Z
 50c2305c38ffecfb2138cd437e1c255c
 2009-12-13T14:26:54.396245Z
 3169
@@ -647,7 +647,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:46.956816Z
 3cac6a9c934a472fcbdf99cd00e5bfbb
 2010-10-27T16:27:06.240747Z
 4296
@@ -681,7 +681,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.491776Z
 c72443f206052fafae720378fba40163
 2009-12-13T12:39:22.716082Z
 3167
@@ -715,7 +715,7 @@
 
 
 
-2010-11-30T13:11:53.000000Z
+2010-11-19T13:04:46.956816Z
 a45da72d99c7bc05ce93eb86205942e5
 2010-10-27T16:27:06.240747Z
 4296
@@ -749,7 +749,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 56631baa5560f63cbb213855761c8fcc
 2009-10-25T10:31:01.135799Z
 2970
@@ -783,7 +783,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.467732Z
 0ca314834c39ddc12f2993caf5722e79
 2007-04-25T15:06:20.062636Z
 479
@@ -817,7 +817,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.491776Z
 a6804cb0c0abc6de72a184e7384ed36d
 2009-05-17T09:55:13.601447Z
 2749
@@ -851,7 +851,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 05f6de2ec101b91c331e3b69602f73de
 2010-12-21T21:46:54.984442Z
 4553
@@ -885,7 +885,7 @@
 
 
 
-2010-09-10T14:59:24.000000Z
+2010-09-23T14:37:44.475780Z
 84d28844bbac90dab2c56a27ed58db18
 2010-08-09T05:10:00.803890Z
 3929
@@ -919,7 +919,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 60dadf29c4da2a4e97f463a647b8e98d
 2009-10-21T22:34:22.740755Z
 2945
@@ -953,7 +953,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:46.956816Z
 1c4b2494e527ab830998b06f67b18f52
 2010-11-06T13:23:23.456511Z
 4373
@@ -987,7 +987,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.491776Z
 4561dfcb12b3fa066a9516c59a9eef94
 2010-04-30T12:19:51.238583Z
 3709
@@ -1021,7 +1021,7 @@
 
 
 
-2010-10-01T15:15:02.000000Z
+2010-09-24T12:48:25.923798Z
 f3797cd6a4b7e4d256aba15e317e98b1
 2010-09-05T22:57:20.669640Z
 4062
@@ -1055,7 +1055,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.487730Z
 47067c42f4d6607335adf75d11c3323b
 2007-03-12T17:59:02.654744Z
 333
@@ -1089,7 +1089,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.487730Z
 7dbc4f88d9fcd8f1057ea6d5982a1099
 2008-07-22T18:52:00.008047Z
 1689
@@ -1123,11 +1123,11 @@
 
 
 
-2010-08-12T15:03:25.000000Z
-48b90644181e44606c63f82c3655baa1
-2010-04-16T15:33:49.924704Z
-3672
-edavis10
+2011-01-13T14:09:10.000000Z
+a81e0b41100d375e6327075ab1f59242
+2010-12-31T15:30:50.544770Z
+4599
+jplang
 has-props
 
 
@@ -1149,7 +1149,7 @@
 
 
 
-4344
+4287
 
 setting.rb
 file
@@ -1157,7 +1157,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.487730Z
 5a0ad520fc95e7fefd2c6e6a1c9c3e76
 2010-02-12T22:08:02.981984Z
 3417
@@ -1191,10 +1191,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
-49cad2acbf12f8aa110c07b701610bfd
-2010-12-12T15:13:34.261239Z
-4499
+2011-01-13T14:09:10.000000Z
+06b12cdcbd1d36b8f0a04de3cef91ef4
+2010-12-31T15:30:50.544770Z
+4599
 jplang
 has-props
 
@@ -1217,7 +1217,7 @@
 
 
 
-16067
+15994
 
 auth_source.rb
 file
@@ -1225,7 +1225,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.467732Z
 837db713425e094779466a392a668679
 2010-05-23T03:16:37.499264Z
 3745
@@ -1259,7 +1259,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.475780Z
 b98015db4679606ee5f8d75e55574745
 2009-03-28T00:38:57.780983Z
 2637
@@ -1293,7 +1293,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.475780Z
 66b09263cf7988c661307523991d83d5
 2010-02-06T12:54:13.653502Z
 3373
@@ -1327,7 +1327,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.491776Z
 4e4c64bab677a9e081fc1230ff6a3773
 2007-09-09T17:05:38.846724Z
 720
@@ -1361,7 +1361,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 e79f69fb89a7015471e190050ba97847
 2010-12-04T18:10:02.635321Z
 4467
@@ -1395,7 +1395,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 b76852d33bcfab19bb6c4e3e727da0ed
 2009-03-28T00:38:57.780983Z
 2637
@@ -1429,7 +1429,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 9fdcb569734799b2fface5b9c6207856
 2010-12-23T14:58:52.304263Z
 4574
@@ -1463,7 +1463,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.475780Z
 478dceec50480a17a7f2c321fc59e794
 2009-10-21T22:34:22.740755Z
 2945
@@ -1497,7 +1497,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 aaa3cd558c500d4db3bb506878e12fc1
 2010-11-27T12:42:11.793330Z
 4431
@@ -1531,7 +1531,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.467732Z
 56226fcf13a57b18ed9faf979b5cf1bc
 2010-06-19T03:54:28.250424Z
 3774
@@ -1565,7 +1565,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 2c07c440361210f71d2eb821ce95ce12
 2009-09-12T08:36:46.650954Z
 2869
@@ -1599,10 +1599,10 @@
 
 
 
-2010-08-12T15:03:25.000000Z
-44dc499c4e4dfc3601165f07e6daa4b5
-2010-07-25T10:48:27.199057Z
-3881
+2011-01-13T14:09:10.000000Z
+b659d10bfe8c0debcf69013051422682
+2010-12-31T15:30:50.544770Z
+4599
 jplang
 has-props
 
@@ -1625,7 +1625,7 @@
 
 
 
-3447
+3392
 
 time_entry_activity.rb
 file
@@ -1633,7 +1633,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.487730Z
 2508e3911e5bb016a9925502244b358f
 2009-12-25T17:13:58.090736Z
 3240
@@ -1667,10 +1667,10 @@
 
 
 
-2010-08-12T15:03:25.000000Z
-00670b3218d9d2d2a8435809f524827f
-2009-12-18T15:41:32.828284Z
-3188
+2011-01-13T14:09:10.000000Z
+e7d08a30fb7e14fd7486a7d7e04efccb
+2010-12-31T15:30:50.544770Z
+4599
 jplang
 has-props
 
@@ -1693,7 +1693,7 @@
 
 
 
-2205
+2150
 
 journal_detail.rb
 file
@@ -1701,7 +1701,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.475780Z
 4b700215d4c3bf72071a45448fa2b0e3
 2007-04-24T18:26:42.003879Z
 478
@@ -1735,7 +1735,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 a6be23c5316bf4e17cd5601624202b18
 2010-11-27T14:46:51.426568Z
 4437
@@ -1769,7 +1769,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 d4026d660fcb2601834d26268468aec2
 2009-03-28T00:38:57.780983Z
 2637
@@ -1803,10 +1803,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
-f8f677f0aa9fbee8206a849874375825
-2011-01-02T09:52:29.472983Z
-4614
+2011-01-13T14:09:10.000000Z
+31b78fcec84fafc7077e80a8782e8889
+2011-01-02T09:45:05.291687Z
+4613
 tmaruyama
 has-props
 
@@ -1829,7 +1829,7 @@
 
 
 
-8842
+8976
 
 role.rb
 file
@@ -1837,11 +1837,11 @@
 
 
 
-2010-08-12T15:03:25.000000Z
-47730c63e98da3fdb40ab8551ee3d509
-2010-02-03T17:47:47.868223Z
-3363
-edavis10
+2011-01-13T14:09:10.000000Z
+15c62eb20c0904d6061c427984ea5ad6
+2010-12-31T15:30:50.544770Z
+4599
+jplang
 has-props
 
 
@@ -1863,7 +1863,7 @@
 
 
 
-5143
+5088
 
 project_custom_field.rb
 file
@@ -1871,7 +1871,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.479733Z
 926ef98901f13ba13688fdc3ab0184fc
 2007-03-12T17:59:02.654744Z
 333
@@ -1905,10 +1905,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
-cbad38fbcf063379c191a241b83d1832
-2010-11-27T11:14:28.537906Z
-4430
+2011-01-13T14:09:10.000000Z
+c1467b11ffdf01173add19cbdcbecccd
+2011-01-10T18:32:04.408692Z
+4680
 jplang
 has-props
 
@@ -1931,7 +1931,7 @@
 
 
 
-3104
+3109
 
 custom_value.rb
 file
@@ -1939,7 +1939,7 @@
 
 
 
-2010-11-30T13:11:52.000000Z
+2010-11-19T13:04:46.960863Z
 6938d61d0f9e1fc190bb1d0e6c05546e
 2010-11-07T14:15:01.891476Z
 4382
@@ -1973,10 +1973,10 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 85527d6304192255d188255b78b10fb5
-2011-01-08T10:14:00.269730Z
-4660
+2011-01-06T20:36:31.826591Z
+4645
 jplang
 has-props
 
@@ -2007,7 +2007,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.471831Z
 aeaf540cf9f940cbec4ddfc984dd6af5
 2009-12-25T17:13:58.090736Z
 3240
@@ -2041,7 +2041,7 @@
 
 
 
-2011-01-13T12:50:17.000000Z
+2011-01-13T14:09:10.000000Z
 ce0648ce457209d4a582b3076287bf01
 2010-12-12T17:00:52.100205Z
 4505
@@ -2075,7 +2075,7 @@
 
 
 
-2010-08-12T15:03:25.000000Z
+2010-09-23T14:37:44.487730Z
 41ea06399352eb7b8c2903357abe1ab0
 2008-07-04T17:58:14.743502Z
 1623