Holger Just
ce5ffed6a3
Require bundler 1.0.6.
...
Only that version introduced the mingw platforms we use in our Gemfile.
2011-11-26 12:26:11 +01:00
Eric Davis
01e43f2e6b
Merge pull request #134 from schmidt/pulls/725/unstable
...
[#725 ] Compatibility check for jQuery availability (unstable)
2011-11-25 12:50:25 -08:00
Eric Davis
261aca658c
Merge pull request #133 from schmidt/pulls/725/master
...
[#725 ] Compatibility check for jQuery availability (master)
2011-11-25 12:50:08 -08:00
Felix Schäfer
166d65b26d
[ #258 ] Unvendor net-ldap
2011-11-25 20:54:23 +01:00
Eric Davis
1322fbbad0
Merge pull request #129 from jwalkerbg/master
...
Added Bulgarian translation of several strings
2011-11-25 11:28:45 -08: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
Eric Davis
8fc2b72740
[ #720 ] Add acts-as-taggable-on gem and migration for tag support
...
As per the gem docs, 2.1.0 is the last Rails 2.x compatable version
2011-11-25 11:23:34 -08: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
Felix Schäfer
574419bbb1
Merge pull request #126 from mbreit/bugfix/711-tabular_form_builder_ruby19
...
[#711 ] Fix TabularFormBuilder on Ruby 1.9
This is actually a bug in rails 2.3.14 on ruby 1.9 -- Felix
2011-11-25 11:04:35 -08:00
jwalkerbg
d8daeffa7b
Added Bulgarian translation of several strings.
2011-11-25 20:32:27 +02:00
Felix Schäfer
8b7ee93f90
Merge pull request #124 from mbreit/bugfix/707-wiki-diff-encoding-error-ruby19
...
[#707 ] Fix encoding error on wiki diffs on Ruby 1.9
2011-11-25 09:48:52 -08:00
Felix Schäfer
03d956c360
Merge pull request #90 from meineerde/issues/master/124-delete-registered-users
...
[124] delete registered users
2011-11-25 09:47:12 -08:00
Felix Schäfer
a80f822481
Merge pull request #123 from mbreit/bugfix/698-issue-query-ruby19
...
[#698 ] Fix single-value query atoms in issue queries on Ruby 1.9
2011-11-25 09:45:49 -08:00
Eric Davis
a0d95a87e9
[ #706 ] Add plugin hooks to projects/index
...
Contributed by David O
2011-11-25 02:21:11 -08:00
Eric Davis
e6fe1fc776
Merge remote-tracking branch 'meineerde/issues/unstable/604-liquid-rebased' into unstable
2011-11-25 01:44:19 -08:00
Eric Davis
b1d9667335
Fix test so it runs in isolation
2011-11-20 02:49:22 +01:00
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
Moritz Breit
d15c851bb3
[ #711 ] Fix TabularFormBuilder on Ruby 1.9.2
2011-11-17 11:32:13 +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