Mercurial > hg > soundsoftware-site
comparison app/controllers/.svn/all-wcprops @ 514:7eba09d624db live
Merge
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:50:53 +0100 |
parents | 851510f1b535 |
children |
comparison
equal
deleted
inserted
replaced
512:b9aebdd7dd40 | 514:7eba09d624db |
---|---|
1 K 25 | 1 K 25 |
2 svn:wc:ra_dav:version-url | 2 svn:wc:ra_dav:version-url |
3 V 40 | 3 V 54 |
4 /svn/!svn/ver/4411/trunk/app/controllers | 4 /svn/!svn/ver/6209/branches/1.2-stable/app/controllers |
5 END | |
6 boards_controller.rb | |
7 K 25 | |
8 svn:wc:ra_dav:version-url | |
9 V 75 | |
10 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/boards_controller.rb | |
5 END | 11 END |
6 issues_controller.rb | 12 issues_controller.rb |
7 K 25 | 13 K 25 |
8 svn:wc:ra_dav:version-url | 14 svn:wc:ra_dav:version-url |
9 V 61 | 15 V 75 |
10 /svn/!svn/ver/4411/trunk/app/controllers/issues_controller.rb | 16 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/issues_controller.rb |
11 END | 17 END |
12 queries_controller.rb | 18 news_controller.rb |
13 K 25 | 19 K 25 |
14 svn:wc:ra_dav:version-url | 20 svn:wc:ra_dav:version-url |
15 V 62 | 21 V 73 |
16 /svn/!svn/ver/3684/trunk/app/controllers/queries_controller.rb | 22 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/news_controller.rb |
17 END | |
18 sys_controller.rb | |
19 K 25 | |
20 svn:wc:ra_dav:version-url | |
21 V 58 | |
22 /svn/!svn/ver/3201/trunk/app/controllers/sys_controller.rb | |
23 END | |
24 mail_handler_controller.rb | |
25 K 25 | |
26 svn:wc:ra_dav:version-url | |
27 V 67 | |
28 /svn/!svn/ver/3202/trunk/app/controllers/mail_handler_controller.rb | |
29 END | |
30 watchers_controller.rb | |
31 K 25 | |
32 svn:wc:ra_dav:version-url | |
33 V 63 | |
34 /svn/!svn/ver/3798/trunk/app/controllers/watchers_controller.rb | |
35 END | |
36 auto_completes_controller.rb | |
37 K 25 | |
38 svn:wc:ra_dav:version-url | |
39 V 69 | |
40 /svn/!svn/ver/3945/trunk/app/controllers/auto_completes_controller.rb | |
41 END | |
42 my_controller.rb | |
43 K 25 | |
44 svn:wc:ra_dav:version-url | |
45 V 57 | |
46 /svn/!svn/ver/4224/trunk/app/controllers/my_controller.rb | |
47 END | |
48 comments_controller.rb | |
49 K 25 | |
50 svn:wc:ra_dav:version-url | |
51 V 63 | |
52 /svn/!svn/ver/4172/trunk/app/controllers/comments_controller.rb | |
53 END | |
54 members_controller.rb | |
55 K 25 | |
56 svn:wc:ra_dav:version-url | |
57 V 62 | |
58 /svn/!svn/ver/3784/trunk/app/controllers/members_controller.rb | |
59 END | |
60 welcome_controller.rb | |
61 K 25 | |
62 svn:wc:ra_dav:version-url | |
63 V 62 | |
64 /svn/!svn/ver/2941/trunk/app/controllers/welcome_controller.rb | |
65 END | |
66 context_menus_controller.rb | |
67 K 25 | |
68 svn:wc:ra_dav:version-url | |
69 V 68 | |
70 /svn/!svn/ver/4242/trunk/app/controllers/context_menus_controller.rb | |
71 END | 23 END |
72 journals_controller.rb | 24 journals_controller.rb |
73 K 25 | 25 K 25 |
74 svn:wc:ra_dav:version-url | 26 svn:wc:ra_dav:version-url |
75 V 63 | 27 V 77 |
76 /svn/!svn/ver/4034/trunk/app/controllers/journals_controller.rb | 28 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/journals_controller.rb |
77 END | |
78 workflows_controller.rb | |
79 K 25 | |
80 svn:wc:ra_dav:version-url | |
81 V 64 | |
82 /svn/!svn/ver/3536/trunk/app/controllers/workflows_controller.rb | |
83 END | |
84 time_entry_reports_controller.rb | |
85 K 25 | |
86 svn:wc:ra_dav:version-url | |
87 V 73 | |
88 /svn/!svn/ver/4232/trunk/app/controllers/time_entry_reports_controller.rb | |
89 END | |
90 reports_controller.rb | |
91 K 25 | |
92 svn:wc:ra_dav:version-url | |
93 V 62 | |
94 /svn/!svn/ver/3692/trunk/app/controllers/reports_controller.rb | |
95 END | |
96 project_enumerations_controller.rb | |
97 K 25 | |
98 svn:wc:ra_dav:version-url | |
99 V 75 | |
100 /svn/!svn/ver/4075/trunk/app/controllers/project_enumerations_controller.rb | |
101 END | |
102 settings_controller.rb | |
103 K 25 | |
104 svn:wc:ra_dav:version-url | |
105 V 63 | |
106 /svn/!svn/ver/4220/trunk/app/controllers/settings_controller.rb | |
107 END | 29 END |
108 timelog_controller.rb | 30 timelog_controller.rb |
109 K 25 | 31 K 25 |
110 svn:wc:ra_dav:version-url | 32 svn:wc:ra_dav:version-url |
111 V 62 | 33 V 76 |
112 /svn/!svn/ver/4410/trunk/app/controllers/timelog_controller.rb | 34 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/timelog_controller.rb |
113 END | |
114 custom_fields_controller.rb | |
115 K 25 | |
116 svn:wc:ra_dav:version-url | |
117 V 68 | |
118 /svn/!svn/ver/3627/trunk/app/controllers/custom_fields_controller.rb | |
119 END | 35 END |
120 users_controller.rb | 36 users_controller.rb |
121 K 25 | 37 K 25 |
122 svn:wc:ra_dav:version-url | 38 svn:wc:ra_dav:version-url |
123 V 60 | 39 V 74 |
124 /svn/!svn/ver/4382/trunk/app/controllers/users_controller.rb | 40 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/users_controller.rb |
125 END | |
126 issue_moves_controller.rb | |
127 K 25 | |
128 svn:wc:ra_dav:version-url | |
129 V 66 | |
130 /svn/!svn/ver/4292/trunk/app/controllers/issue_moves_controller.rb | |
131 END | |
132 files_controller.rb | |
133 K 25 | |
134 svn:wc:ra_dav:version-url | |
135 V 60 | |
136 /svn/!svn/ver/4177/trunk/app/controllers/files_controller.rb | |
137 END | 41 END |
138 application_controller.rb | 42 application_controller.rb |
139 K 25 | 43 K 25 |
140 svn:wc:ra_dav:version-url | 44 svn:wc:ra_dav:version-url |
141 V 66 | 45 V 80 |
142 /svn/!svn/ver/4286/trunk/app/controllers/application_controller.rb | 46 /svn/!svn/ver/6209/branches/1.2-stable/app/controllers/application_controller.rb |
143 END | 47 END |
144 ldap_auth_sources_controller.rb | 48 activities_controller.rb |
145 K 25 | 49 K 25 |
146 svn:wc:ra_dav:version-url | 50 svn:wc:ra_dav:version-url |
147 V 72 | 51 V 79 |
148 /svn/!svn/ver/3744/trunk/app/controllers/ldap_auth_sources_controller.rb | 52 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/activities_controller.rb |
149 END | |
150 auth_sources_controller.rb | |
151 K 25 | |
152 svn:wc:ra_dav:version-url | |
153 V 67 | |
154 /svn/!svn/ver/3744/trunk/app/controllers/auth_sources_controller.rb | |
155 END | |
156 previews_controller.rb | |
157 K 25 | |
158 svn:wc:ra_dav:version-url | |
159 V 63 | |
160 /svn/!svn/ver/4174/trunk/app/controllers/previews_controller.rb | |
161 END | 53 END |
162 search_controller.rb | 54 search_controller.rb |
163 K 25 | 55 K 25 |
164 svn:wc:ra_dav:version-url | 56 svn:wc:ra_dav:version-url |
165 V 61 | 57 V 75 |
166 /svn/!svn/ver/3806/trunk/app/controllers/search_controller.rb | 58 /svn/!svn/ver/6202/branches/1.2-stable/app/controllers/search_controller.rb |
167 END | 59 END |
168 messages_controller.rb | 60 repositories_controller.rb |
169 K 25 | 61 K 25 |
170 svn:wc:ra_dav:version-url | 62 svn:wc:ra_dav:version-url |
171 V 63 | 63 V 81 |
172 /svn/!svn/ver/3528/trunk/app/controllers/messages_controller.rb | 64 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/repositories_controller.rb |
173 END | 65 END |
174 issue_relations_controller.rb | 66 issue_relations_controller.rb |
175 K 25 | 67 K 25 |
176 svn:wc:ra_dav:version-url | 68 svn:wc:ra_dav:version-url |
177 V 70 | 69 V 84 |
178 /svn/!svn/ver/3591/trunk/app/controllers/issue_relations_controller.rb | 70 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/issue_relations_controller.rb |
179 END | |
180 versions_controller.rb | |
181 K 25 | |
182 svn:wc:ra_dav:version-url | |
183 V 63 | |
184 /svn/!svn/ver/4354/trunk/app/controllers/versions_controller.rb | |
185 END | |
186 boards_controller.rb | |
187 K 25 | |
188 svn:wc:ra_dav:version-url | |
189 V 61 | |
190 /svn/!svn/ver/3942/trunk/app/controllers/boards_controller.rb | |
191 END | |
192 attachments_controller.rb | |
193 K 25 | |
194 svn:wc:ra_dav:version-url | |
195 V 66 | |
196 /svn/!svn/ver/3281/trunk/app/controllers/attachments_controller.rb | |
197 END | |
198 news_controller.rb | |
199 K 25 | |
200 svn:wc:ra_dav:version-url | |
201 V 59 | |
202 /svn/!svn/ver/4174/trunk/app/controllers/news_controller.rb | |
203 END | |
204 trackers_controller.rb | |
205 K 25 | |
206 svn:wc:ra_dav:version-url | |
207 V 63 | |
208 /svn/!svn/ver/3627/trunk/app/controllers/trackers_controller.rb | |
209 END | |
210 groups_controller.rb | |
211 K 25 | |
212 svn:wc:ra_dav:version-url | |
213 V 61 | |
214 /svn/!svn/ver/3934/trunk/app/controllers/groups_controller.rb | |
215 END | |
216 issue_statuses_controller.rb | |
217 K 25 | |
218 svn:wc:ra_dav:version-url | |
219 V 69 | |
220 /svn/!svn/ver/3416/trunk/app/controllers/issue_statuses_controller.rb | |
221 END | |
222 roles_controller.rb | |
223 K 25 | |
224 svn:wc:ra_dav:version-url | |
225 V 60 | |
226 /svn/!svn/ver/3627/trunk/app/controllers/roles_controller.rb | |
227 END | |
228 wikis_controller.rb | |
229 K 25 | |
230 svn:wc:ra_dav:version-url | |
231 V 60 | |
232 /svn/!svn/ver/3370/trunk/app/controllers/wikis_controller.rb | |
233 END | |
234 repositories_controller.rb | |
235 K 25 | |
236 svn:wc:ra_dav:version-url | |
237 V 67 | |
238 /svn/!svn/ver/3680/trunk/app/controllers/repositories_controller.rb | |
239 END | |
240 admin_controller.rb | |
241 K 25 | |
242 svn:wc:ra_dav:version-url | |
243 V 60 | |
244 /svn/!svn/ver/3200/trunk/app/controllers/admin_controller.rb | |
245 END | 71 END |
246 projects_controller.rb | 72 projects_controller.rb |
247 K 25 | 73 K 25 |
248 svn:wc:ra_dav:version-url | 74 svn:wc:ra_dav:version-url |
249 V 63 | 75 V 77 |
250 /svn/!svn/ver/4397/trunk/app/controllers/projects_controller.rb | 76 /svn/!svn/ver/6198/branches/1.2-stable/app/controllers/projects_controller.rb |
251 END | 77 END |
252 account_controller.rb | |
253 K 25 | |
254 svn:wc:ra_dav:version-url | |
255 V 62 | |
256 /svn/!svn/ver/3906/trunk/app/controllers/account_controller.rb | |
257 END | |
258 calendars_controller.rb | |
259 K 25 | |
260 svn:wc:ra_dav:version-url | |
261 V 64 | |
262 /svn/!svn/ver/4388/trunk/app/controllers/calendars_controller.rb | |
263 END | |
264 issue_categories_controller.rb | |
265 K 25 | |
266 svn:wc:ra_dav:version-url | |
267 V 71 | |
268 /svn/!svn/ver/3597/trunk/app/controllers/issue_categories_controller.rb | |
269 END | |
270 gantts_controller.rb | |
271 K 25 | |
272 svn:wc:ra_dav:version-url | |
273 V 61 | |
274 /svn/!svn/ver/4388/trunk/app/controllers/gantts_controller.rb | |
275 END | |
276 documents_controller.rb | |
277 K 25 | |
278 svn:wc:ra_dav:version-url | |
279 V 64 | |
280 /svn/!svn/ver/3597/trunk/app/controllers/documents_controller.rb | |
281 END | |
282 wiki_controller.rb | |
283 K 25 | |
284 svn:wc:ra_dav:version-url | |
285 V 59 | |
286 /svn/!svn/ver/4303/trunk/app/controllers/wiki_controller.rb | |
287 END | |
288 activities_controller.rb | |
289 K 25 | |
290 svn:wc:ra_dav:version-url | |
291 V 65 | |
292 /svn/!svn/ver/4047/trunk/app/controllers/activities_controller.rb | |
293 END | |
294 enumerations_controller.rb | |
295 K 25 | |
296 svn:wc:ra_dav:version-url | |
297 V 67 | |
298 /svn/!svn/ver/3524/trunk/app/controllers/enumerations_controller.rb | |
299 END |