diff app/controllers/.svn/entries @ 442:753f1380d6bc cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Mon, 06 Jun 2011 14:41:04 +0100
parents eeebe205a056 cbce1fd3b1b7
children 851510f1b535
line wrap: on
line diff
--- a/app/controllers/.svn/entries	Thu Mar 03 15:08:45 2011 +0000
+++ b/app/controllers/.svn/entries	Mon Jun 06 14:41:04 2011 +0100
@@ -1,14 +1,14 @@
 10
 
 dir
-4993
-http://redmine.rubyforge.org/svn/trunk/app/controllers
+6000
+http://redmine.rubyforge.org/svn/branches/1.2-stable/app/controllers
 http://redmine.rubyforge.org/svn
 
 
 
-2011-02-27T13:34:41.060565Z
-4954
+2011-05-29T07:24:15.223638Z
+5946
 jplang
 
 
@@ -32,11 +32,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-b2f39d4816a34c8fdbe451324ff298e4
-2011-01-22T13:28:20.816262Z
-4741
-jplang
+2011-06-06T13:18:33.000000Z
+d59e2a3cb278ad2ba6a857ef6f85996f
+2011-05-17T04:34:03.515027Z
+5823
+tmaruyama
 has-props
 
 
@@ -58,7 +58,7 @@
 
 
 
-12253
+12798
 
 queries_controller.rb
 file
@@ -66,11 +66,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-7ad6758cfd160c4b6ef6d71be06e087c
-2010-04-19T15:08:28.751734Z
-3684
-edavis10
+2011-06-06T13:18:33.000000Z
+d5fb2cc0fcbed592991370967f38af2b
+2011-04-03T14:31:32.940784Z
+5304
+jplang
 has-props
 
 
@@ -92,7 +92,7 @@
 
 
 
-2999
+3261
 
 sys_controller.rb
 file
@@ -100,7 +100,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 7a73aba15fcd447531d1552de01706d9
 2009-12-20T09:44:28.044710Z
 3201
@@ -134,11 +134,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-612f3e7497e14c728934e83fbe5778c4
-2009-12-20T09:45:04.782778Z
-3202
-jplang
+2011-06-06T13:18:33.000000Z
+a198d0cd4a30c00a40a646cecbbe71e2
+2011-05-18T07:13:08.785903Z
+5838
+tmaruyama
 has-props
 
 
@@ -160,7 +160,7 @@
 
 
 
-1588
+1571
 
 watchers_controller.rb
 file
@@ -168,11 +168,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-3ee494bd8196306eab8913bd462b44da
-2010-06-20T16:08:15.578906Z
-3798
-edavis10
+2011-06-06T13:18:33.000000Z
+74083636df6bb82e8dc1f4fbd3da2882
+2011-04-05T12:09:15.508559Z
+5320
+jplang
 has-props
 
 
@@ -194,7 +194,7 @@
 
 
 
-3234
+3021
 
 auto_completes_controller.rb
 file
@@ -202,7 +202,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 edbdb443ff7cc8f299f7772b3532eca1
 2010-12-12T16:06:43.892596Z
 4503
@@ -236,7 +236,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 40ea055e0f9f9aa83680751fdab5a0a5
 2010-12-12T14:25:23.262992Z
 4497
@@ -270,7 +270,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 c2289eb9b654117a101c072955d4c705
 2010-09-23T15:20:19.085385Z
 4172
@@ -304,7 +304,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 20e245fa61dc0dcb2f105a8f0e6af98c
 2010-06-19T19:51:43.174421Z
 3784
@@ -338,10 +338,10 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-596c3ab10f8cf4687f6d8b163e7a2243
-2010-12-29T19:55:52.079810Z
-4580
+2011-06-06T13:18:33.000000Z
+ee556c18cb658bef786cc6f69388f9b8
+2011-04-17T15:17:18.418900Z
+5495
 jplang
 
 
@@ -364,7 +364,7 @@
 
 
 
-1847
+2432
 
 welcome_controller.rb
 file
@@ -372,7 +372,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 95ad1acf7766861a4dbd0aebd9c847de
 2009-10-21T03:21:31.657956Z
 2941
@@ -406,10 +406,10 @@
 
 
 
-2011-03-03T11:40:18.000000Z
-0610cb98929633e94c97f1060f4f1566
-2011-02-27T13:34:41.060565Z
-4954
+2011-06-06T13:18:33.000000Z
+ddbc5c8699b975f1a27001b7ffd6d930
+2011-03-06T16:04:35.458860Z
+5021
 jplang
 has-props
 
