##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r2212 to r2214 from trunk....
Jean-Philippe Lang -
r2213:6abd32be9e95
parent child
Show More
Side by Side Unified
Context file:
r2213:6abd32be9e95 Loading diff...:
Show file before | Show file after | Hide comments
@@ -526,6 +526,7 module ApplicationHelper
526
526
527 def back_url_hidden_field_tag
527 def back_url_hidden_field_tag
528 back_url = params[:back_url] || request.env['HTTP_REFERER']
528 back_url = params[:back_url] || request.env['HTTP_REFERER']
529 back_url = CGI.unescape(back_url.to_s)
529 hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
530 hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
530 end
531 end
531
532
Show file before | Show file after | Hide comments
@@ -47,8 +47,8 general_text_Yes: 'Sim'
47 general_text_no: 'não'
47 general_text_no: 'não'
48 general_text_yes: 'sim'
48 general_text_yes: 'sim'
49 general_lang_name: 'Português(Brasil)'
49 general_lang_name: 'Português(Brasil)'
50 general_csv_separator: ','
50 general_csv_separator: ';'
51 general_csv_decimal_separator: '.'
51 general_csv_decimal_separator: ','
52 general_csv_encoding: ISO-8859-1
52 general_csv_encoding: ISO-8859-1
53 general_pdf_encoding: ISO-8859-1
53 general_pdf_encoding: ISO-8859-1
54 general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo
54 general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo
Show file before | Show file after | Hide comments
@@ -791,7 +791,10 class RedCloth3 < String
791 \s?
791 \s?
792 (?:\(([^)]+?)\)(?="))? # $title
792 (?:\(([^)]+?)\)(?="))? # $title
793 ":
793 ":
794 ([\w\/]\S+?) # $url
794 ( # $url
795 (\/|https?:\/\/|s?ftps?:\/\/|www\.)
796 [\w\/]\S+?
797 )
795 (\/)? # $slash
798 (\/)? # $slash
796 ([^\w\=\/;\(\)]*?) # $post
799 ([^\w\=\/;\(\)]*?) # $post
797 (?=<|\s|$)
800 (?=<|\s|$)
@@ -799,7 +802,7 class RedCloth3 < String
799 #"
802 #"
800 def inline_textile_link( text )
803 def inline_textile_link( text )
801 text.gsub!( LINK_RE ) do |m|
804 text.gsub!( LINK_RE ) do |m|
802 pre,atts,text,title,url,slash,post = $~[1..7]
805 pre,atts,text,title,url,proto,slash,post = $~[1..8]
803
806
804 url, url_title = check_refs( url )
807 url, url_title = check_refs( url )
805 title ||= url_title
808 title ||= url_title
General Comments 0
You need to be logged in to leave comments. Login now