Commit Graph

348 Commits

Author SHA1 Message Date
Toshi MARUYAMA 48b9b805b2 fix typo "MACROS_SUB_RE" (#11736)
Contributed by Anton Argirov.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10277 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 11:09:43 +00:00
Jean-Philippe Lang 8b72710d7e Fixed: New multi-line macros regexp is too eager (#11736).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10276 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:24:56 +00:00
Jean-Philippe Lang 265baa1b2c Upgrade to Rails 3.2.8 (#11758).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10275 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-09-02 10:08:51 +00:00
Jean-Philippe Lang ebc979e9b1 Do not use escaped back_url param (#11691).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10239 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-26 10:40:09 +00:00
Jean-Philippe Lang fc3a09e49a Let macros optionally accept a block of text (#3061).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10210 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-18 08:25:22 +00:00
Jean-Philippe Lang 73aece0baf Macros processing overhaul (#3061, #11633).
* macro arguments are no longer parsed by text formatters
* macro output is escaped unless it's html safe

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10209 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-17 14:46:55 +00:00
Toshi MARUYAMA 91a09bd474 fix unit test fails on JRuby 1.6.7.2 (#11577)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10207 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-14 00:30:23 +00:00
Jean-Philippe Lang 3673fbd881 Fixed: Can't use non-latin anchor in wiki (#11577).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10206 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-13 19:36:00 +00:00
Jean-Philippe Lang 145e5997b2 Removed duplicated helper (#11539).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10191 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 18:41:24 +00:00
Jean-Philippe Lang 0a6c1d9c13 Extract code to render nested listed of projects in an helper (#11539).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10188 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 17:09:48 +00:00
Jean-Philippe Lang 02b2a61e15 Reverted r10184 (#9365).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10186 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-10 16:35:58 +00:00
Jean-Philippe Lang cbfafcd5e2 Use SSL for gravatars according to the protocol in settings (#9365).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10184 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-09 18:04:54 +00:00
Jean-Philippe Lang b907398788 Slight change to the macro regexp.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10178 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 18:54:01 +00:00
Jean-Philippe Lang e2d6f0af4e Adds an option to macro definition to disable arguments parsing (#11578).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10174 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-08-08 16:28:33 +00:00
Jean-Philippe Lang 33d6f9e7a1 Label should be escaped.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10111 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-29 10:15:20 +00:00
Jean-Philippe Lang 6e7507d580 Adds a replacement for deprecated link_to_function helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10092 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-28 15:26:45 +00:00
Jean-Philippe Lang 28cdc8adfc Don't turn #nnn with leading zeros into link (#11494).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10077 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-24 21:51:10 +00:00
Jean-Philippe Lang cd54e15a8d Use JQuery Datepicker (#11445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10069 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-22 14:43:19 +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 6668d7ebd1 Removed deprecated #labelled_tabular_form_for helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10041 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-18 19:14:35 +00:00
Jean-Philippe Lang 1c8d03c1e9 ApplicationHelper#labelled_remote_form_for deprecated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10040 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-18 19:13:30 +00:00
Jean-Philippe Lang c790f1ca41 ApplicationHelper#link_to_remote_if_authorized deprecated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10039 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-18 19:10:08 +00:00
Jean-Philippe Lang ff68fff80e Adds a helper for preview links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10031 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-18 17:47:19 +00:00
Jean-Philippe Lang 7b40767428 Deprecated :confirm => 'Text' option.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9937 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-07 14:36:49 +00:00
Jean-Philippe Lang a0c495b953 Displays thumbnails of attached images of the issue view (#1006).
This behaviour can be turned on/off in Settings -> Display (off by default). Thumbnail size can be configured there too.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9933 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-07 13:48:07 +00:00
Jean-Philippe Lang df41255105 Perf: don't load parent message for generating a link.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9904 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-07-04 17:34:37 +00:00
Etienne Massip 56cf381357 Code cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9899 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-26 17:36:29 +00:00
Jean-Philippe Lang 7f6ac407ef Fixed that root projects are escaped twice in the project drop down (#11217).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9894 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-26 16:54:30 +00:00
Jean-Philippe Lang ac56c0c99c Ability to close projects (read-only) (#3640).
A new permission (Close/reopen project) is available to give non-admin users the ability to close their projects.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9883 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-06-25 17:49:35 +00:00
Jean-Philippe Lang 189be55235 Fixed time zone issues introduced by r9719 (#10996).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9726 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-26 12:07:56 +00:00
Jean-Philippe Lang 5bd90548b0 Adaptive display of "Per page" links (#7720).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9664 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-10 18:51:11 +00:00
Jean-Philippe Lang ba5a052c8c Copyright update.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9636 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-05 12:56:53 +00:00
Toshi MARUYAMA 1446c9b7f0 scm: fix git and mercurial branch list box action
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9612 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-02 13:19:16 +00:00
Jean-Philippe Lang f54ecfc55f Fixed that sidebar with hook content only should not be hidden.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9598 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-01 10:19:06 +00:00
Jean-Philippe Lang 253b02bd22 Adds an id to the flash message divs (#9034).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9578 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-29 08:25:50 +00:00
Jean-Philippe Lang 6143d119fe Merged #merge! calls.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9576 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-29 07:42:48 +00:00
Toshi MARUYAMA c0891e8a78 helper: replace remote_form_for to form_for at labelled_remote_form_for
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9573 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-29 04:08:44 +00:00
Jean-Philippe Lang 68f8470d4a Makes image_tag pick the image from the current theme if it exists.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9560 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-28 09:47:09 +00:00
Jean-Philippe Lang da43f785be Adds support for :plugin option to image_tag helper.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9559 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-28 09:18:12 +00:00
Jean-Philippe Lang 03335d014c Restores support for :plugin support to stylesheet_link_tag and javascript_include_tag helpers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9558 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-28 09:10:46 +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
Toshi MARUYAMA fcbeee78c1 Rails3: view: html_safe for principals_options_for_select in ApplicationHelper
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9462 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-21 01:44:38 +00:00
Toshi MARUYAMA e964135b62 delete :only_path option from link_to options at application_helper link_to_attachment (#10602)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9328 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 06:07:13 +00:00
Toshi MARUYAMA 8828c0f13e fix attachment link has get parameter :class (#10602)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9327 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 05:45:04 +00:00
Toshi MARUYAMA 27c390bb62 Fix duplicated 'back_url' IDs
Various hidden input fields are used to hold a URL to send the user back
to the correct page after submitting a form, however, they all use the
same ID which isn't allowed in HTML. Passing in 'id' as nil stops the
'hidden_field_tag' from adding an ID attribute to the tag.

Contributed by Andrew Smith.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9250 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-03-24 00:02:20 +00:00
Jean-Philippe Lang e6b9ddad18 Mailer#url_for not called in views with Rails 3.1.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9023 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-27 20:43:25 +00:00
Jean-Philippe Lang 0d2a22f37a Use controller_name and action_name instead of params.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9018 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-26 19:20:37 +00:00
Jean-Philippe Lang 7c568cccaf Adds a helper for displaying validation error messages.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-26 18:07:13 +00:00
Toshi MARUYAMA aa0935c13b Rails3: html_safe for project_tree_options_for_select method in application helper
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9011 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-02-26 07:10:54 +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