Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
marcink
- Sat, 05 Jan 2013 01:26:39
Show More
rhodecode/controllers/pullrequests.py
0
+1
-1
@@
-97,7
+97,7
b' class PullrequestsController(BaseRepoCon'
97
97
return repo . branches . keys ()[ 0 ]
98
98
99
99
def _get_is_allowed_change_status ( self , pull_request ):
100
owner = self . rhodecode_user . user_id == pull_request . user_id
100
owner = self . rhodecode_user . user_id == pull_request . user_id
101
101
reviewer = self . rhodecode_user . user_id in [ x . user_id for x in
102
102
pull_request . reviewers ]
103
103
return ( self . rhodecode_user . admin or owner or reviewer )
rhodecode/lib/helpers.py
0
0
-1
@@
-1170,4
+1170,3
b' def ip_range(ip_addr):'
1170
1170
from rhodecode.model.db import UserIpMap
1171
1171
s , e = UserIpMap . _get_ip_range ( ip_addr )
1172
1172
return ' %s - %s ' % ( s , e )
1173
rhodecode/lib/utils.py
0
+1
-1
@@
-751,4
+751,4
b' def jsonify(func, *args, **kwargs):'
751
751
warnings . warn ( msg , Warning , 2 )
752
752
log . warning ( msg )
753
753
log . debug ( "Returning JSON wrapped action output" )
754
return json . dumps ( data , encoding = 'utf-8' )
No newline at end of file
754
return json . dumps ( data , encoding = 'utf-8' )
rhodecode/model/validators.py
0
+1
-1
@@
-566,7
+566,7
b" def ValidPerms(type_='repo'):"
566
566
def ValidSettings ():
567
567
class _validator ( formencode . validators . FancyValidator ):
568
568
def _to_python ( self , value , state ):
569
# settings form for users that are not admin
569
# settings form for users that are not admin
570
570
# can't edit certain parameters, it's extra backup if they mangle
571
571
# with forms
572
572
rhodecode/templates/admin/admin.html
0
0
-1
@@
-53,4
+53,3
b" YUE.on('filter_form','submit',function(e"
53
53
fix_j_filter_width ( YUD . get ( 'j_filter' ). value . length );
54
54
</ script >
55
55
< /%def>
56
rhodecode/templates/admin/admin_log.html
0
+1
-1
@@
-16,7
+16,7
b''
16
16
${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}
17
17
%else:
18
18
${l.username}
19
%endif
19
%endif
20
20
</ td >
21
21
< td > ${h.action_parser(l)[0]()}
22
22
< div class = "journal_action_params" >
rhodecode/templates/base/root.html
0
+2
-2
@@
-74,7
+74,7
b''
74
74
return false ;
75
75
}
76
76
})( window );
77
77
78
78
YUE . onDOMReady ( function (){
79
79
tooltip_activate ();
80
80
show_more_event ();
@@
-83,7
+83,7
b''
83
83
YUE . on ( 'quick_login_link' , 'click' , function ( e ){
84
84
// make sure we don't redirect
85
85
YUE . preventDefault ( e );
86
86
87
87
if ( YUD . hasClass ( 'quick_login_link' , 'enabled' )){
88
88
YUD . setStyle ( 'quick_login' , 'display' , 'none' );
89
89
YUD . removeClass ( 'quick_login_link' , 'enabled' );
rhodecode/templates/changeset/changeset.html
0
+5
-5
@@
-40,7
+40,7
b''
40
40
%endfor
41
41
%else:
42
42
< span > ${_('No parents')} </ span >
43
%endif
43
%endif
44
44
</ div >
45
45
< div class = "children" >
46
46
%if c.changeset.children:
@@
-50,10
+50,10
b''
50
50
%endfor
51
51
%else:
52
52
< span > ${_('No children')} </ span >
53
%endif
54
</ div >
53
%endif
54
</ div >
55
55
< div class = "code-header banner" >
56
56
57
57
< div class = "hash" >
58
58
r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
59
59
</ div >
@@
-74,7
+74,7
b''
74
74
${c.context_url(request.GET)}
75
75
</ div >
76
76
< div class = "comments-number" style = "float:right;padding-right:5px" > ${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt} </ div >
77
</ div >
77
</ div >
78
78
</ div >
79
79
< div id = "changeset_content" >
80
80
< div class = "container" >
rhodecode/templates/changeset/changeset_file_comment.html
0
+1
-1
rhodecode/templates/email_templates/pull_request.html
0
0
-2
rhodecode/templates/index_base.html
0
+1
-1
@@
-268,7
+268,7
b''
268
268
{ key : "last_change" , label : "${_('Last Change')}" , sortable : true ,
269
269
sortOptions : { sortFunction : ageSort }},
270
270
{ key : "tip" , label : "${_('Tip')}" , sortable : true ,
271
sortOptions : { sortFunction : revisionSort }},
271
sortOptions : { sortFunction : revisionSort }},
272
272
{ key : "owner" , label : "${_('Owner')}" , sortable : true },
273
273
{ key : "rss" , label : "" , sortable : false },
274
274
{ key : "atom" , label : "" , sortable : false },
rhodecode/templates/journal/journal.html
0
+3
-3
@@
-114,7
+114,7
b''
114
114
</ div >
115
115
116
116
< script type = "text/javascript" >
117
117
118
118
YUE . on ( 'j_filter' , 'click' , function (){
119
119
var jfilter = YUD . get ( 'j_filter' );
120
120
if ( YUD . hasClass ( jfilter , 'initial' )){
@@
-132,8
+132,8
b''
132
132
var val = YUD . get ( 'j_filter' ). value ;
133
133
window . location = "${url.current(filter='__FILTER__')}" . replace ( '__FILTER__' , val );
134
134
});
135
fix_j_filter_width ( YUD . get ( 'j_filter' ). value . length );
136
135
fix_j_filter_width ( YUD . get ( 'j_filter' ). value . length );
136
137
137
var show_my = function ( e ){
138
138
YUD . setStyle ( 'watched' , 'display' , 'none' );
139
139
YUD . setStyle ( 'my' , 'display' , '' );
rhodecode/templates/pullrequests/pullrequest_show.html
0
+1
-1
@@
-198,7
+198,7
b''
198
198
// inject comments into they proper positions
199
199
var file_comments = YUQ ( '.inline-comment-placeholder' );
200
200
renderInlineComments ( file_comments );
201
201
202
202
YUE . on ( YUD . get ( 'update_pull_request' ), 'click' , function ( e ){
203
203
updateReviewers ();
204
204
})
rhodecode/templates/settings/repo_settings.html
0
+1
-1
@@
-94,7
+94,7
b''
94
94
${h.submit('save',_('Save'),class_="ui-btn large")}
95
95
${h.reset('reset',_('Reset'),class_="ui-btn large")}
96
96
</ div >
97
97
98
98
</ div >
99
99
${h.end_form()}
100
100
</ div >
rhodecode/tests/models/test_user_permissions_on_repos.py
0
+1
-1
@@
-1,1
+1,1
b''
1
#TODO; write tests when we activate algo for permissions.
No newline at end of file
1
#TODO; write tests when we activate algo for permissions.
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages