3a16f3f5b1
Merge remote-tracking branch 'upstream/master' into unstable
2011-12-17 15:20:58 -08:00
04eb115da7
Add identity tag which just returns whatever was entered as input
2011-12-17 23:49:25 +01:00
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
7458bca34b
Don't create arguments for legacy tags if there aren't any
2011-12-17 22:14:19 +01:00
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
611889f3f7
[ #748 ] Use SCM commands to detect the revision
2011-12-15 22:08:18 +01:00
ee48a8da4f
Merge branch 'ticket/unstable/692-final-design' into unstable
2011-12-10 10:40:09 -08:00
aa88fe8e39
Merge branch 'coderay-1.0' of https://github.com/rubychan/chiliproject into rubychan-coderay-1.0
2011-12-09 16:50:20 +01:00
b264a8ee3f
Encloses since date in single quotes. This was causing git to respond with fatal: Unknown Object and preventing revisions from being updated.
2011-12-08 23:51:15 -05:00
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
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
59dc103492
[ #735 ] Don't allow time entry creation with only edit permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:27:59 +01:00
c5b83b8709
[ #735 ] Don't allow time entry edits with only log_time permission
...
Based on a patch by Jean-Philippe Lang.
2011-11-30 20:27:59 +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
cc0526cb27
[ #604 ] Introduce compatibility layer for third party macros.
...
This be removed with complete macro removal.
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
981143f78f
[ #604 ] Disable classic ChiliProject wiki macros
2011-11-20 02:49:18 +01:00
d15c851bb3
[ #711 ] Fix TabularFormBuilder on Ruby 1.9.2
2011-11-17 11:32:13 +01:00
977f74e11a
[ #692 ] Main design changes for new theme
2011-11-12 16:22:25 -08:00
734da91b4b
[ #692 ] login slidedown implemented with tabindex and focus fix
2011-11-12 16:22:24 -08:00
9e9b6e786e
Bump version to 2.4.0
2011-10-31 17:35:19 +01:00
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
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
0befef718f
Add rake task to set magic comments for source encoding
2011-10-29 14:47:56 +02:00
65af1e4436
#649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine
2011-10-29 11:35:16 +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
8ee8ef02fe
Extract the NullFormatter into its own files
2011-10-16 20:02:55 +02: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
139dedfd5f
Add copyright header
2011-08-27 18:28:54 +02:00
35b69d2a31
fastercsv is not in lib anymore but a dependency
2011-08-27 18:28:10 +02:00
a24a24eb19
Add deferred loading for plugins which's requirements aren't all met yet #256
2011-08-25 18:46:53 +02:00
2753973ffe
Make TabularFormBuilder behave with subforms #586
2011-08-22 22:10:07 +02:00
0b57e936f5
Rip faster_csv out of lib into the Gemfile. #517
2011-08-21 19:26:43 +02:00
eae5c9af68
[ #275 ] Use ChiliProject::VERSION for new code
2011-08-21 15:16:34 +02:00
Eric Davis
Holger Just
Felix Schäfer
Spencer Markowski
Gregor Schmidt
Moritz Breit
Romano Licker
Kornelius Kalnbach
Felix Schäfer