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
7104a24593
Bump version to 2.5.0
2011-11-30 20:43:08 +01:00
5bf27de92a
[604] Add compatibility check for Liquid
2011-11-26 22:24:51 +01:00
8c26dea72d
Add catch-all compatibility check, defaults to false
2011-11-26 22:21:48 +01:00
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
3577550cfa
[ #725 ] Chili-core now loads jQuery by default
...
This was added to unstable with ab2856b53
2011-11-25 20:24:06 +01:00
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
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
f6805303fb
[ #604 ] Remove the leading newline from Liquid blocks for easier formatting
2011-11-20 02:49:21 +01:00
994132a51a
[ #604 ] Add nicer error formatting, similar to the old style
2011-11-20 02:49:21 +01:00
fe6a79ac17
[ #604 ] Add some handy filters
2011-11-20 02:49:21 +01:00
862c9e0fde
[ #604 ] Adapt the upstream include mechanism to work with Wiki pages
2011-11-20 02:49:20 +01:00
71ecdb57ed
[ #604 ] Port the child_pages to Liquid tag
2011-11-20 02:49:20 +01:00
1e7dfe545e
[ #604 ] Port the macro_list to Liquid: variable_list and tag_list
2011-11-20 02:49:20 +01:00
7778ff2f83
[ #604 ] Port hello_world macro to liquid
2011-11-20 02:49:20 +01:00
29fe856916
[ #604 ] Add base tag
2011-11-20 02:49:19 +01:00
81ca15c52c
[ #604 ] Add ability to support legacy macros
2011-11-20 02:49:19 +01:00
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
9e9b6e786e
Bump version to 2.4.0
2011-10-31 17:35:19 +01:00
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
79073734a1
[ #221 Use git rev-parse to get the current sha for the version string
2011-10-25 15:55:10 -07:00
9af56d078b
Bump version to 2.3.0
2011-10-04 17:28:04 +02:00
9272876fe9
Bump version to 2.2.0
2011-08-27 18:51:47 +02:00
5300120461
Move Redmine::VERSION to ChiliProject::VERSION and add a compatibility interface
2011-08-21 14:48:53 +02:00
8ca03f3a2a
Add ChiliProject::Compatibility to help upgrade third party code
2011-07-11 09:51:08 -07:00
79152e4a24
Typo in method comment
2011-07-11 09:50:53 -07:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
e131c3b531
[ #197 ] Remove old copyrights
2011-05-29 12:50:08 -07:00
35a38086e3
[ #112 ] Fix tests for jruby
2011-05-22 19:46:31 +02:00
18247a6c58
[112] Detect SQLite3 version on JRuby
2011-05-22 19:02:53 +02:00
7b3a2047fd
Whitespace fixes
2011-05-16 00:03:51 +02:00
705c0db000
[ #112 ] Fix failing raw version for postgres
2011-05-16 00:01:09 +02:00
8279144073
[ #112 ] Add ChiliProject::Database
...
This module can be used to gather information about the currently used
database.
2011-05-15 23:14:02 +02:00
f273b7b18c
Create the ChiliProject namespace
2011-05-11 15:48:36 -07:00
Felix Schäfer
Holger Just
Gregor Schmidt
Eric Davis