@@ -432,7 +432,7 @@
 
 
 
-4081
+4105
 
 time_entry_reports_controller.rb
 file
@@ -440,7 +440,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 dadcb57d89dc3c90c5fa099b143c07f8
 2010-10-05T16:07:17.015270Z
 4232
@@ -474,7 +474,7 @@
 
 
 
-2011-03-03T11:40:18.000000Z
+2011-06-06T13:14:59.000000Z
 73cdba17212ad890eea7b7c7ee140d7e
 2011-02-20T15:38:07.840581Z
 4895
@@ -508,7 +508,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 8f7e6e7308912a6169a700b0c88174a0
 2010-04-27T16:43:52.584075Z
 3692
@@ -542,7 +542,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 828b364ba2850ceddb3caa566bf10124
 2010-09-10T16:00:49.687515Z
 4075
@@ -570,17 +570,17 @@
 
 856
 
-custom_fields_controller.rb
+timelog_controller.rb
 file
 
 
 
 
-2011-03-03T11:05:10.000000Z
-00272455ac5be11da48f92c4a443c538
-2010-04-03T11:54:24.331654Z
-3627
-winterheart
+2011-06-06T13:18:33.000000Z
+240786bf604abb8c412b2776b93a2795
+2011-05-29T07:24:15.223638Z
+5946
+jplang
 has-props
 
 
@@ -602,7 +602,7 @@
 
 
 
-2373
+12415
 
 settings_controller.rb
 file
@@ -610,10 +610,78 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-98c4c9f33f038160a44752d229926c32
-2010-11-27T14:06:11.754120Z
-4432
+2011-06-06T13:18:33.000000Z
+cef6dc401dea01bdddca8a8a405aeaee
+2011-05-18T02:18:47.811055Z
+5827
+tmaruyama
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2286
+
+custom_fields_controller.rb
+file
+
+
+
+
+2011-06-06T13:18:33.000000Z
+e87f5ffac690480de57ac0a90daad01c
+2011-05-01T23:15:03.415033Z
+5611
+tmaruyama
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2395
+
+users_controller.rb
+file
+
+
+
+
+2011-06-06T13:18:33.000000Z
+24f3515ac133508d948f9b73fca6656a
+2011-04-05T12:57:18.861470Z
+5328
 jplang
 has-props
 
@@ -636,41 +704,7 @@
 
 
 
-2271
-
-timelog_controller.rb
-file
-
-
-
-
-2011-03-03T11:05:10.000000Z
-3e6698f208a263105c7b4a59c60b26b3
-2010-12-14T18:29:24.891563Z
-4511
-jplang
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-10484
+8639
 
 issue_moves_controller.rb
 file
@@ -678,67 +712,33 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-cacd6ffe0ce299e2ede9d45b7ef8af42
-2010-10-25T18:44:46.868009Z
-4292
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2441
-
-users_controller.rb
-file
-
-
-
-
-2011-03-03T11:05:10.000000Z
-7860374d98cda03916d9b06d9ec8d370
-2011-01-16T15:23:11.666065Z
-4729
-jplang
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-8474
+2011-06-06T13:18:33.000000Z
+cbd01754dc3edc7ce30bd9e401608908
+2011-05-17T03:59:02.899695Z
+5821
+tmaruyama
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2435
 
 files_controller.rb
 file
@@ -746,33 +746,33 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-f0246e8f8dde5ea7b93e4dc2162181fc
-2010-09-26T08:07:41.604064Z
-4177
-jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1289
+2011-06-06T13:18:33.000000Z
+e40d3a7211765dd6a7dd0fde90906bab
+2011-05-18T07:12:48.748391Z
+5837
+tmaruyama
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1273
 
 application_controller.rb
 file
@@ -780,11 +780,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-218c497f1c4c6d7b41cdac214e595156
-2010-12-23T14:49:14.339855Z
-4573
-jplang
+2011-06-06T13:18:33.000000Z
+bc154e2fdd08480fb618932b2f969313
+2011-05-12T04:25:47.924303Z
+5749
+tmaruyama
 has-props
 
 
@@ -806,75 +806,7 @@
 
 
 
-15545
-
-previews_controller.rb
-file
-
-
-
-
-2011-03-03T11:05:10.000000Z
-c5ae4fae18159e70fd81c2487bb1daa1
-2010-09-24T16:26:46.819682Z
-4174
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-957
-
-ldap_auth_sources_controller.rb
-file
-
-
-
-
-2011-03-03T11:05:10.000000Z
-5f7b9cb2e9c8a60db58ea0833cf481c5
-2010-05-23T03:16:31.304135Z
-3744
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-917
+15561
 
 auth_sources_controller.rb
 file
