Commit Graph

64 Commits

Author SHA1 Message Date
Holger Just f681ed8c13 Bump version to 3.1.0 2012-04-04 14:21:43 +02:00
Felix Schäfer ef5dddf4db Switch to GitAdapter for quoting #891
Fixes problems with paths containing quotes (sic)
2012-03-05 18:21:28 +01:00
Felix Schäfer 4b5271f487 Correct quotation #891
The Windows shell doesn't seem to support single quotes…

Contributed by Dies Koper, Luke Carrier
2012-03-01 00:40:23 +01:00
Holger Just 3ecace901b Bump version to 3.0.0 2012-02-06 23:58:16 +01:00
Holger Just 21f70fc86c Bump version to 3.0.0beta2 2012-01-18 19:48:06 +01:00
Holger Just 19f2ccd496 Update copyright for 2012 2012-01-18 19:25:13 +01:00
Holger Just a0a2776f95 Make the strainer monkey patch more conservative and compatible 2012-01-18 10:19:04 +01:00
Holger Just c313ed2d25 Remove unloadable from the monkey patches for Liquid.
It turns out in this case or core patches, unloadable actually breaks in
development mode. Did I already mention that I hate the Rails reloader?
2012-01-17 19:38:28 +01:00
Holger Just 31620d0c0a Override first and last filters to allow simple array slicing 2012-01-17 13:47:13 +01:00
Holger Just 9967b5cdf2 Patch Liquid to include filters in a predictable order
This brings us a reliable filter override until
https://github.com/Shopify/liquid/pull/87 is accepted and
released upstream.
2012-01-16 20:49:39 +01:00
Holger Just e91a1e010f [#778] Properly cache Liquid markup
This commit moves the markup caching into Liquid rendering. As
Liquid allows to return different results depending on the environment
(variables, logged user, ...) we only cache the page if it contains
no active content.

Unfortunetely, active content currently also includes the TOC
in wiki pages.
2012-01-16 17:08:52 +01:00
Holger Just d9a0ac37eb Move Redmine::Info to ChiliProject::Info 2012-01-16 13:28:43 +01:00
Holger Just f1324e6af4 [#790] Replace TagList and VariableList tags with variables 2012-01-05 23:36:30 +01:00
Holger Just 446f943968 [#790] Add filter to output an array into an unordered list 2012-01-05 23:36:30 +01:00
Holger Just 3c3eb2f7e7 [#790] Register variables with an API 2012-01-05 23:36:29 +01:00
Holger Just 0c87f611e9 Merge branch 'master' into unstable
Conflicts:
	config/locales/bg.yml
	config/locales/bs.yml
	config/locales/ca.yml
	config/locales/cs.yml
	config/locales/da.yml
	config/locales/de.yml
	config/locales/el.yml
	config/locales/en-GB.yml
	config/locales/es.yml
	config/locales/eu.yml
	config/locales/fa.yml
	config/locales/fi.yml
	config/locales/fr.yml
	config/locales/gl.yml
	config/locales/he.yml
	config/locales/hr.yml
	config/locales/hu.yml
	config/locales/id.yml
	config/locales/it.yml
	config/locales/ja.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mk.yml
	config/locales/mn.yml
	config/locales/nl.yml
	config/locales/no.yml
	config/locales/pl.yml
	config/locales/pt-BR.yml
	config/locales/pt.yml
	config/locales/ro.yml
	config/locales/ru.yml
	config/locales/sk.yml
	config/locales/sl.yml
	config/locales/sr-YU.yml
	config/locales/sr.yml
	config/locales/sv.yml
	config/locales/th.yml
	config/locales/tr.yml
	config/locales/uk.yml
	config/locales/vi.yml
	config/locales/zh-TW.yml
	config/locales/zh.yml
	db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
	lib/chili_project/version.rb
2012-01-04 16:41:10 +01:00
Holger Just 939fd0b9fa Bump version to 2.6.0 2012-01-03 20:46:58 +01:00
Holger Just e95b4992e4 Update copyright for 2012
We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".

-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
2012-01-03 20:36:40 +01:00
Holger Just 6f17ec6fd0 Bump version to 3.0.0beta1 2011-12-18 21:51:43 +01:00
Holger Just 745f889e92 Enforce UTF-8 source encoding 2011-12-18 21:40:14 +01:00
Holger Just ba6fcfeca9 Override some filters of Liquid core.
These filters change the implemntation of sub and gsub to use the block method.
This prevents the evaluation of backreferences in the replacement text. See
https://gist.github.com/1491437 for examples.

Also, it allows split to be called without arguments to split strings on
whitespace.
2011-12-18 15:54:09 +01:00
Eric Davis 2f0d13149d Copyright header update 2011-12-17 15:50:52 -08:00
Eric Davis 3a16f3f5b1 Merge remote-tracking branch 'upstream/master' into unstable 2011-12-17 15:20:58 -08:00
Holger Just 04eb115da7 Add identity tag which just returns whatever was entered as input 2011-12-17 23:49:25 +01:00
Holger Just e2c57fd12d Make floated TOCs in wikis compatible with the Liquid engine
The floated tags (>toc and <toc) are invalid syntax because of the < and >
characters. We transform them to toc_left and toc_right instead.
2011-12-17 22:14:19 +01:00
Holger Just 7458bca34b Don't create arguments for legacy tags if there aren't any 2011-12-17 22:14:19 +01:00
Holger Just 60deeb5306 Move definiton of liquid legacy tags into the Legacy module.
This is required to retaiun the definition in development mode as the module
is stragely reloaded.
2011-12-17 22:01:20 +01:00
Holger Just 611889f3f7 [#748] Use SCM commands to detect the revision 2011-12-15 22:08:18 +01:00
Felix Schäfer d943efd0eb [#748] Make ChiliProject::Version.revision more resilient
* Won't output errors when the ChiliProject git repo isn't there anymore,
* Works even if not invoked from the ChiliProject root directory,
* Moved the formatting logic to the git call.
2011-12-03 17:39:52 +01:00
Felix Schäfer 1d21cab2e4 Merge branch 'master' into unstable
Conflicts:
	app/views/projects/index.rhtml
	lib/chili_project/compatibility.rb
2011-12-01 17:46:05 +01:00
Holger Just 7104a24593 Bump version to 2.5.0 2011-11-30 20:43:08 +01:00
Holger Just 5bf27de92a [604] Add compatibility check for Liquid 2011-11-26 22:24:51 +01:00
Holger Just 8c26dea72d Add catch-all compatibility check, defaults to false 2011-11-26 22:21:48 +01:00
Holger Just 9f4d12ffdf [#734] Don't modify text inline.
This is not only a wee bit faster (yay!) but also allows use to deal with
frozen strings and doesn't change content which might inadvertently be saved
later on. And it fixes some broken tests on Ruby 1.9 :)
2011-11-26 16:10:24 +01:00
Gregor Schmidt 3577550cfa [#725] Chili-core now loads jQuery by default
This was added to unstable with ab2856b53 and will be released with Chili 3.0
2011-11-25 20:24:06 +01:00
Gregor Schmidt 13da5e0445 [#725] Add compatibility check for jQuery availability
In the current master a.k.a. ChiliProject 2.x, there is
no jQuery loaded by core.
2011-11-25 20:19:58 +01:00
Gregor Schmidt be44bbe597 [#725] Add compatibility check for jQuery availability
In the current master a.k.a. ChiliProject 2.x, there is
no jQuery loaded by core.
2011-11-25 20:18:10 +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 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
Holger Just 9e9b6e786e Bump version to 2.4.0 2011-10-31 17:35:19 +01:00
Holger Just 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Eric Davis 79073734a1 [#221 Use git rev-parse to get the current sha for the version string 2011-10-25 15:55:10 -07:00