kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,321 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

49 Commits

Author SHA1 Message Date
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 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 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 91070236db Set source encoding to UTF-8 2011-10-29 14:48:03 +02:00
Holger Just 8ee8ef02fe Extract the NullFormatter into its own files 2011-10-16 20:02:55 +02:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -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
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
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Jean-Philippe Lang 1191be519d Escapes wiki help link. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5242 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:49 -07:00
Jean-Philippe Lang 341c9c8408 Prettier wiki syntax help link. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5241 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:49 -07:00
Jean-Philippe Lang 8c57b95c6a Load scripts and css for wiki formatter toolbar when needed. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5239 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:49 -07:00
Jean-Philippe Lang d16db34454 Moves jstoolbar script include tags to head. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5238 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:48 -07:00
Jean-Philippe Lang 9049d58de4 Fixed: line breaks are ignored in quoted text (#6148). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5133 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 15:38:57 -07:00
Felix Schäfer 70e10ab4bd Merge the master-journalized branch from https://github.com/finnlabs/redmine/ 2011-04-14 16:28:10 +02:00
Felix Schäfer c73315e6b0 Avoid selecting the help link while tabbing #150 2011-02-22 19:06:19 +01:00
Jean-Philippe Lang 024ff96ee2 Extract headings and TOC parsing from the textile formatter. 
Fixes #2038 and #3707 and will allow to support TOC with other text formatters.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-11-06 17:47:27 +00:00
Tim Felgentreff 19c7dc0094 Merge remote branch 'edavis/master' into master-journalized 
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/wiki_controller.rb
	app/helpers/issues_helper.rb
	app/models/time_entry.rb
	app/models/wiki_content.rb
	app/views/wiki/edit.rhtml
	config/locales/ja.yml
	test/functional/wiki_controller_test.rb
 2010-10-26 18:28:39 +02:00
Jean-Baptiste Barth d642964035 Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-10-23 22:35:02 +00:00
Tim Felgentreff 47ecf151dd completely remove acts_as_versioned as it's functionality is contained in acts_as_journalized 
This makes the wiki just use the versioning provided by acts_as_journalized
 2010-08-04 19:01:18 +02:00
Eric Davis 6eea3300f8 Sanitize image links and handle nils in the toc formatter. #5445 
Based on contribution by Yuki Kita.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3811 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-24 02:35:24 +00:00
Eric Davis b53de502ab Display the link name when external links are used in the toc macro. #5445 
Contributed by Yuki Kita and Jean-Baptiste Barth

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3786 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-06-19 21:39:21 +00:00
Jean-Philippe Lang 8cdcf308be Escape href attribute in auto links (#5179). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3612 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-24 20:26:22 +00:00
Jean-Philippe Lang ad487bf7cc Replace the hardcoded "CodeRay" css class name for highlighted elements. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3585 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-14 13:22:50 +00:00
Jean-Philippe Lang c03b4c2e1e Extract CodeRay calls to Redmine::SyntaxHighlighting (#2985). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3584 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-14 12:57:08 +00:00
Jean-Philippe Lang 7621463acb Do not html escape code that is going to be highlighted (#2985, #3359). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3582 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-03-14 09:05:58 +00:00
Jean-Philippe Lang 2ad8242ae7 Adds a setting to cache textile rendering (off by default). 
* it uses ActionController cache store which is MemoryStore by default and can be configured with config.action_controller.cache_store
* macro processing was moved out of textile rendering so that it doesn't get cached
* no noticeable improvement is expected for small portions of text, so only texts larger than 2KB are cached

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3372 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2010-02-06 10:40:21 +00:00
Jean-Philippe Lang b8b8cea288 Fixes jstoolbar lang files case (#4190). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3025 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-11 10:55:19 +00:00
Jean-Philippe Lang 4ea714fb91 Fixed: child_pages macro fails on wiki page history (#4152). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3006 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-11-04 12:36:45 +00:00
Eric Davis 07ffad4a7e Rename the wiki toolbar's JavaScript variable, 'toolbar' conflicts with 
the browser's variable.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2927 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-10-17 21:17:46 +00:00
Jean-Philippe Lang dcba9f18e6 Allow line breaks in wiki table cells (#2346). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2824 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-07-19 14:23:15 +00:00
Jean-Philippe Lang cf566a0c72 Fixed: TOC does not parse wiki page reference links with description (#2601). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2336 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-01-29 16:33:45 +00:00
Jean-Philippe Lang 260373aed7 Slight changes to ease Rails 2.2 support. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2234 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-01-04 17:09:25 +00:00
Jean-Philippe Lang 748fb30f58 Do not use compute_public_path. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2228 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2009-01-04 12:50:45 +00:00
Jean-Philippe Lang 35f5e36838 Disable textile inline styles to prevent XSS attacks (#2377). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2192 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-12-28 13:38:34 +00:00
Jean-Philippe Lang 06266c8fec Extends child_pages macro to display child pages based on page parameter (#1975). 
It can also be called from anywhere now (not only from wiki pages).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2053 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-11-22 11:44:07 +00:00
Jean-Philippe Lang cbacc71dff Turn ftps and sftp proto into links (#1514). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2018 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-11-11 14:24:06 +00:00
Jean-Philippe Lang a3b9a5aa5f Makes wiki text formatter pluggable. 
Original patch #2025 by Yuki Sonoda slightly edited.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1955 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-10-27 11:08:29 +00:00
Jean-Philippe Lang ec7d135930 Adds child_pages macro for wiki pages (#528). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1699 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-07-26 12:54:54 +00:00
Jean-Philippe Lang 0329094f01 Include macro can include a page of another project wiki using !{{include(projectname:Foo)}} (#1052). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1350 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-13 16:22:55 +00:00
Jean-Philippe Lang c6271d8361 Fixed: inline image not displayed when including a wiki page (closes #1001). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1327 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-04-05 17:39:19 +00:00
Jean-Philippe Lang 0582337372 Added: 
* the 'include' macro to include a wiki page
* macro escaping support (with exclamation mark)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1153 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2008-02-16 15:34:17 +00:00
Jean-Philippe Lang 8a8f819d27 Added wiki macros support. 2 builtin macros are defined: hello_world (sample macro that displays the arguments) and macro_list (display the list of installed macros). 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@897 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2007-11-12 14:36:33 +00:00