@@ -882,7 +814,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 237280766d09418161536250d514a7bf
 2010-05-23T03:16:31.304135Z
 3744
@@ -910,13 +842,81 @@
 
 2542
 
+ldap_auth_sources_controller.rb
+file
+
+
+
+
+2011-06-06T13:14:59.000000Z
+5f7b9cb2e9c8a60db58ea0833cf481c5
+2010-05-23T03:16:31.304135Z
+3744
+edavis10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+917
+
+previews_controller.rb
+file
+
+
+
+
+2011-06-06T13:18:33.000000Z
+fa4b7467e77f8a7bc86ff60a68052684
+2011-03-28T21:45:30.892324Z
+5246
+jplang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1754
+
 search_controller.rb
 file
 
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 0015154998f830227b636ee423f007f3
 2010-06-20T20:01:32.722003Z
 3806
@@ -950,7 +950,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 f3f4378ec15e1401ead0dcac4e9cb059
 2010-03-03T17:05:00.967826Z
 3528
@@ -978,13 +978,47 @@
 
 5824
 
+versions_controller.rb
+file
+
+
+
+
+2011-06-06T13:14:59.000000Z
+a98fb262a20669600a85c0f72202c5e6
+2010-11-01T13:13:32.982466Z
+4354
+jplang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6241
+
 issue_relations_controller.rb
 file
 
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 8c5249f85056c74e0ab06b5dfa9fed72
 2011-01-27T21:38:47.430923Z
 4764
@@ -1012,47 +1046,13 @@
 
 2450
 
-versions_controller.rb
-file
-
-
-
-
-2011-03-03T11:05:10.000000Z
-a98fb262a20669600a85c0f72202c5e6
-2010-11-01T13:13:32.982466Z
-4354
-jplang
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6241
-
 boards_controller.rb
 file
 
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 52638c82da929081099076d5aa0f9212
 2010-08-16T23:39:27.396462Z
 3942
@@ -1086,11 +1086,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-21c0e5d894d1429ac39f3253ae021594
-2010-01-05T18:16:03.565347Z
-3281
-jplang
+2011-06-06T13:18:33.000000Z
+c679c8cbf25d1c5d30e2f88bb177a202
+2011-05-18T07:12:27.059090Z
+5836
+tmaruyama
 has-props
 
 
@@ -1112,7 +1112,7 @@
 
 
 
-2982
+2954
 
 news_controller.rb
 file
@@ -1120,10 +1120,10 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-cb358f888a6a92cc99bef83af92cd766
-2010-12-12T17:00:52.100205Z
-4505
+2011-06-06T13:18:33.000000Z
+cc665f966818b086c188baf351bf8966
+2011-03-04T14:32:58.878627Z
+5003
 jplang
 has-props
 
@@ -1146,7 +1146,7 @@
 
 
 
-3369
+3396
 
 trackers_controller.rb
 file
@@ -1154,7 +1154,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 a5e793eb94e501be4c1a39acc65cc568
 2010-04-03T11:54:24.331654Z
 3627
@@ -1188,11 +1188,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-77209ec52ddcefafb0bfbb76195167ec
-2010-08-10T22:37:00.826946Z
-3934
-jbbarth
+2011-06-06T13:18:33.000000Z
+4e6c1f74ad57c0df68dfb3a6c6432a2e
+2011-04-01T16:47:30.350690Z
+5284
+jplang
 has-props
 
 
@@ -1214,7 +1214,7 @@
 
 
 
-5214
+5213
 
 issue_statuses_controller.rb
 file
@@ -1222,7 +1222,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 f0fdda9126d71c0b2d4638de50ab1097
 2010-02-12T19:15:39.389877Z
 3416
@@ -1256,11 +1256,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-28f2e44219870c62c9844354b78af6e1
-2010-04-03T11:54:24.331654Z
-3627
-winterheart
+2011-06-06T13:18:33.000000Z
+18be86518ea841401ee1c2b3233d72a4
+2011-05-01T23:15:03.415033Z
+5611
+tmaruyama
 has-props
 
 
@@ -1282,7 +1282,7 @@
 
 
 
-2612
+2638
 
 wikis_controller.rb
 file
@@ -1290,7 +1290,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 7ae79a9d22586240a01af73834b718a3
 2010-02-05T16:57:02.094258Z
 3370
@@ -1324,10 +1324,10 @@
 
 
 
