Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/entries @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | 851510f1b535 |
children |
line wrap: on
line diff
--- a/app/controllers/.svn/entries Thu Jul 14 10:46:20 2011 +0100 +++ b/app/controllers/.svn/entries Thu Jul 14 10:50:53 2011 +0100 @@ -1,14 +1,14 @@ 10 dir -4411 -http://redmine.rubyforge.org/svn/trunk/app/controllers +6270 +http://redmine.rubyforge.org/svn/branches/1.2-stable/app/controllers http://redmine.rubyforge.org/svn -2010-11-17T18:27:38.712585Z -4411 +2011-07-09T18:49:13.583984Z +6209 jplang @@ -32,10 +32,10 @@ -2010-11-19T13:04:46.996826Z -e6c77385e49176b593367b44e7b33f3e -2010-11-17T18:27:38.712585Z -4411 +2011-07-14T09:28:10.000000Z +c8deaf810284940ffaf93b34770e68c1 +2011-07-09T09:11:13.773613Z +6198 jplang has-props @@ -58,7 +58,7 @@ -12834 +12830 queries_controller.rb file @@ -66,11 +66,11 @@ -2010-09-23T14:37:44.399747Z -7ad6758cfd160c4b6ef6d71be06e087c -2010-04-19T15:08:28.751734Z -3684 -edavis10 +2011-07-14T09:24:21.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 @@ -2010-09-23T14:37:44.399747Z +2011-07-14T09:24:09.000000Z 7a73aba15fcd447531d1552de01706d9 2009-12-20T09:44:28.044710Z 3201 @@ -134,11 +134,11 @@ -2010-09-23T14:37:44.395735Z -612f3e7497e14c728934e83fbe5778c4 -2009-12-20T09:45:04.782778Z -3202 -jplang +2011-07-14T09:24:21.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 @@ -2010-09-23T14:37:44.399747Z -3ee494bd8196306eab8913bd462b44da -2010-06-20T16:08:15.578906Z -3798 -edavis10 +2011-07-14T09:24:21.000000Z +74083636df6bb82e8dc1f4fbd3da2882 +2011-04-05T12:09:15.508559Z +5320 +jplang has-props @@ -194,7 +194,7 @@ -3234 +3021 auto_completes_controller.rb file @@ -202,33 +202,33 @@ -2010-09-23T14:37:44.391741Z -8cd8e21323a4500a05c26e4ebdde1812 -2010-08-17T15:03:58.074505Z -3945 -edavis10 - - - - - - - - - - - - - - - - - - - - - -665 +2011-07-14T09:24:09.000000Z +edbdb443ff7cc8f299f7772b3532eca1 +2010-12-12T16:06:43.892596Z +4503 +jplang + + + + + + + + + + + + + + + + + + + + + +772 my_controller.rb file @@ -236,11 +236,11 @@ -2010-11-19T13:04:46.996826Z -b465d7aeca2d6b4cc11159ae9bc7349e -2010-09-28T22:13:11.637219Z -4224 -edavis10 +2011-07-14T09:24:09.000000Z +40ea055e0f9f9aa83680751fdab5a0a5 +2010-12-12T14:25:23.262992Z +4497 +jplang has-props @@ -262,7 +262,7 @@ -6021 +5768 comments_controller.rb file @@ -270,7 +270,7 @@ -2010-09-24T12:48:26.271687Z +2011-07-14T09:24:09.000000Z c2289eb9b654117a101c072955d4c705 2010-09-23T15:20:19.085385Z 4172 @@ -304,7 +304,7 @@ -2010-09-23T14:37:44.395735Z +2011-07-14T09:24:09.000000Z 20e245fa61dc0dcb2f105a8f0e6af98c 2010-06-19T19:51:43.174421Z 3784 @@ -332,13 +332,47 @@ 3447 +context_menus_controller.rb +file + + + + +2011-07-14T09:24:21.000000Z +ee556c18cb658bef786cc6f69388f9b8 +2011-04-17T15:17:18.418900Z +5495 +jplang + + + + + + + + + + + + + + + + + + + + + +2432 + welcome_controller.rb file -2010-09-23T14:37:44.403745Z +2011-07-14T09:24:09.000000Z 95ad1acf7766861a4dbd0aebd9c847de 2009-10-21T03:21:31.657956Z 2941 @@ -366,51 +400,17 @@ 1091 -context_menus_controller.rb -file - - - - -2010-11-19T13:04:46.996826Z -2db29b69c3f0130e470a0a11dfc1f28b -2010-10-08T03:09:51.863032Z -4242 -jbbarth - - - - - - - - - - - - - - - - - - - - - -1821 - journals_controller.rb file -2010-09-23T14:37:44.395735Z -deb481ad0f862b9305b79f292d59fb51 -2010-08-23T15:04:36.844654Z -4034 -edavis10 +2011-07-14T09:28:10.000000Z +70d5ea1cc9e7df479a2f24f04b530502 +2011-07-09T09:11:13.773613Z +6198 +jplang has-props @@ -432,41 +432,7 @@ -3439 - -workflows_controller.rb -file - - - - -2010-09-23T14:37:44.403745Z -5052c701a12ad27e88950dd4a745b0f8 -2010-03-04T05:33:45.236699Z -3536 -edavis10 -has-props - - - - - - - - - - - - - - - - - - - - -3346 +4105 time_entry_reports_controller.rb file @@ -474,7 +440,7 @@ -2010-11-19T13:04:46.996826Z +2011-07-14T09:24:09.000000Z dadcb57d89dc3c90c5fa099b143c07f8 2010-10-05T16:07:17.015270Z 4232 @@ -502,13 +468,47 @@ 9308 +workflows_controller.rb +file + + + + +2011-07-14T09:24:09.000000Z +73cdba17212ad890eea7b7c7ee140d7e +2011-02-20T15:38:07.840581Z +4895 +jplang +has-props + + + + + + + + + + + + + + + + + + + + +4041 + reports_controller.rb file -2010-09-23T14:37:44.399747Z +2011-07-14T09:24:09.000000Z 8f7e6e7308912a6169a700b0c88174a0 2010-04-27T16:43:52.584075Z 3692 @@ -542,7 +542,7 @@ -2010-09-24T12:48:26.271687Z +2011-07-14T09:24:09.000000Z 828b364ba2850ceddb3caa566bf10124 2010-09-10T16:00:49.687515Z 4075 @@ -576,10 +576,10 @@ -2010-11-19T13:04:46.996826Z -7984019db8d0beb1d7ff158390d4ad68 -2010-11-16T20:27:45.364396Z -4410 +2011-07-14T09:28:10.000000Z +341ec8f56b1a1a24fd23ff8b4e1fe7b3 +2011-07-09T09:11:13.773613Z +6198 jplang has-props @@ -602,7 +602,41 @@ -8623 +12440 + +settings_controller.rb +file + + + + +2011-07-14T09:24:21.000000Z +cef6dc401dea01bdddca8a8a405aeaee +2011-05-18T02:18:47.811055Z +5827 +tmaruyama +has-props + + + + + + + + + + + + + + + + + + + + +2286 custom_fields_controller.rb file @@ -610,11 +644,11 @@ -2010-09-23T14:37:44.391741Z -00272455ac5be11da48f92c4a443c538 -2010-04-03T11:54:24.331654Z -3627 -winterheart +2011-07-14T09:24:21.000000Z +e87f5ffac690480de57ac0a90daad01c +2011-05-01T23:15:03.415033Z +5611 +tmaruyama has-props @@ -636,19 +670,19 @@ -2373 +2395 -settings_controller.rb +users_controller.rb file -2010-11-19T13:04:46.996826Z -4328cabdf111342d147b245bc61bb75e -2010-09-28T20:19:55.214366Z -4220 -edavis10 +2011-07-14T09:28:10.000000Z +858ad5381dc0944da7954e1a8dae60ac +2011-07-09T09:11:13.773613Z +6198 +jplang has-props @@ -670,7 +704,7 @@ -2239 +8639 issue_moves_controller.rb file @@ -678,67 +712,33 @@ -2010-11-19T13:04:47.000764Z -cacd6ffe0ce299e2ede9d45b7ef8af42 -2010-10-25T18:44:46.868009Z -4292 -edavis10 - - - - - - - - - - - - - - - - - - - - - -2441 - -users_controller.rb -file - - - - -2010-11-19T13:04:47.000764Z -3af0a81ba74621dc21d877a579b39d9c -2010-11-07T14:15:01.891476Z -4382 -jplang -has-props - - - - - - - - - - - - - - - - - - - - -7565 +2011-07-14T09:24:21.000000Z +cbd01754dc3edc7ce30bd9e401608908 +2011-05-17T03:59:02.899695Z +5821 +tmaruyama + + + + + + + + + + + + + + + + + + + + + +2435 files_controller.rb file @@ -746,33 +746,33 @@ -2010-11-19T13:04:47.000764Z -f0246e8f8dde5ea7b93e4dc2162181fc -2010-09-26T08:07:41.604064Z -4177 -jplang - - - - - - - - - - - - - - - - - - - - - -1289 +2011-07-14T09:24:21.000000Z +e40d3a7211765dd6a7dd0fde90906bab +2011-05-18T07:12:48.748391Z +5837 +tmaruyama + + + + + + + + + + + + + + + + + + + + + +1273 application_controller.rb file @@ -780,10 +780,10 @@ -2010-11-19T13:04:47.000764Z -8f7d4c9d306ae9d59ea0e064466454d1 -2010-10-23T11:07:04.019894Z -4286 +2011-07-14T09:28:10.000000Z +558cc843d43a24e2cd334571c32a7656 +2011-07-09T18:49:13.583984Z +6209 jplang has-props @@ -806,41 +806,7 @@ -13669 - -previews_controller.rb -file - - - - -2010-11-19T13:04:47.000764Z -c5ae4fae18159e70fd81c2487bb1daa1 -2010-09-24T16:26:46.819682Z -4174 -edavis10 - - - - - - - - - - - - - - - - - - - - - -957 +16538 auth_sources_controller.rb file @@ -848,7 +814,7 @@ -2010-09-23T14:37:44.391741Z +2011-07-14T09:24:09.000000Z 237280766d09418161536250d514a7bf 2010-05-23T03:16:31.304135Z 3744 @@ -882,7 +848,7 @@ -2010-09-23T14:37:44.395735Z +2011-07-14T09:24:09.000000Z 5f7b9cb2e9c8a60db58ea0833cf481c5 2010-05-23T03:16:31.304135Z 3744 @@ -910,17 +876,51 @@ 917 +previews_controller.rb +file + + + + +2011-07-14T09:24:21.000000Z +fa4b7467e77f8a7bc86ff60a68052684 +2011-03-28T21:45:30.892324Z +5246 +jplang + + + + + + + + + + + + + + + + + + + + + +1754 + search_controller.rb file -2010-09-23T14:37:44.399747Z -0015154998f830227b636ee423f007f3 -2010-06-20T20:01:32.722003Z -3806 -edavis10 +2011-07-14T09:28:10.000000Z +47432306ab84ca571b40b037b3c34095 +2011-07-09T11:26:35.866966Z +6202 +jplang has-props @@ -942,7 +942,7 @@ -3961 +4001 messages_controller.rb file @@ -950,7 +950,7 @@ -2010-09-23T14:37:44.395735Z +2011-07-14T09:24:09.000000Z f3f4378ec15e1401ead0dcac4e9cb059 2010-03-03T17:05:00.967826Z 3528 @@ -984,7 +984,7 @@ -2010-11-19T13:04:47.000764Z +2011-07-14T09:24:09.000000Z a98fb262a20669600a85c0f72202c5e6 2010-11-01T13:13:32.982466Z 4354 @@ -1018,11 +1018,11 @@ -2010-09-23T14:37:44.395735Z -c57448661f2eaab81c76f23d7f51e0ab -2010-03-16T15:17:47.586688Z -3591 -edavis10 +2011-07-14T09:28:10.000000Z +00adf3dbe7851ad6127cf120df999f7b +2011-07-09T09:11:13.773613Z +6198 +jplang has-props @@ -1044,7 +1044,7 @@ -2220 +2450 boards_controller.rb file @@ -1052,11 +1052,11 @@ -2010-09-23T14:37:44.391741Z -52638c82da929081099076d5aa0f9212 -2010-08-16T23:39:27.396462Z -3942 -edavis10 +2011-07-14T09:28:10.000000Z +4800c888c351ca91dd2e9fdf1bbab57b +2011-07-09T09:11:13.773613Z +6198 +jplang has-props @@ -1086,11 +1086,11 @@ -2010-09-23T14:37:44.391741Z -21c0e5d894d1429ac39f3253ae021594 -2010-01-05T18:16:03.565347Z -3281 -jplang +2011-07-14T09:24:21.000000Z +c679c8cbf25d1c5d30e2f88bb177a202 +2011-05-18T07:12:27.059090Z +5836 +tmaruyama has-props @@ -1112,7 +1112,7 @@ -2982 +2954 news_controller.rb file @@ -1120,11 +1120,11 @@ -2010-11-19T13:04:47.000764Z -d9e36fcf69f18973b274648b7b70dccf -2010-09-24T16:26:46.819682Z -4174 -edavis10 +2011-07-14T09:28:10.000000Z +3b6f0957dcc31aa8c48bef64ed452d0b +2011-07-09T09:11:13.773613Z +6198 +jplang has-props @@ -1146,7 +1146,7 @@ -3221 +3421 trackers_controller.rb file @@ -1154,7 +1154,7 @@ -2010-09-23T14:37:44.399747Z +2011-07-14T09:24:09.000000Z a5e793eb94e501be4c1a39acc65cc568 2010-04-03T11:54:24.331654Z 3627 @@ -1188,11 +1188,11 @@ -2010-09-23T14:37:44.395735Z -77209ec52ddcefafb0bfbb76195167ec -2010-08-10T22:37:00.826946Z -3934 -jbbarth +2011-07-14T09:24:21.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 @@ -2010-09-23T14:37:44.395735Z +2011-07-14T09:24:09.000000Z f0fdda9126d71c0b2d4638de50ab1097 2010-02-12T19:15:39.389877Z 3416 @@ -1256,11 +1256,11 @@ -2010-09-23T14:37:44.399747Z -28f2e44219870c62c9844354b78af6e1 -2010-04-03T11:54:24.331654Z -3627 -winterheart +2011-07-14T09:24:21.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 @@ -2010-09-23T14:37:44.403745Z +2011-07-14T09:24:09.000000Z 7ae79a9d22586240a01af73834b718a3 2010-02-05T16:57:02.094258Z 3370 @@ -1324,10 +1324,10 @@ -2010-09-23T14:37:44.399747Z -a90fd2992bc17c6cee999369521194c4 -2010-04-17T12:51:46.860438Z -3680 +2011-07-14T09:28:10.000000Z +03fa916999a68f9d1014925de3ad1981 +2011-07-09T09:11:13.773613Z +6198 jplang has-props @@ -1350,7 +1350,7 @@ -10750 +12687 admin_controller.rb file @@ -1358,11 +1358,11 @@ -2010-09-23T14:37:44.391741Z -ed65a11326fe54914ba3a750a2b6f943 -2009-12-19T20:33:24.113306Z -3200 -jplang +2011-07-14T09:24:21.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 @@ -2010-11-19T13:04:47.000764Z -b0f584d53a742f6c89b157030f9d6a8d -2010-11-13T10:05:43.644565Z -4397 +2011-07-14T09:28:10.000000Z +dccb25f35e9cb7bf110cc372d9d06fb0 +2011-07-09T09:11:13.773613Z +6198 jplang has-props @@ -1418,7 +1418,7 @@ -10011 +10029 account_controller.rb file @@ -1426,11 +1426,11 @@ -2010-09-23T14:37:44.391741Z -d0ff6be1c749b765d9d64bef64c27537 -2010-08-03T15:26:50.842290Z -3906 -edavis10 +2011-07-14T09:24:09.000000Z +7b162cad903bb22948f7040a48509256 +2011-01-23T11:40:07.678287Z +4757 +jplang has-props @@ -1452,7 +1452,7 @@ -8962 +9350 calendars_controller.rb file @@ -1460,10 +1460,10 @@ -2010-11-19T13:04:47.000764Z -0be20cab6d5ea49f428a90cf3afef3e3 -2010-11-07T22:38:10.728638Z -4388 +2011-07-14T09:24:21.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 @@ -2010-09-23T14:37:44.395735Z -119ceb4a27aa554d03867f46cb142d0e -2010-03-17T15:41:58.766740Z -3597 -edavis10 +2011-07-14T09:24:21.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 @@ -2010-11-19T13:04:47.000764Z -81dbee1745da99b9ea499f3fbe1d3944 -2010-11-07T22:38:10.728638Z -4388 +2011-07-14T09:24:21.000000Z +8093015b8337589c3a8dd96f912a626c +2011-04-01T14:34:44.070899Z +5276 jplang @@ -1554,7 +1554,7 @@ -1019 +1786 documents_controller.rb file @@ -1562,7 +1562,7 @@ -2010-09-23T14:37:44.391741Z +2011-07-14T09:24:09.000000Z c2c68bf5fa3ed22a8f55c8414d1efce9 2010-03-17T15:41:58.766740Z 3597 @@ -1596,11 +1596,11 @@ -2010-11-19T13:04:47.004764Z -0af823002ab9c7e8f59b3d12cf6267e9 -2010-10-28T21:25:38.778234Z -4303 -edavis10 +2011-07-14T09:24:21.000000Z +4e9a4e1dd2d09a4cee7f4df56e8659f1 +2011-05-17T04:34:44.952857Z +5824 +tmaruyama has-props @@ -1622,7 +1622,7 @@ -10145 +10000 activities_controller.rb file @@ -1630,33 +1630,33 @@ -2010-09-24T12:48:26.275788Z -88f55d118861ffaca0992fa5ec55d51f -2010-08-27T14:05:54.014502Z -4047 -edavis10 - - - - - - - - - - - - - - - - - - - - - -1952 +2011-07-14T09:28:10.000000Z +4d0e519d63fce8db9095adc7f1eb554b +2011-07-09T09:11:13.773613Z +6198 +jplang + + + + + + + + + + + + + + + + + + + + + +2813 enumerations_controller.rb file @@ -1664,11 +1664,11 @@ -2010-09-23T14:37:44.391741Z -1caaedc7bb0a3085878dc94446c70ab0 -2010-03-02T20:03:09.514061Z -3524 -jplang +2011-07-14T09:24:21.000000Z +4c46e4cd141ad0a3534b60df7be534bc +2011-05-01T23:15:03.415033Z +5611 +tmaruyama has-props @@ -1690,5 +1690,5 @@ -2706 +2734