5061 Commits

Author SHA1 Message Date
Holger Just
a31a4a8852 [#604] Adapt fixtures for new liquid syntax 2011-11-20 02:49:22 +01:00
Eric Davis
dedf696666 [#604] Add missing test for Liquid 2011-11-20 02:49:22 +01:00
Holger Just
464dafc1e7 [#604] We don't support the old escape style anymore 2011-11-20 02:49:22 +01:00
Holger Just
f6805303fb [#604] Remove the leading newline from Liquid blocks for easier formatting 2011-11-20 02:49:21 +01:00
Holger Just
994132a51a [#604] Add nicer error formatting, similar to the old style 2011-11-20 02:49:21 +01:00
Holger Just
fe6a79ac17 [#604] Add some handy filters 2011-11-20 02:49:21 +01:00
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
Holger Just
862c9e0fde [#604] Adapt the upstream include mechanism to work with Wiki pages 2011-11-20 02:49:20 +01:00
Eric Davis
71ecdb57ed [#604] Port the child_pages to Liquid tag 2011-11-20 02:49:20 +01:00
Eric Davis
1e7dfe545e [#604] Port the macro_list to Liquid: variable_list and tag_list 2011-11-20 02:49:20 +01:00
Eric Davis
7778ff2f83 [#604] Port hello_world macro to liquid 2011-11-20 02:49:20 +01:00
Holger Just
29fe856916 [#604] Add base tag 2011-11-20 02:49:19 +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
981143f78f [#604] Disable classic ChiliProject wiki macros 2011-11-20 02:49:18 +01:00
Eric Davis
7906afe6b9 [#604] Add an IssueDrop with custom field support 2011-11-20 02:49:12 +01:00
Eric Davis
6f8d8c4105 [#604] Add basic WikiPageDrop 2011-11-19 23:34:52 +01:00
Eric Davis
91914cb877 [#604] Add simple Liquid drops for Projects and Principals 2011-11-19 23:33:36 +01:00
Holger Just
7261622196 [#604] Add base drop 2011-11-19 23:31:58 +01:00
Eric Davis
4289559b5f [#604] Require the liquid gem 2011-11-19 23:31:05 +01:00
Eric Davis
1897459b76 [#263] Refactor: move top menu logic to ApplicationHelper 2011-11-06 19:49:23 -08:00
Eric Davis
3e87af38d4 [#263] Make issue description the full width 2011-11-06 19:38:44 -08:00
Eric Davis
3409f5b620 [#658] Include jQuery v1.7, jquery ui 1.8.16, and smoothness theme 2011-11-06 19:21:56 -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
Eric Davis
7bc11f8de0 [#263] Tests require one theme being present 2011-11-06 17:46:55 -08:00
Eric Davis
f10412ef71 [#263] Update tests for views in the new layout 2011-11-06 17:46:31 -08:00
Eric Davis
a911d83889 [#263] Fix theme tests that changed singleton data 2011-11-06 16:39:28 -08:00
Eric Davis
5620488727 [#263] Removed and tweaks the design based on feedback 2011-11-06 16:39:15 -08:00
Eric Davis
b160217299 Use full paths to test_helper.rb for metric_fu/rcov to pick up 2011-11-03 19:43:20 -07:00
Holger Just
9c8380667c Merge branch 'master' into unstable 2011-10-31 18:18:44 +01:00
Holger Just
8eb72a3c74 Merge branch 'release-v2.4.0' 2011-10-31 18:17:54 +01:00
Holger Just
9e9b6e786e Bump version to 2.4.0 2011-10-31 17:35:19 +01:00
Holger Just
cb0d4725ad Only allow the mysql database adapter on Ruby 1.8 2011-10-31 17:33:51 +01:00
Holger Just
29ab88c7f3 Update changelog for 2.4.0 release 2011-10-31 17:28:34 +01:00
Holger Just
ba93eb24c4 Fix trailing whitespace 2011-10-31 17:26:14 +01:00
Holger Just
09b1545c37 Update i18n labels 2011-10-31 17:25:19 +01:00
Holger Just
cb2086f652 [#647] Fix XSS in textile image syntax.
Image URLs are not properly escaped in the bundled RedCloth3 library.
It thus allowed an XSS vector.

The patch was adapted from r7570 from Redmine by Etiene Massip. See also
http://www.redmine.org/issues/9245.
2011-10-31 17:22:34 +01:00
Holger Just
21a45b4e52 [#676] Enforce UTF-8 encodings on the params hash
Contributed by Toshi MARUYAMA
2011-10-30 11:25:56 +01:00
Holger Just
2f4afeeb38 [#615] Generate project identifier automatically with JavaScript
Also let the user know that the identifier must start with a lower case letter.

Contributed by Jan Schulz-Hofen.
2011-10-30 10:33:20 +01:00
Holger Just
667c4d157f [#591] Merge branch 'issues/master/591-ruby-19-compatibility' from 'meineerde' 2011-10-29 21:22:35 +02:00
Felix Schäfer
6fcb1de63a Graciously handle deleted custom fields on issue history view. 2011-10-29 18:29:18 +02:00
Felix Schäfer
92dd2934ae Merge pull request #106 from finnlabs/pulls/652/fixes_redirect_containing_umlaute
[#652] fixes wrong redirect after login
2011-10-29 08:47:02 -07:00
Holger Just
91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Holger Just
0befef718f Add rake task to set magic comments for source encoding 2011-10-29 14:47:56 +02:00
Holger Just
0ed5cb3f05 Set internal and external encoding to UTF-8 2011-10-29 14:47:56 +02:00
Holger Just
3cc95353cd Merge commit '873b2b69064d7724c6fc804813fb9e65c14558dc'
Conflicts:
	config/locales/nl.yml
2011-10-29 14:40:16 +02:00
Holger Just
917c36c27f Update missing i18n strings 2011-10-29 14:35:29 +02:00
Holger Just
ec6221b7fe Use class instead of redundant id 2011-10-29 14:28:51 +02:00
Holger Just
fd3d67937c Fix typo 2011-10-29 14:23:22 +02:00