b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
4dffc45ee9
[ #129 ] Fix case on some ChiliProject strings
2011-02-21 15:36:55 -08:00
99a12ecbcf
[ #129 ] Replace public strings using Redmine with ChiliProject
2011-02-19 20:38:50 -08:00
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
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
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
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
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
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
2ae2d3ef83
Fixed: repository: mercurial: sort changesets by revision ( #3449 , #3567 ).
...
In DVCS, changesets are not in date order.
Because Mercurial backend inserts changesets from eariest, 'ORDER BY id'
means 'order by revision number'.
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4611 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-02 06:05:54 +00:00
488285e123
Strip non utf8 content when displaying diff (ruby1.9 compatibility).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4604 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-01 13:40:36 +00:00
21c0b868ae
Fixed: Tracker reset to default when replying to an issue email ( #7197 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4575 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-29 17:36:01 +00:00
ac60fc9c1c
Refactor and add tests for News #index API ( #7072 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4505 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 17:00:52 +00:00
67f1131a20
Fixes duplicate custom_values fixture that caused failure with Postgresql.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4488 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-11 10:47:00 +00:00
252e4983fb
Fixes a fixture with valid attributes (start_date < due_date).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4482 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 11:06:21 +00:00
3e3315c103
Support for updating custom fields using the received custom_fields array ( #6345 , #6403 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4481 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 10:48:16 +00:00
d7c607fd8b
Automatic spent time logging from commit messages ( #4155 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4470 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-05 11:45:09 +00:00
4faca3cd4a
Fixed: messages attachments/watchers are not deleted when deleting a project or forum ( #6966 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4431 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 12:42:11 +00:00
d7cdd58db6
MailHandler: ignore assignee if invalid.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4404 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-14 13:48:01 +00:00
abf988ad69
Makes MailHandler ignore invalid keyword values to avoid validation failures.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4396 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-12 13:08:32 +00:00
d4ab2ab4b9
Makes MailHandler accept localized keywords for default or user language ( #6112 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4395 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-12 12:29:35 +00:00
e0e8c14c2a
Makes MailHandler accept all issue attributes and custom fields that can be set/updated ( #4071 , #4807 , #5622 , #6110 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4394 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-12 11:34:53 +00:00
475530e59f
Adds a "visible" option on User and Project custom fields ( #1738 ).
...
If set to false, the custom field won't be display on user profile/project overview.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4382 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-07 14:15:01 +00:00
a2c7e73df4
adjust tests to fixtures
2010-11-03 18:42:42 +01:00
ea8b8c6548
update fixtures
2010-11-03 18:30:46 +01:00
859bfa625d
Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized
...
Conflicts:
app/models/wiki_content.rb
app/views/wiki/history.rhtml
config/locales/bg.yml
config/locales/ca.yml
config/locales/de.yml
test/integration/api_test/projects_test.rb
2010-11-03 16:03:39 +01:00
0395eb99de
Remove email quotes (>) when searching for incoming email delimiters. #2852 #6628
...
Changes the email truncation so a delimiter can be prefixed by email
quotes or spaces ("> Eric said..."). This will let it be combined with
a "--- Reply above ---" delimiter to match "> --- Reply above ---"
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4361 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-02 19:00:31 +00:00
f8b79c52cb
Force color to be disabled on git shell-outs. #5324
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4310 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-29 23:21:57 +00:00
8cece46dd4
Merge branch 'master' into master-journalized
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/context_menus_controller.rb
app/controllers/gantts_controller.rb
app/controllers/issue_moves_controller.rb
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/controllers/previews_controller.rb
app/controllers/timelog_controller.rb
app/helpers/issues_helper.rb
app/helpers/journals_helper.rb
app/models/issue.rb
app/models/journal.rb
app/models/journal_observer.rb
app/views/admin/projects.rhtml
app/views/context_menus/issues.html.erb
app/views/issues/_action_menu.rhtml
app/views/issues/_history.rhtml
app/views/news/_news.rhtml
app/views/news/index.rhtml
app/views/repositories/diff.rhtml
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/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/ko.yml
config/locales/lt.yml
config/locales/lv.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
config/routes.rb
doc/CHANGELOG
lib/redmine.rb
lib/redmine/export/pdf.rb
lib/redmine/helpers/gantt.rb
lib/redmine/version.rb
public/stylesheets/application.css
test/functional/context_menus_controller_test.rb
test/functional/issues_controller_test.rb
test/functional/journals_controller_test.rb
test/functional/previews_controller_test.rb
test/functional/users_controller_test.rb
test/functional/wiki_controller_test.rb
test/integration/routing_test.rb
test/unit/issue_test.rb
test/unit/mailer_test.rb
test/unit/query_test.rb
2010-10-26 18:20:57 +02:00
0316af7f6b
Converted User#mail_notification from a boolean to a string.
...
The string will now store which type of notification option to use.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4216 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-28 18:22:00 +00:00
ffb3d9260a
Support leading and trailing spaces in filenames or directories in the git adapter. #6499
...
Contributed by Felix Schäfer
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4189 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-26 21:54:52 +00:00
Felix Schäfer
Toshi MARUYAMA
Jean-Philippe Lang
Eric Davis
Tim Felgentreff
Jean-Baptiste Barth