diff app/controllers/.svn/entries @ 41:7f0e922c8982 luisf

merged with new version from trunk
author luisf
date Fri, 19 Nov 2010 14:45:28 +0000
parents 94944d00e43c
children af80e5618e9b 8661b858af72
line wrap: on
line diff
--- a/app/controllers/.svn/entries	Thu Nov 18 17:50:11 2010 +0000
+++ b/app/controllers/.svn/entries	Fri Nov 19 14:45:28 2010 +0000
@@ -1,15 +1,15 @@
 10
 
 dir
-4173
+4411
 http://redmine.rubyforge.org/svn/trunk/app/controllers
 http://redmine.rubyforge.org/svn
 
 
 
-2010-09-23T15:20:19.085385Z
-4172
-edavis10
+2010-11-17T18:27:38.712585Z
+4411
+jplang
 
 
 
@@ -32,11 +32,11 @@
 
 
 
-2010-09-24T12:48:26.271687Z
-611e226f9845a33fb6fe28700968e7de
-2010-09-11T20:21:27.018967Z
-4083
-jbbarth
+2010-11-19T13:04:46.996826Z
+e6c77385e49176b593367b44e7b33f3e
+2010-11-17T18:27:38.712585Z
+4411
+jplang
 has-props
 
 
@@ -58,7 +58,7 @@
 
 
 
-13034
+12834
 
 queries_controller.rb
 file
@@ -236,10 +236,10 @@
 
 
 
-2010-09-23T14:37:44.395735Z
-b178015d27e341adaa871e3800e94401
-2010-05-23T03:16:37.499264Z
-3745
+2010-11-19T13:04:46.996826Z
+b465d7aeca2d6b4cc11159ae9bc7349e
+2010-09-28T22:13:11.637219Z
+4224
 edavis10
 has-props
 
@@ -262,7 +262,7 @@
 
 
 
-6422
+6021
 
 comments_controller.rb
 file
@@ -372,10 +372,10 @@
 
 
 
-2010-09-24T12:48:26.271687Z
-8e09032afd0db141012e59a0f689b687
-2010-09-03T21:43:07.906158Z
-4059
+2010-11-19T13:04:46.996826Z
+2db29b69c3f0130e470a0a11dfc1f28b
+2010-10-08T03:09:51.863032Z
+4242
 jbbarth
 
 
@@ -398,7 +398,7 @@
 
 
 
-1647
+1821
 
 journals_controller.rb
 file
@@ -468,6 +468,40 @@
 
 3346
 
+time_entry_reports_controller.rb
+file
+
+
+
+
+2010-11-19T13:04:46.996826Z
+dadcb57d89dc3c90c5fa099b143c07f8
+2010-10-05T16:07:17.015270Z
+4232
+edavis10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+9308
+
 reports_controller.rb
 file
 
@@ -536,16 +570,16 @@
 
 856
 
-settings_controller.rb
+timelog_controller.rb
 file
 
 
 
 
-2010-09-23T14:37:44.399747Z
-b7f5a5cb777aa2418a71520c164da11a
-2009-12-17T18:21:02.630202Z
-3176
+2010-11-19T13:04:46.996826Z
+7984019db8d0beb1d7ff158390d4ad68
+2010-11-16T20:27:45.364396Z
+4410
 jplang
 has-props
 
@@ -568,7 +602,7 @@
 
 
 
-2337
+8623
 
 custom_fields_controller.rb
 file
@@ -604,16 +638,16 @@
 
 2373
 
-timelog_controller.rb
+settings_controller.rb
 file
 
 
 
 
-2010-09-24T12:48:26.271687Z
-7e5890e22da346ff06debe33cc4bf34d
-2010-09-14T19:02:25.847894Z
-4087
+2010-11-19T13:04:46.996826Z
+4328cabdf111342d147b245bc61bb75e
+2010-09-28T20:19:55.214366Z
+4220
 edavis10
 has-props
 
@@ -636,7 +670,41 @@
 
 
 
-14320
+2239
+
+issue_moves_controller.rb
+file
+
+
+
+
+2010-11-19T13:04:47.000764Z
+cacd6ffe0ce299e2ede9d45b7ef8af42
+2010-10-25T18:44:46.868009Z
+4292
+edavis10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2441
 
 users_controller.rb
 file
@@ -644,11 +712,11 @@
 
 
 
-2010-09-24T12:48:26.275788Z
-df36e1f9ccb5879ba3aa7b34592c18cf
-2010-09-06T01:02:52.851079Z
-4066
-edavis10
+2010-11-19T13:04:47.000764Z
+3af0a81ba74621dc21d877a579b39d9c
+2010-11-07T14:15:01.891476Z
+4382
+jplang
 has-props
 
 
@@ -670,41 +738,7 @@
 
 
 
-5977
-
-issue_moves_controller.rb
-file
-
-
-
-
-2010-09-23T14:37:44.395735Z
-41a4ff4e0c4fab3e134a9bfa8136323a
-2010-08-13T14:59:04.653474Z
-3940
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2290
+7565
 
 files_controller.rb
 file
@@ -712,33 +746,33 @@
 
 
 
