3a16f3f5b1
Merge remote-tracking branch 'upstream/master' into unstable
2011-12-17 15:20:58 -08:00
611889f3f7
[ #748 ] Use SCM commands to detect the revision
2011-12-15 22:08:18 +01: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
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
981143f78f
[ #604 ] Disable classic ChiliProject wiki macros
2011-11-20 02:49:18 +01:00
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
65af1e4436
#649 update to CodeRay 1.0 according to Etienne's r7618 in Redmine
2011-10-29 11:35:16 +02:00
8ee8ef02fe
Extract the NullFormatter into its own files
2011-10-16 20:02:55 +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
eae5c9af68
[ #275 ] Use ChiliProject::VERSION for new code
2011-08-21 15:16:34 +02:00
5300120461
Move Redmine::VERSION to ChiliProject::VERSION and add a compatibility interface
2011-08-21 14:48:53 +02:00
1796fddd2b
[ #275 ] Add requires_chiliproject. We now use the rubygems dependency syntax.
2011-08-21 14:47:31 +02:00
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
da9c4a16a9
Bump version to 2.1.1
2011-08-01 16:52:33 -07:00
2d67c2f2b3
Bump version to 2.1.0
2011-07-29 10:29:52 -07:00
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
6a2772d75c
Bump version to 2.0.0 (final)
2011-07-01 21:54:52 -07:00
3e924ce6be
Bump version to 2.0.0RC3
2011-06-17 15:25:11 -07:00
9ccb172c81
Bump version to 2.0.0RC2
2011-06-10 13:35:12 -07:00
a428fa6068
Bumping version to 2.0.0RC1
2011-05-30 14:22:31 -07:00
821d9f5ca4
[ #437 ] Move the encoding to the top of pdf.rb for Ruby 1.9
2011-05-30 14:20:20 -07:00
790bb362c5
Fix the merge conflict from 6b8897db5f
2011-05-30 14:05:40 -07:00
6b8897db5f
Merge branch 'unstable' into release-v2.0.0
2011-05-30 21:25:11 +02:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
37f6b75749
Added VERSION.special to handle special version releases (RC, distributions, etc)
2011-05-29 17:59:51 -07: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
a85b6780d2
[ #262 ] Convert line endings to UNIX
2011-05-29 12:00:18 -07:00
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
0e31482de9
Bump version to 1.4.0
2011-05-27 11:37:03 -07:00
a74517b983
Merge remote-tracking branch 'hufocf/feature/357-wrap-text-in-pdf'
2011-05-20 11:43:24 -07:00
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
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
bdc7325a82
Merge branch 'master' into unstable
...
Conflicts:
doc/CHANGELOG.rdoc
2011-05-01 13:58:02 -07:00
07772e7eb7
Bump version to 1.3.0
2011-05-01 13:09:15 -07:00
4662b81710
[ #357 ] Wrap long text fields properly in PDF exports
2011-04-29 16:20:51 +01:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
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
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
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
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
69bad84604
PDF: prepare switching TCPDF UTF-8 in non CJK or FPDF ANSI in CJK ( #61 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5258 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:51 -07:00
9b3b0770ac
PDF: add missing rfpdf requires ( #61 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5248 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:50 -07:00
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
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
Eric Davis
Holger Just
Felix Schäfer
Spencer Markowski
Kornelius Kalnbach
Felix Schäfer
Gregor Schmidt
Hugo Ferreira
Toshi MARUYAMA
Jean-Philippe Lang