Commit Graph

74 Commits

Author SHA1 Message Date
Toshi MARUYAMA a4b6928a26 Merged r11544, r11545, r11546, r11547, r11549 from trunk to 2.3-stable (#12641)
fix that diff outputs become ??? in some non ASCII words.

Contributed by Filou Centrinov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11551 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-03-07 21:03:55 +00:00
Jean-Philippe Lang ef25210aca Merged ajax_upload branch (#3957).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10977 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-12-10 20:09:41 +00:00
Jean-Philippe Lang 48d83884c3 Hard-coded "Back" on 404 view (#12231).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10745 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-10-28 20:42:18 +00:00
Jean-Philippe Lang 12de6a177a Fixed that git diff displays deleted files as /dev/null (#11868).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10424 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-18 19:32:58 +00:00
Jean-Philippe Lang 6a2ca5e034 JQuery in, Prototype/Scriptaculous out (#11445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-22 13:29:26 +00:00
Jean-Philippe Lang 5e57a1a9d9 Merged rails-3.2 branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9528 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-25 17:17:49 +00:00
Jean-Philippe Lang dc50edae5e Adds a template for API error messages so that it does not depend on AR::Errors serialization.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-04 15:16:50 +00:00
Toshi MARUYAMA b4630c03f7 Rails3: prevent double rendering file view and annotate on Rails 3.0.11 and Rails 3.1.3
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8988 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-25 06:01:48 +00:00
Toshi MARUYAMA 652871d4c3 Rails3: view: html_safe for common/_diff.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8919 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-22 03:38:08 +00:00
Etienne Massip 54c0b531e1 Fixed double escaping of Atom feed links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8646 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-01-14 16:08:51 +00:00
Toshi MARUYAMA 576d333c2c Rails3: view: html_safe for common/_calendar.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8307 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-12-21 03:40:06 +00:00
Jean-Philippe Lang 8b5b928b92 Do not show the paragraph if no message is set.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7876 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-20 14:07:22 +00:00
Toshi MARUYAMA fb75372b86 scm: attachment: remove "to_utf8" methods from helpers (#2371)
It is confusing that same name methods are in several helpers.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7871 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-20 12:04:11 +00:00
Toshi MARUYAMA 06bc4e50ef code layout clean up app/views/common/_diff.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7864 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-20 09:44:58 +00:00
Toshi MARUYAMA 2d7f0d66b2 code layout clean up app/views/common/_file.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7858 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-20 04:17:19 +00:00
Toshi MARUYAMA 85699042a6 Rails3: rename app/views/common/feed.atom.rxml to app/views/common/feed.atom.builder (#6317)
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7575 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-04 11:09:06 +00:00
Etienne Massip 4ecd65c465 Remove unecessary page title HTML escaping from views (#9252).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7565 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-10-02 18:45:17 +00:00
Toshi MARUYAMA 38a2ce645b replace tabs to spaces at app/views/common/_tabs.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7379 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-18 02:00:19 +00:00
Toshi MARUYAMA b900e1bb92 remove a trailing tab from app/views/common/_calendar.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7321 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 09:59:03 +00:00
Toshi MARUYAMA de288bc1fe remove trailing white-spaces from app/views/common/_calendar.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7269 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 01:11:14 +00:00
Toshi MARUYAMA d204470978 remove trailing white-spaces from app/views/common/_tabs.html.erb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7268 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-09-17 01:10:30 +00:00
Toshi MARUYAMA 56b173ed8a rename .rhtml to .html.erb of app/views/common/_diff.rhtml.
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6548 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-24 00:06:14 +00:00
Toshi MARUYAMA 96bf9bb77f rename .rhtml to .html.erb of app/views/common/_preview.rhtml.
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6547 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-24 00:05:51 +00:00
Toshi MARUYAMA b68048556e rename .rhtml to .html.erb of app/views/common/_file.rhtml.
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6546 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-24 00:05:25 +00:00
Toshi MARUYAMA 86c8ae68da rename .rhtml to .html.erb of app/views/common/_calendar.rhtml.
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6545 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-24 00:04:57 +00:00
Toshi MARUYAMA b1afd6f29a rename .rhtml to .html.erb of app/views/common/_tabs.rhtml.
:rhtml and :rxml were finally removed as template handlers at Rails 3.1 RC4.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6544 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-24 00:04:32 +00:00
Toshi MARUYAMA 1e0f514637 HTML escape at app/views/common/error.html.erb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6366 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-02 13:00:54 +00:00
Toshi MARUYAMA f742cef0f1 HTML escape at app/views/common/_diff.rhtml.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6360 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-08-02 12:55:55 +00:00
Toshi MARUYAMA 760168366e set svn:eol-style=native app/views/common/error.html.erb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5872 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-05-21 04:26:15 +00:00
Jean-Philippe Lang 21c79827ff Highlight changes inside diff lines (#7139).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-03-11 20:23:29 +00:00
Jean-Philippe Lang 488285e123 Strip non utf8 content when displaying diff (ruby1.9 compatibility).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4604 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-01 13:40:36 +00:00
Jean-Philippe Lang 7824eca775 Refactor: merged error rendering methods.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4286 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 11:07:04 +00:00
Jean-Philippe Lang eea456ed84 Improved error message when trying to access an archived project (#2995).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 09:48:01 +00:00
Eric Davis 41ff1b9cb2 Display the correct ISO week number on the project calendar.
http://en.wikipedia.org/wiki/ISO_week

Contributed by Holger Just

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3790 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 22:52:15 +00:00
Eric Davis 28519714e0 Updated the project calendar for greater accessibility.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3769 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-15 23:20:32 +00:00
Jean-Philippe Lang ad487bf7cc Replace the hardcoded "CodeRay" css class name for highlighted elements.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3585 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-14 13:22:50 +00:00
Jean-Philippe Lang 01dbba72ab Move hardcoded calendar images to css classes.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3477 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-23 21:10:15 +00:00
Jean-Philippe Lang 1c11d3403e Adds buttons to scroll the tabs when they overflow.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3174 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-14 20:13:29 +00:00
Jean-Philippe Lang cbeeaa4d4d Refactoring ApplicationHelper#link_to_issue.
Now displays issue subject by default.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3040 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 12:53:50 +00:00
Jean-Philippe Lang ede9960444 Refactoring of tabs rendering.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2871 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-12 09:13:13 +00:00
Jean-Philippe Lang c082cfc90e FIxed: inline images not displayed in atom feeds (#3391).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2768 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-26 08:28:36 +00:00
Jean-Philippe Lang 9c630cc2b7 Fixed: Atom feeds leak email address (#3408).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2763 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-25 18:11:32 +00:00
Jean-Philippe Lang 29c0dae151 Adds hostname to Redmine links in atom feeds (#3275).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2699 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-01 11:39:22 +00:00
Jean-Philippe Lang d984422a1f Fixes self and alternate atom links (#3161).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-26 20:12:58 +00:00
Jean-Philippe Lang 32c09fd5cf Adds more css classes to the roadmap issues (#3214).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2694 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-25 11:28:48 +00:00
Jean-Philippe Lang 9701c33562 Adds css classes to the issues in the calendar (#2651).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2568 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-07 16:32:30 +00:00
Jean-Philippe Lang 4c28291a19 Clickable/linkable line #'s while browsing the repo or viewing a text file (#2835).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2527 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-26 09:28:33 +00:00
Jean-Philippe Lang fe28193e4e Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-21 11:04:50 +00:00
Jean-Philippe Lang fec86a9ce1 Adds a setting to limit the number of diff lines that should be displayed (default to 1500).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2112 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-07 15:21:40 +00:00
Jean-Philippe Lang 02acc7fc28 Follows r2110.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2111 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-07 14:44:08 +00:00