-2010-09-24T12:48:26.275788Z
-120cefe7fd45eda6957c2e633ceab0fb
-2010-09-14T16:24:07.840869Z
-4085
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1258
+2010-11-19T13:04:47.000764Z
+f0246e8f8dde5ea7b93e4dc2162181fc
+2010-09-26T08:07:41.604064Z
+4177
+jplang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1289
 
 application_controller.rb
 file
@@ -746,67 +780,67 @@
 
 
 
-2010-09-24T12:48:26.275788Z
-e93fc4710d9abbef72273a22b174eb27
-2010-09-10T16:00:49.687515Z
-4075
+2010-11-19T13:04:47.000764Z
+8f7d4c9d306ae9d59ea0e064466454d1
+2010-10-23T11:07:04.019894Z
+4286
+jplang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+13669
+
+previews_controller.rb
+file
+
+
+
+
+2010-11-19T13:04:47.000764Z
+c5ae4fae18159e70fd81c2487bb1daa1
+2010-09-24T16:26:46.819682Z
+4174
 edavis10
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-13486
-
-ldap_auth_sources_controller.rb
-file
-
-
-
-
-2010-09-23T14:37:44.395735Z
-5f7b9cb2e9c8a60db58ea0833cf481c5
-2010-05-23T03:16:31.304135Z
-3744
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-917
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+957
 
 auth_sources_controller.rb
 file
@@ -842,16 +876,16 @@
 
 2542
 
-previews_controller.rb
+ldap_auth_sources_controller.rb
 file
 
 
 
 
 2010-09-23T14:37:44.395735Z
-1407f3993f625a9fa14fa0e208c3df4f
-2010-08-18T15:01:35.032314Z
-3946
+5f7b9cb2e9c8a60db58ea0833cf481c5
+2010-05-23T03:16:31.304135Z
+3744
 edavis10
 
 
@@ -874,7 +908,7 @@
 
 
 
-835
+917
 
 search_controller.rb
 file
@@ -944,6 +978,40 @@
 
 5824
 
+versions_controller.rb
+file
+
+
+
+
+2010-11-19T13:04:47.000764Z
+a98fb262a20669600a85c0f72202c5e6
+2010-11-01T13:13:32.982466Z
+4354
+jplang
+has-props
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+6241
+
 issue_relations_controller.rb
 file
 
@@ -978,40 +1046,6 @@
 
 2220
 
-versions_controller.rb
-file
-
-
-
-
-2010-09-24T12:48:26.275788Z
-9cc19ecc2f9e1ad458f27cdbcd450970
-2010-09-17T15:55:08.377083Z
-4097
-edavis10
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-6136
-
 boards_controller.rb
 file
 
@@ -1086,10 +1120,10 @@
 
 
 
-2010-09-24T12:48:26.275788Z
-dd877e070cf218909dccfc0c67658914
-2010-09-23T15:20:19.085385Z
-4172
+2010-11-19T13:04:47.000764Z
+d9e36fcf69f18973b274648b7b70dccf
+2010-09-24T16:26:46.819682Z
+4174
 edavis10
 has-props
 
@@ -1112,7 +1146,7 @@
 
 
 
-3388
+3221
 
 trackers_controller.rb
 file
@@ -1358,11 +1392,11 @@
 
 
 
-2010-09-24T12:48:26.275788Z
-7a9d61829d2ebbcab2524e763a28235b
-2010-09-08T16:01:51.939478Z
-4070
-edavis10
+2010-11-19T13:04:47.000764Z
+b0f584d53a742f6c89b157030f9d6a8d
+2010-11-13T10:05:43.644565Z
+4397
+jplang
 has-props
 
 
@@ -1384,7 +1418,7 @@
 
 
 
-9973
+10011
 
 account_controller.rb
 file
@@ -1426,33 +1460,33 @@
 
 
 
-2010-09-24T12:48:26.275788Z
-cac7d6c5cbe1f559c89a3f41e79ea4b5
-2010-08-26T16:36:59.817467Z
-4041
-edavis10
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1354
+2010-11-19T13:04:47.000764Z
+0be20cab6d5ea49f428a90cf3afef3e3
+2010-11-07T22:38:10.728638Z
+4388
+jplang
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+1390
 
 issue_categories_controller.rb
 file
@@ -1494,11 +1528,11 @@
 
 
 
-2010-09-24T12:48:26.275788Z
+2010-11-19T13:04:47.000764Z
 81dbee1745da99b9ea499f3fbe1d3944
-2010-09-10T03:09:02.311267Z
-4072
-edavis10
+2010-11-07T22:38:10.728638Z
+4388
+jplang
 
 
 
@@ -1562,11 +1596,11 @@
 
 
 
-2010-09-23T14:37:44.403745Z
-cb709bfbd3ba20cd9e7245a9575a720d
-2010-04-11T12:56:18.077630Z
-3632
-jplang
+2010-11-19T13:04:47.004764Z
+0af823002ab9c7e8f59b3d12cf6267e9
+2010-10-28T21:25:38.778234Z
+4303
+edavis10
 has-props
 
 
@@ -1588,7 +1622,7 @@
 
 
 
-9211
+10145
 
 activities_controller.rb
 file