Holger Just
185edcd283
Fix trailing whitespace
2012-01-18 19:26:03 +01:00
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
Eric Davis
00df832126
Merge branch 'ticket/unstable/792-confirmation-emails' into unstable
2011-12-29 10:28:47 -08:00
Eric Davis
97fe88f8d9
[ #805 ] Add the Watchers sidebar to Wiki Pages
2011-12-28 10:22:06 -08:00
Eric Davis
3af5544dbc
[LSS#4190] Add watching to documents
2011-12-27 13:16:52 -08:00
Eric Davis
dc541597ec
[ #792 ] Send email from mail_handler for emails which are missing required information
2011-12-26 17:39:29 -08:00
Holger Just
d24e8186b4
Merge remote-tracking branch 'chiliproject/master' into unstable
2011-12-18 21:33:05 +01:00
Felix Schäfer
d71a74bcbe
Explicit name for the example slapd config ldif.
2011-12-18 20:45:01 +01:00
elm
48737b0c6f
Add OpenLDAP config ldif for redmine database
2011-12-13 20:56:43 +01:00
elm
bf7bcec1da
Remove internal LDAP entries to make the ldif importable.
2011-12-13 20:56:43 +01: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
Holger Just
a31a4a8852
[ #604 ] Adapt fixtures for new liquid syntax
2011-11-20 02:49:22 +01:00
Holger Just
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +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
3d164f1da0
[ #480 ] Fix replying to IssueJournals through email
2011-06-17 12:10:23 -07:00
Eric Davis
7eb98dbd34
[ #443 ] Fix failing tests on 1.9.2 due to an invalid fixture
2011-06-03 09:55:44 -07: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
a85b6780d2
[ #262 ] Convert line endings to UNIX
2011-05-29 12:00:18 -07:00
Eric Davis
762cc04b70
Port 784bbccf's custom value test back into aaj
2011-05-27 10:16:47 -07:00
Gregor Schmidt
08cad02541
Removing commments from wiki_contents fixtures, since the db column was removed as well
2011-05-20 21:33:50 +02:00
Felix Schäfer
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
Toshi MARUYAMA
87c1d4780b
scm: filesystem: increase non ascii contents ratio of test repository ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5211 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:45 -07:00
Toshi MARUYAMA
80b7a1e432
scm: filesystem: update test repository for non ascii text files displaying ( #6256 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5203 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:44 -07:00
Jean-Philippe Lang
c18520d02f
Highlight changes inside diff lines ( #7139 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5094 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:38:55 -07:00
Toshi MARUYAMA
18d701b2a5
scm: git: change core.quotepath to false in test repository config ( #5251 ).
...
The -c option was introduced in git version (1.7.2)
http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5068 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:36:08 -07:00
Toshi MARUYAMA
2ebb117044
scm: git: add latin-1 encoding directory to test repository ( #5251 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5060 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA
f2fa1d4920
scm: mercurial: add latin-1 encoding directory to test repository ( #2664 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5059 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:17 -07:00
Toshi MARUYAMA
1389d3adba
scm: git: add two tags to test repository.
...
One is lightweight, another is annotated.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5037 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:15 -07:00
Toshi MARUYAMA
38bfb7dae9
scm: git: update test repository for path encoding ( #5251 ).
...
Mercurial and Git treats file names as byte string.
This git test repository contains Latin-1 encoding path.
Be careful on non Latin-1(CP1252) Windows.
Please see r4996 comment.
I removed a revision including "copied file" from r5026 test repository.
Mercurial supports "copy", but Git does not support.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5033 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:35:15 -07:00
Toshi MARUYAMA
32fa37f49a
scm: git: backout r5026 ( #5251 ).
...
In case git repository contains latin-1 path,
although Redmine uses "git log -C core.quotepath=false --encoding=UTF-8",
log encoding is latin-1.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5027 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
Toshi MARUYAMA
a24be0ee87
scm: git: update test repository for path encoding ( #5251 ).
...
Mercurial and Git treats file names as byte string.
This git test repository contains Latin-1 encoding path.
Be careful on non Latin-1(CP1252) Windows.
Please see r4996 comment.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5026 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
Toshi MARUYAMA
b6449c6a84
scm: git: add core.quotepath = true in test repository config ( #5251 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5023 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
Jean-Philippe Lang
784bbccfc6
Fixed: error on JournalsController#index when custom fields are present ( #7795 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:34:43 -07:00
Toshi MARUYAMA
3fadaf3c85
scm: mercurial: update test repository for path contains space ( #2664 , #4455 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4997 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:25:34 -07:00
Toshi MARUYAMA
fe4159fc99
scm: mercurial: update test repository for path encoding ( #2664 ).
...
Mercurial (and also Git) treats file names as byte string.
This mercurial test repository contains Latin-1 encoding path.
Be careful on non Latin-1(CP1252) Windows.
If your Windows is not Latin-1 Windows,
in order to checkout(update) Latin-1 path,
You need to use cygwin 1.7 and set LANG=en_US.ISO-8859-1.
Please refer.
http://mercurial.selenic.com/wiki/EncodingStrategy?action=recall&rev=6
Redmine mercurial adapter do not need to checkout(update) repository.
Mercurial does not have "bare" repository such as Git.
You can use "hg update null" for equivalent "bare" repository.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4996 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:25:34 -07:00
Toshi MARUYAMA
515e89dd40
scm: git: use --encoding=UTF-8 in "git log" ( #3396 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4964 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:24 -07:00
Jean-Philippe Lang
c9497f39b8
Keep track of issue description changes ( #746 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:16:03 -07:00
Jean-Philippe Lang
9964c43b3b
Adds random salt to user passwords ( #7410 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4936 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:03:52 -07:00
Jean-Philippe Lang
cc2d6f3605
Allow additional workflow transitions for issue author and assignee ( #2732 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:43:45 -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
Eric Davis
4dffc45ee9
[ #129 ] Fix case on some ChiliProject strings
2011-02-21 15:36:55 -08:00
Eric Davis
99a12ecbcf
[ #129 ] Replace public strings using Redmine with ChiliProject
2011-02-19 20:38:50 -08:00
Jean-Philippe Lang
9a13b39e26
Adds an application configuration file: config/configuration.yml ( #7408 ).
...
Email delivery settings that were stored in config/email.yml should be moved to this new configuration file.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang
a9c4ec31ca
Fixes fixture added in r4680.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4681 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-10 19:45:20 +00:00
Jean-Philippe Lang
f1a5dca2ba
Fixed: wiki pages with cyrillic characters not found with postgresql ( #7245 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4680 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-10 18:32:04 +00:00
Jean-Philippe Lang
2cbf60851f
Store the mercurial test repository as a bundle to make it compatible with older hg versions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4676 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-10 17:43:01 +00:00
Jean-Philippe Lang
9fb770ba50
Moves enabled_module_names param to project attribute so that it can be set through the Project API.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4645 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-06 20:36:31 +00:00
Toshi MARUYAMA
9ee02d04f3
scm: mercurial: update test repository for following issues and fix tests.
...
* copied file (#7064 )
* branch, tag (#1981 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4634 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-05 15:02:47 +00:00