1e908da66c
Merge branch 'master' into backbone.ws
2012-06-15 00:12:40 +04:00
1722e96bb0
Change default branch behaviour for git repos #749
...
If git repository HEAD points to a branch, use that as the default branch.
Otherwise fall back to previous method.
2012-06-05 15:33:04 +02:00
6a26543887
scm: mercurial: fix unit adapter annotate test fails on Windows Mercurial 1.8.4+29-e597ef52a7c2.
...
git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@6042 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-05-14 10:54:17 +02:00
e5de5f43cc
v3.1.0 merged
2012-04-05 13:22:02 +04:00
786e92349b
Automatic character encoding detection in Mercurial repos.
2012-03-24 23:39:33 +04:00
cbcce70400
Fix requiring SCM classes in dev mode #828
...
Change require to require_dependency so SCM classes get loaded on each request in dev mode
2012-02-24 15:44:02 +01:00
e91a1e010f
[ #778 ] Properly cache Liquid markup
...
This commit moves the markup caching into Liquid rendering. As
Liquid allows to return different results depending on the environment
(variables, logged user, ...) we only cache the page if it contains
no active content.
Unfortunetely, active content currently also includes the TOC
in wiki pages.
2012-01-16 17:08:52 +01:00
d9a0ac37eb
Move Redmine::Info to ChiliProject::Info
2012-01-16 13:28:43 +01:00
dbbc0b4919
[ #558 ] Reduce version info in help link
2012-01-16 13:08:25 +01:00
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
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
0f0e42448a
Overwrite compact on child class of Array to not return an instance of Array
...
This is necessary because in Ruby 1.9.3, the behavior of an internal dup of
the array (rb_ary_dup) was changed to always return an array instance, not
an instance of the actual class which it was working on.
Why can't people just stick to what works but instead try to have special
snowflakes everywhere? </rant>
2012-01-03 19:45:38 +01:00
21685caf5f
[ #791 ] Add support for pop3s (SSL) to redmine 📧 receive_pop3
2011-12-26 12:45:30 -08:00
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
Kolan Sh
Justin Geibel
tmaruyama
Michaël Rigart
Holger Just
Holger Just
Eric Davis
Felix Schäfer
Spencer Markowski
Kornelius Kalnbach
Felix Schäfer