-2011-03-03T11:40:18.000000Z
-5511ecf5c7190efe44398994a222b486
-2011-02-17T14:17:04.791825Z
-4860
+2011-06-06T13:18:33.000000Z
+5f8aa278140d3fe42d722efd89fda547
+2011-05-21T06:16:19.667418Z
+5875
 tmaruyama
 has-props
 
@@ -1350,7 +1350,7 @@
 
 
 
-11539
+12667
 
 admin_controller.rb
 file
@@ -1358,11 +1358,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-ed65a11326fe54914ba3a750a2b6f943
-2009-12-19T20:33:24.113306Z
-3200
-jplang
+2011-06-06T13:18:33.000000Z
+4577094f50fcbc76c8dba52341a2fbe2
+2011-04-25T23:21:34.669083Z
+5550
+tmaruyama
 has-props
 
 
@@ -1384,7 +1384,7 @@
 
 
 
-3104
+3119
 
 projects_controller.rb
 file
@@ -1392,10 +1392,10 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-c07d79c1bd100dd8972ea408c4fe549f
-2011-01-06T20:57:17.003359Z
-4647
+2011-06-06T13:18:33.000000Z
+34607f6af6fe864c4f2be4fba2d288fc
+2011-04-29T07:26:45.965477Z
+5581
 jplang
 has-props
 
@@ -1418,7 +1418,7 @@
 
 
 
-10103
+10004
 
 account_controller.rb
 file
@@ -1426,7 +1426,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 7b162cad903bb22948f7040a48509256
 2011-01-23T11:40:07.678287Z
 4757
@@ -1460,10 +1460,10 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-0be20cab6d5ea49f428a90cf3afef3e3
-2010-11-07T22:38:10.728638Z
-4388
+2011-06-06T13:18:33.000000Z
+4bc844343a8613ab25bd4c76969d566a
+2011-04-01T14:34:44.070899Z
+5276
 jplang
 
 
@@ -1486,7 +1486,7 @@
 
 
 
-1390
+2155
 
 issue_categories_controller.rb
 file
@@ -1494,11 +1494,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-119ceb4a27aa554d03867f46cb142d0e
-2010-03-17T15:41:58.766740Z
-3597
-edavis10
+2011-06-06T13:18:33.000000Z
+c42630be286026f052791d256b487246
+2011-05-01T23:15:03.415033Z
+5611
+tmaruyama
 has-props
 
 
@@ -1520,7 +1520,7 @@
 
 
 
-3338
+3364
 
 gantts_controller.rb
 file
@@ -1528,10 +1528,10 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-81dbee1745da99b9ea499f3fbe1d3944
-2010-11-07T22:38:10.728638Z
-4388
+2011-06-06T13:18:33.000000Z
+8093015b8337589c3a8dd96f912a626c
+2011-04-01T14:34:44.070899Z
+5276
 jplang
 
 
@@ -1554,7 +1554,7 @@
 
 
 
-1019
+1786
 
 documents_controller.rb
 file
@@ -1562,7 +1562,7 @@
 
 
 
-2011-03-03T11:05:10.000000Z
+2011-06-06T13:14:59.000000Z
 c2c68bf5fa3ed22a8f55c8414d1efce9
 2010-03-17T15:41:58.766740Z
 3597
@@ -1596,11 +1596,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-ccc57886f63cb0efb0149b601dd2ac43
-2010-11-27T10:34:44.408431Z
-4429
-jplang
+2011-06-06T13:18:33.000000Z
+4e9a4e1dd2d09a4cee7f4df56e8659f1
+2011-05-17T04:34:44.952857Z
+5824
+tmaruyama
 has-props
 
 
@@ -1622,7 +1622,7 @@
 
 
 
-10185
+10000
 
 activities_controller.rb
 file
@@ -1630,33 +1630,33 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-ad33818a03b408419be4e616e8c88b5c
-2010-12-29T19:37:42.740543Z
-4579
-jplang
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2037
+2011-06-06T13:18:33.000000Z
+9c942b1453ca9c17ecdda63d252646dc
+2011-05-18T07:12:04.304929Z
+5835
+tmaruyama
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2018
 
 enumerations_controller.rb
 file
@@ -1664,11 +1664,11 @@
 
 
 
-2011-03-03T11:05:10.000000Z
-1caaedc7bb0a3085878dc94446c70ab0
-2010-03-02T20:03:09.514061Z
-3524
-jplang
+2011-06-06T13:18:33.000000Z
+4c46e4cd141ad0a3534b60df7be534bc
+2011-05-01T23:15:03.415033Z
+5611
+tmaruyama
 has-props
 
 
@@ -1690,5 +1690,5 @@
 
 
 
-2706
+2734