Mercurial > hg > soundsoftware-site
comparison app/views/users/.svn/all-wcprops @ 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 |
comparison
equal
deleted
inserted
replaced
118:b859cc0c4fa1 | 120:cd2282d2aa55 |
---|---|
1 K 25 | 1 K 25 |
2 svn:wc:ra_dav:version-url | 2 svn:wc:ra_dav:version-url |
3 V 54 | 3 V 40 |
4 /svn/!svn/ver/4585/branches/1.1-stable/app/views/users | 4 /svn/!svn/ver/4508/trunk/app/views/users |
5 END | |
6 _general.rhtml | |
7 K 25 | |
8 svn:wc:ra_dav:version-url | |
9 V 55 | |
10 /svn/!svn/ver/4249/trunk/app/views/users/_general.rhtml | |
5 END | 11 END |
6 _memberships.rhtml | 12 _memberships.rhtml |
7 K 25 | 13 K 25 |
8 svn:wc:ra_dav:version-url | 14 svn:wc:ra_dav:version-url |
9 V 73 | 15 V 59 |
10 /svn/!svn/ver/4585/branches/1.1-stable/app/views/users/_memberships.rhtml | 16 /svn/!svn/ver/4508/trunk/app/views/users/_memberships.rhtml |
17 END | |
18 _groups.rhtml | |
19 K 25 | |
20 svn:wc:ra_dav:version-url | |
21 V 54 | |
22 /svn/!svn/ver/4230/trunk/app/views/users/_groups.rhtml | |
23 END | |
24 new.html.erb | |
25 K 25 | |
26 svn:wc:ra_dav:version-url | |
27 V 53 | |
28 /svn/!svn/ver/4229/trunk/app/views/users/new.html.erb | |
11 END | 29 END |
12 _mail_notifications.html.erb | 30 _mail_notifications.html.erb |
13 K 25 | 31 K 25 |
14 svn:wc:ra_dav:version-url | 32 svn:wc:ra_dav:version-url |
15 V 83 | 33 V 69 |
16 /svn/!svn/ver/4585/branches/1.1-stable/app/views/users/_mail_notifications.html.erb | 34 /svn/!svn/ver/4497/trunk/app/views/users/_mail_notifications.html.erb |
17 END | 35 END |
18 index.api.rsb | 36 index.api.rsb |
19 K 25 | 37 K 25 |
20 svn:wc:ra_dav:version-url | 38 svn:wc:ra_dav:version-url |
21 V 68 | 39 V 54 |
22 /svn/!svn/ver/4585/branches/1.1-stable/app/views/users/index.api.rsb | 40 /svn/!svn/ver/4489/trunk/app/views/users/index.api.rsb |
41 END | |
42 show.rhtml | |
43 K 25 | |
44 svn:wc:ra_dav:version-url | |
45 V 51 | |
46 /svn/!svn/ver/4382/trunk/app/views/users/show.rhtml | |
23 END | 47 END |
24 _form.rhtml | 48 _form.rhtml |
25 K 25 | 49 K 25 |
26 svn:wc:ra_dav:version-url | 50 svn:wc:ra_dav:version-url |
27 V 66 | 51 V 52 |
28 /svn/!svn/ver/4585/branches/1.1-stable/app/views/users/_form.rhtml | 52 /svn/!svn/ver/4493/trunk/app/views/users/_form.rhtml |
53 END | |
54 edit.rhtml | |
55 K 25 | |
56 svn:wc:ra_dav:version-url | |
57 V 51 | |
58 /svn/!svn/ver/4231/trunk/app/views/users/edit.rhtml | |
59 END | |
60 _preferences.html.erb | |
61 K 25 | |
62 svn:wc:ra_dav:version-url | |
63 V 62 | |
64 /svn/!svn/ver/4223/trunk/app/views/users/_preferences.html.erb | |
65 END | |
66 index.rhtml | |
67 K 25 | |
68 svn:wc:ra_dav:version-url | |
69 V 52 | |
70 /svn/!svn/ver/4231/trunk/app/views/users/index.rhtml | |
29 END | 71 END |
30 show.api.rsb | 72 show.api.rsb |
31 K 25 | 73 K 25 |
32 svn:wc:ra_dav:version-url | 74 svn:wc:ra_dav:version-url |
33 V 67 | 75 V 53 |
34 /svn/!svn/ver/4585/branches/1.1-stable/app/views/users/show.api.rsb | 76 /svn/!svn/ver/4486/trunk/app/views/users/show.api.rsb |
35 END | 77 END |