Commit Graph

5228 Commits

Author SHA1 Message Date
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
Moritz Breit d15c851bb3 [#711] Fix TabularFormBuilder on Ruby 1.9.2 2011-11-17 11:32:13 +01:00
Gregor Schmidt fb7f109ac6 [#708] Adding tests exposing the erroneous behavior 2011-11-17 11:17:11 +01:00
Gregor Schmidt e2938d26f3 [#708] Using instance var to store journal class name
this way journal classes are only created for classes with
calls to acts_as_journalized. You may now subclass journaled models to extend them with helper methods in plugins w/o interfering with aaj.
2011-11-17 11:16:48 +01:00
Moritz Breit 60db868470 [#707] Fix encoding error on wiki diffs on Ruby 1.9
WikiDiff#to_html returns a string with ASCII encoding if
the WikiJournal content has been Zlib compressed because
Zlib::Inflate.inflate returns strings with ASCII encoding.
Forcing the encoding to be UTF8 fixes this bug.
2011-11-16 17:39:26 +01:00
Moritz Breit c3df17585d [#698] Fix issue queries on Ruby 1.9 2011-11-16 14:22:43 +01:00
Eric Davis 1e41ec912b Guard against a LocalJumpError in Project#project_tree 2011-11-14 19:23:49 -08:00
Eric Davis af9572d985 Confirm before deleting issue categories 2011-11-14 19:10:13 -08:00
Eric Davis 5f3c6b87e4 Show email notification options in a project tree 2011-11-14 18:55:39 -08:00
Felix Schäfer b1671e46f0 Merge pull request #111 from edavis10/ticket/unstable/672-query-subprojects
#672 Allow queries to include subproject issues
2011-11-13 12:11:52 -08:00
jwollert edce16c89a [#692] enable jump to project box to take options (projects and html) 2011-11-12 16:22:31 -08:00
Romano Licker 977f74e11a [#692] Main design changes for new theme 2011-11-12 16:22:25 -08:00
Romano Licker c16cfd8ff1 [#692] images for new design 2011-11-12 16:22:24 -08:00
Romano Licker 734da91b4b [#692] login slidedown implemented with tabindex and focus fix 2011-11-12 16:22:24 -08:00
jwollert fecfbaf908 [#692] change project navigation arrow on hover
- fix project navigation arrows
2011-11-12 16:22:24 -08:00
Holger Just 0462fa973b [#688] Truncate garbage from the end of the changelog. 2011-11-08 11:40:27 +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
Felix Schäfer af50984023 Better decide if journal implements the method itself. #554 2011-11-06 13:25:31 +01: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