Commit Graph

970 Commits

Author SHA1 Message Date
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
Eric Davis
ee48a8da4f Merge branch 'ticket/unstable/692-final-design' into unstable 2011-12-10 10:40:09 -08:00
Felix Schäfer
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
Spencer Markowski
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
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
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
Holger Just
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
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
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
981143f78f [#604] Disable classic ChiliProject wiki macros 2011-11-20 02:49:18 +01:00
Moritz Breit
d15c851bb3 [#711] Fix TabularFormBuilder on Ruby 1.9.2 2011-11-17 11:32:13 +01:00
Romano Licker
977f74e11a [#692] Main design changes for new theme 2011-11-12 16:22:25 -08:00
Romano Licker
734da91b4b [#692] login slidedown implemented with tabindex and focus fix 2011-11-12 16:22:24 -08:00
Holger Just
9e9b6e786e Bump version to 2.4.0 2011-10-31 17:35: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
91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Holger Just
0befef718f Add rake task to set magic comments for source encoding 2011-10-29 14:47:56 +02:00
Kornelius Kalnbach
65af1e4436 #649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine 2011-10-29 11:35:16 +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
Holger Just
8ee8ef02fe Extract the NullFormatter into its own files 2011-10-16 20:02:55 +02:00
Holger Just
9af56d078b Bump version to 2.3.0 2011-10-04 17:28:04 +02:00
Holger Just
9272876fe9 Bump version to 2.2.0 2011-08-27 18:51:47 +02:00
Holger Just
139dedfd5f Add copyright header 2011-08-27 18:28:54 +02:00
Holger Just
35b69d2a31 fastercsv is not in lib anymore but a dependency 2011-08-27 18:28:10 +02:00
Felix Schäfer
a24a24eb19 Add deferred loading for plugins which's requirements aren't all met yet #256 2011-08-25 18:46:53 +02:00
Felix Schäfer
2753973ffe Make TabularFormBuilder behave with subforms #586 2011-08-22 22:10:07 +02:00
Felix Schäfer
0b57e936f5 Rip faster_csv out of lib into the Gemfile. #517 2011-08-21 19:26:43 +02:00
Holger Just
eae5c9af68 [#275] Use ChiliProject::VERSION for new code 2011-08-21 15:16:34 +02:00
Holger Just
5300120461 Move Redmine::VERSION to ChiliProject::VERSION and add a compatibility interface 2011-08-21 14:48:53 +02:00
Holger Just
1796fddd2b [#275] Add requires_chiliproject. We now use the rubygems dependency syntax. 2011-08-21 14:47:31 +02:00
Felix Schäfer
8f4439e0d4 Fix issue pdf export #561
The pdf export tried to export the initial journal, which it shouldn't.
2011-08-21 12:56:27 +02:00
Eric Davis
da9c4a16a9 Bump version to 2.1.1 2011-08-01 16:52:33 -07:00
Eric Davis
2d67c2f2b3 Bump version to 2.1.0 2011-07-29 10:29:52 -07:00
Holger Just
06076e5ac1 Remove db:migrate_plugins task.
Use the equivalent db:migrate:plugins instead that is provided by the
engines plugin directly.
2011-07-27 15:23:26 +02:00
Eric Davis
4b3bd797b0 Fix errors when trying to check for binary SCM strings in 1.9.2
1.9.2 removed String#is_binary_data?
2011-07-22 14:35:01 -07:00
Eric Davis
8ca03f3a2a Add ChiliProject::Compatibility to help upgrade third party code 2011-07-11 09:51:08 -07:00
Eric Davis
a76ef2a43e Updated yardoc static files 2011-07-11 09:51:01 -07:00
Eric Davis
79152e4a24 Typo in method comment 2011-07-11 09:50:53 -07:00
Eric Davis
6a2772d75c Bump version to 2.0.0 (final) 2011-07-01 21:54:52 -07:00
Eric Davis
3e924ce6be Bump version to 2.0.0RC3 2011-06-17 15:25:11 -07:00
Eric Davis
9ccb172c81 Bump version to 2.0.0RC2 2011-06-10 13:35:12 -07:00
Eric Davis
3c53d1a63c Added rake release[version] task based on the release process
https://www.chiliproject.org/projects/chiliproject/wiki/HowTo_Release
2011-06-10 13:15:52 -07:00
Eric Davis
731de487e4 [#453] Upgrade to Rails 2.3.12 2011-06-10 10:43:12 -07:00
Eric Davis
a428fa6068 Bumping version to 2.0.0RC1 2011-05-30 14:22:31 -07:00
Eric Davis
821d9f5ca4 [#437] Move the encoding to the top of pdf.rb for Ruby 1.9 2011-05-30 14:20:20 -07:00
Eric Davis
790bb362c5 Fix the merge conflict from 6b8897db5f 2011-05-30 14:05:40 -07:00
Holger Just
6b8897db5f Merge branch 'unstable' into release-v2.0.0 2011-05-30 21:25:11 +02:00
Holger Just
07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Holger Just
b72785b274 [#436] Adapt rake task to also clean trailing whitespace 2011-05-30 20:49:58 +02:00
Holger Just
40ce66d05d [#197] Better regex and no trailing whitespace. 2011-05-30 19:58:54 +02:00
Eric Davis
37f6b75749 Added VERSION.special to handle special version releases (RC, distributions, etc) 2011-05-29 17:59:51 -07:00
Eric Davis
99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis
f18090891f [#197] Add a rake task to update the copyright in code files 2011-05-29 13:11:37 -07:00
Eric Davis
e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Eric Davis
a85b6780d2 [#262] Convert line endings to UNIX 2011-05-29 12:00:18 -07:00
Eric Davis
05a4c4616f [#262] Add a rake task to convert line endings to UNIX 2011-05-29 11:59:57 -07:00
Eric Davis
cd64d11e17 Merge branch 'master' into unstable
Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb
2011-05-27 12:20:04 -07:00
Eric Davis
0e31482de9 Bump version to 1.4.0 2011-05-27 11:37:03 -07:00
Eric Davis
e9676954be Fix tpyo in the example 2011-05-27 09:28:45 -07:00
Eric Davis
b8904ce7a2 Handle a nil user when testin email.
undefined method `logged?' for nil:NilClass
2011-05-27 09:27:05 -07:00
Gregor Schmidt
20a5e41538 [#425] Avoid deprecated API to define rake tasks with parameters
This should avoid deprecation warnings when using ChiliProject with Rake 0.9
2011-05-24 17:02:30 +02:00
Holger Just
35a38086e3 [#112] Fix tests for jruby 2011-05-22 19:46:31 +02:00
Holger Just
18247a6c58 [112] Detect SQLite3 version on JRuby 2011-05-22 19:02:53 +02:00
Eric Davis
a74517b983 Merge remote-tracking branch 'hufocf/feature/357-wrap-text-in-pdf' 2011-05-20 11:43:24 -07:00
Holger Just
7b3a2047fd Whitespace fixes 2011-05-16 00:03:51 +02:00
Holger Just
705c0db000 [#112] Fix failing raw version for postgres 2011-05-16 00:01:09 +02:00
Holger Just
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
Eric Davis
216619d376 Merge branch 'unstable' into ticket/unstable/123-journalized
Conflicts:
	test/unit/journal_test.rb
	vendor/plugins/acts_as_journalized/lib/redmine/acts/journalized/permissions.rb
2011-05-13 10:35:23 -07:00
Eric Davis
f273b7b18c Create the ChiliProject namespace 2011-05-11 15:48:36 -07:00
Felix Schäfer
9f07b2f4b4 Merge pull request #38 from edavis10/ticket/master/324-plugin-generators
Rename plugin generators to ChiliProject. #324
2011-05-05 13:14:26 -07:00
Gregor Schmidt
8686a16e0d Changing the way, links to the wiki_syntax help page are generated
This fixes a comment, that was sitting there for more than 2 years.
2011-05-02 12:18:31 +02:00
Eric Davis
bdc7325a82 Merge branch 'master' into unstable
Conflicts:
	doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07:00
Eric Davis
07772e7eb7 Bump version to 1.3.0 2011-05-01 13:09:15 -07:00
Hugo Ferreira
4662b81710 [#357] Wrap long text fields properly in PDF exports 2011-04-29 16:20:51 +01:00
Felix Schäfer
b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Toshi MARUYAMA
966a7a9c34 PDF: code clean up lib/redmine/export/pdf.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5296 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
Toshi MARUYAMA
7f0a29f7c2 PDF: set enable to use TCPDF UTF-8 on Windows except CJK and Thai (#61).
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5291 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:13:19 -07:00
Jean-Philippe Lang
d8fbdca760 Adds User and Version custom field format that can be used to reference a project member or version in custom fields (#2096).
These new field formats are available for project, issue, version and time entry custom fields.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:53 -07:00
Toshi MARUYAMA
098c1cb4fd PDF: switch TCPDF UTF-8 or FPDF ANSI (#61).
If server is Windows or language is CJK or Thai, Redmine uses FPDF.
Else Redmine uses TCPDF.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5259 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:52 -07:00