531 Commits

Author SHA1 Message Date
Holger Just
cc0526cb27 [#604] Introduce compatibility layer for third party macros.
This be removed with complete macro removal.
2011-11-20 02:49:21 +01:00
Eric Davis
81ca15c52c [#604] Add ability to support legacy macros 2011-11-20 02:49:19 +01:00
Holger Just
82432f3f99 [#604] Evaluate Liquid before Textile-to-HTML transformation.
This changes how the liquid integration works. It now integrates the Textile
conversion step. This was necessary because if you first convert the snippets
inside of loops and conditionals from Textile to HTML, you loose some
important context information which is required to e.g. build proper lists in
textile.

We expect the standard case that Liquid tags return Textile markup instead
of HTML. Thus, we can convert the final textile markup to HTML as a very last
step.

To allow existing and new macros (or tags) to return HTML for advanced usage,
we save their respective output into the context and put a placeholder string
into the generated markup. After the transformation to HTML, we insert the
previously generated HTML into the string using search+replace in
lib/chili_project/liquid/template.rb. Tags have to be registered using
:html => true for this special treatment.
2011-11-20 02:49:19 +01:00
Eric Davis
72fa3ff920 [#604] Run the output of the WikiFormatted text into Liquid
The current view's instance variables are sent to liquid dynamically
2011-11-20 02:49:19 +01:00
Eric Davis
1897459b76 [#263] Refactor: move top menu logic to ApplicationHelper 2011-11-06 19:49:23 -08:00
Eric Davis
ab2856b53f [#263] Add new layout and theme
Merge branch 'ticket/unstable/263-new-layout-ready' into unstable
2011-11-06 18:18:35 -08:00
Holger Just
91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Eric Davis
e51f067f12 Merge branch 'ticket/unstable/263-new-layout' into unstable 2011-10-28 15:12:59 -07:00
Romano Licker
5ab9ed889c [#667] added invisible project scope label 2011-10-28 17:03:35 +02:00
Romano Licker
bf8de58548 [#667] added 'for' to link them 2011-10-28 17:03:35 +02:00
Eric Davis
4b8f4c3b83 [#263] Allow setting the page header title 2011-08-05 10:45:48 -07:00
Eric Davis
ffa2d5f319 [#263] Remove the tree of parent issues from the issue title 2011-08-05 09:01:03 -07:00
Eric Davis
a7ab39dd31 [#557] Fix link_to_month to not escape the HTML arrow characters 2011-08-05 08:49:22 -07:00
Eric Davis
4d48a6b675 Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string'
Conflicts:
	app/helpers/repositories_helper.rb
2011-08-05 08:30:21 -07:00
Eric Davis
2c46411678 [#547] Security audit 2011-08-01 16:00:23 -07:00
Tom Rochette
552cd8dc57 Replace hardcoded string "diff" in Wiki#show and Repositories_Helper. 2011-07-31 09:27:13 -04:00
Eric Davis
8f45e780ce [#263] Fix issue subject style 2011-07-29 15:33:43 -07:00
Eric Davis
e7e4557009 [#263] Fix journal formatting 2011-07-29 15:04:03 -07:00
Eric Davis
5949f8de91 Port issue history changes 2011-07-29 14:37:24 -07:00
Eric Davis
c23f73e9fe Port ApplicationHelper patches 2011-07-29 14:31:26 -07:00
Eric Davis
70c3e1c8f9 [#544] html_escape issue fields 2011-07-29 09:25:13 -07:00
Holger Just
76490fcda5 Merge remote-tracking branch 'finnlabs/pulls/539/cleanup-issue_helper-show_detail' 2011-07-27 16:03:14 +02:00
Gregor Schmidt
8c9034f41e [#539] removing dead code - this went into JournalFormatter 2011-07-26 23:00:47 +02:00
Eric Davis
2d98a486d6 Fix failing test due to invalid HTML and missing initial journal 2011-07-22 11:52:55 -07:00
Eric Davis
97dd339bbb [#191] Refactor: extract methods to helper 2011-07-08 14:59:23 -07:00
Holger Just
07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis
99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis
e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Eric Davis
cd64d11e17 Merge branch 'master' into unstable
Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb
2011-05-27 12:20:04 -07:00
Felix Schäfer
6598a44ddd Add a helper to format user lists. #304 2011-05-19 23:48:02 +02:00
Gregor Schmidt
e3f54d470c [#416] :class might be nil or a symbol - then + will not work as expected 2011-05-17 20:03:02 +02:00
Gregor Schmidt
2c2ed95866 [#416] Re-Adding watcher_tag for backwards compatibility
adding deprecation warning
2011-05-17 20:03:02 +02:00
Gregor Schmidt
508b23cf41 [#416] Watcher links work using of css selectors instead of ids 2011-05-17 20:03:02 +02:00
Gregor Schmidt
76c72d8f11 [#414] remove returning which will be removed in future versions of Rails 2011-05-14 00:19:53 +02:00
Eric Davis
193b2c7a38 [#404] Move vendor/plugins/acts_as_journalized/app/ to the core app/ 2011-05-13 12:34:24 -07:00
Eric Davis
216619d376 Merge branch 'unstable' into ticket/unstable/123-journalized
Conflicts:
	test/unit/journal_test.rb
	vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb
2011-05-13 10:35:23 -07:00
Eric Davis
13de4cc4b0 [#383] Fixed failing tests due to a helper method name conflict (to_utf8)
Introduced in 1eee7312f60267b0f8e575cc96302812f2dc38a8
2011-05-06 16:38:13 -07:00
Simon COURTOIS
bfacd827a8 Removig english strings from RepositoriesHelper 2011-05-05 22:05:41 +02:00
Eric Davis
614bad89a5 Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable
Conflicts:
	config/locales/en.yml
	test/unit/journal_test.rb
2011-04-29 08:46:13 -07:00
Felix Schäfer
b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Jean-Philippe Lang
42653cef32 Shorten query[column_names] param name.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5304 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
Jean-Philippe Lang
e78149f85c Keep issue filter params on sort headers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:54 -07:00
Jean-Philippe Lang
1335548949 Changes pagination links to non-AJAX requests (#5138).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5302 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:53 -07:00
Jean-Philippe Lang
07cf681d61 Makes all pagination-like links use #link_to_content_update (#5138).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5301 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:15:50 -07:00
Jean-Philippe Lang
2431d830b1 No PUT request to get previous/next month.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5287 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
Jean-Philippe Lang
62a4170531 Shortens filter param names.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5279 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Jean-Philippe Lang
4e6962e7c9 Keep filter params in 'Per page' links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5278 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Jean-Philippe Lang
d8fbdca760 Adds User and Version custom field format that can be used to reference a project member or version in custom fields (#2096).
These new field formats are available for project, issue, version and time entry custom fields.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Jean-Philippe Lang
2e2f79aa27 Save 2 queries when displaying a root issue.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5244 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:49 -07:00
Jean-Philippe Lang
4bcba6a094 Adds support for saturday as the first week day (#7097).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5228 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00