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
a81049d52b
scm: for log in Ruby 1.9, replace invalid UTF-8 to '?' instead of removing.
...
Refer r3466 #4773 .
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4926 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:58:58 -07:00
0e34299240
scm: Ruby 1.9 compatibility for log.
...
Remove assuming UTF-8 is valid.
"\xC2\x80" of latin-1(iso-8859-1) is valid sequence of UTF-8.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4925 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:58:58 -07:00
bbb57ea4d2
Warning on leaving a page with unsaved content in textarea ( #2910 ).
...
The warning can be turned off in the user's preference.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4900 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:46:57 -07:00
5ad7dfee4a
scm: add CP932 at Setting::ENCODINGS ( #2664 , #2274 ).
...
CP932 is variant Japanese Shift_JIS on Windows.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4899 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:43:45 -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
66662ac84b
scm: catch exception of getting command and version in model ( #4273 ).
...
If command does not exist, Windows raises exception in shellout().
Linux does not raise exception.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4882 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:26 -07:00
b2e4dbca6f
scm: mercurial: temporary disable tags and branches at model ( #1981 , #7246 , #4455 ).
...
Until latest_changesets supports tags and branches.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4871 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:26 -07:00
7c6a205a01
scm: mercurial: improvement latest_changesets without supporting tags and named branches ( #4455 ).
...
Based on latest-changesets-improvements-2.diff of #6159 .
http://www.redmine.org/attachments/4332/latest-changesets-improvements-2.diff
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4868 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:25 -07:00
3ba56db935
scm: mercurial: rewrite MercurialAdapter#entries to show per-file change log and size ( #3421 , #4455 ).
...
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4856 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:25 -07:00
cb467e3a8b
scm: git: implement find_changeset_by_name ( #7047 ).
...
SQL "like" is slow.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4851 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:25 -07:00
de7f88c572
scm: mercurial: refactor Repository::Mercurial#fetch_changesets ( #4455 ).
...
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4849 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:25 -07:00
33f1436eb2
scm: mercurial: change identifier to revision in fetching revisions.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4847 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:35:24 -07:00
9b68c6701f
scm: catch CommandFailed during bulk Repository.fetch_changesets ( #4455 ).
...
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4824 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:28:22 -07:00
8d5617fc8b
scm: add scm command and version methods at repository models ( #4273 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4822 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 14:28:22 -07:00
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
2ffea883a6
[ #279 ] Add an optional Start Date to Versions
2011-03-13 19:14:08 -07:00
21b8e8b5e5
[ #250 ] Allow empty sets in query value lists
2011-03-02 11:11:53 +01:00
9ed2d8ed77
Allow underscores in project identifiers. #146
2011-02-22 21:50:50 +01:00
99a12ecbcf
[ #129 ] Replace public strings using Redmine with ChiliProject
2011-02-19 20:38:50 -08:00
151a142c44
Add some rdocs to MailHandler#dispatch_to_default
2011-02-14 15:50:22 -08:00
a47ad014f9
[ #170 ] Refactor MailHandler to support a default dispatch method
...
Contributed by Yuki Sonoda
2011-02-14 15:48:41 -08:00
a47a7a2b99
Merge branch '171-user_test_fails_with_mysql2'
2011-02-14 15:39:52 -08:00
49b789e105
making comparison case-insensitive
2011-02-10 18:54:53 +01:00
63c92189a8
relaxing the test for mysql to make it work for mysql2 adapter
2011-02-10 18:47:26 +01:00
f35a9112eb
Add Type headers to outgoing emails. #104
2011-02-10 02:04:50 -08:00
6c207d6ecf
scm: cvs: generate pseudo scmid for auto issue close text ( #6706 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:39 -08:00
9cd5e6967e
scm: cvs: change temporary revision number from "_N" to "tmpN" ( #996 , #3761 , #6706 ).
...
'_' is SQL "like" special character.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4801 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:51:39 -08:00
6d649a6f84
scm: cvs: code clean up.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4790 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:50:24 -08:00
710edf6c79
Fixed: no email sent with 'Notifiy for any event on the selected projects only' ( #7421 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4761 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:16 -08:00
bedf99d9df
Adds visible scope to redmine links queries.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4759 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:48:15 -08:00
b88143ca3f
Makes the folder for attachments storage configurable in config/configuration.yml ( #1236 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4755 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -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
4525b7f6e2
Fixed: subtasks are deleted (not destroyed) when destroying parent issue ( #7385 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4735 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:41:32 -08:00
8933482c37
Do not show "for only project I select" notification option on application settings form ( #7294 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4730 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:28:46 -08:00
16fdf5fe66
Fixed: "Notifiy for only project I select" is randomly displayed ( #7294 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4727 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:27:15 -08:00
befd725b8b
Prevent SystemStackError on Issue#all_dependent_issues with circular dependency ( #7320 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4723 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-15 14:12:18 +00:00
acb0d96617
scm: use #blank? instead of #nil? || #empty? at Repository#find_changeset_by_name(name) ( #7307 ).
...
Referring r4711.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4712 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-14 22:51:12 +00:00
88d847a1d5
Fixes TimeEntry#spent_on= so that datetimes don't get stored in SQLite3 ( #7258 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4708 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-14 18:04:16 +00:00
89627d0334
scm: mercurial: fix error on revision page for empty revision ( #7307 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4704 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-13 12:04:51 +00:00
98b3a50657
scm: fix error on revision page for empty revision ( #7307 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4703 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-13 12:04:30 +00:00
eda1cd2faa
scm: mercurial: change two revision diff text of mercurial ( #3724 ).
...
For example, "4:def6d2f1254a 2:400bb8672109".
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4699 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-11 16:04:28 +00:00
ebb19c5863
scm: changing two revision diff text at SCM adapter level ( #3724 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4698 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-11 16:04:07 +00:00
fdd0a2ca9b
scm: mercurial: use revision text mercurial style "2:400bb8672109" ( #3724 ).
...
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4697 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-11 16:03:45 +00:00
d67185ec7e
scm: mercurial: use scmid as identifier ( #3724 ).
...
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4695 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-11 16:03:01 +00:00
7b7577c747
Fixed MailHandler broken by I18n fallback added in r4679.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4682 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-10 19:57:41 +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
e2df831b53
scm: mercurial: accept both of revision and nodeid as changeset id ( #3724 ).
...
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4654 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-08 06:24:27 +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
ce8113dea2
Additional roles of a user who belongs to a group are not always copied when copying the project ( #7213 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4615 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-02 11:38:35 +00:00
2e1bcb2abf
Changing revision label and identifier at SCM adapter level ( #3724 , #6092 )
...
Contributed by Yuya Nishihara.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4613 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-02 09:45:05 +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
ad727d3781
Fixes utf8 conversions with ruby1.9.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4605 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-01-01 19:12:35 +00:00
44ffc5a336
Remove the limitation on characters that can be used in custom_field, issue_status, role, tracker, user names ( #5152 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4599 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-31 15:30:50 +00:00
03d4ecbbff
Fixed: CLI-supplied defaults should not be applied when replying to an issue ( #7195 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4576 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-29 17:38:57 +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
df9ea24136
Makes Version#start_date return the minimum start_date of its issues.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4574 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-23 14:58:52 +00:00
703b0ec422
Fixed: 500 error on issue query grouped by a custom field that was deleted ( #7144 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4553 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-21 21:46:54 +00:00
8a8ca40364
Prevents n SQL queries (n = project count) on cross-project issues list.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4550 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-20 20:03:22 +00:00
df88dc117f
Fixed: r4492 breaks the ability to select issue custom fields available for projects issues ( #7121 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4529 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-17 16:10:46 +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
0a2ec6ef04
Extracts user groups assignment from controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4499 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 15:13:34 +00:00
e4f319fe61
Validates user's mail_notification and turn options into strings (the attribute type).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4494 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 14:02:39 +00:00
a4d7a99c22
Declare safe attributes for User and Projects models.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4492 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 13:19:07 +00:00
3409333522
Makes issue safe_attributes extensible ( #6000 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4491 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 13:11:53 +00:00
8407db9854
Fixes Changeset#text_tag for numeric scmid ( #6681 ).
...
Contributed by Toshi MARUYAMA.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4490 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-11 14:20:04 +00:00
cd71c1cc0a
Do not try to copy relations for issues that could not be copied.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4484 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-10 17:37:24 +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
b898200803
Select projects with issue_tracking module for gantt display and remove the nil start/due dates trick.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4477 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-07 19:42:36 +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
7fb0fe2e91
Safer code in IssueRelation ( #7018 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4467 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-04 18:10:02 +00:00
9284a32c9a
Moves project attributes default assignments from ProjectsController#new to the model ( #6064 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4460 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-03 16:15:16 +00:00
d24e66370b
Prevents validation error when adding a user to a group ( #6457 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4437 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 14:46:51 +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
97140f6a78
Fixed: Wiki#find_page should not be case sensitive because page title uniqueness is not ( #6987 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4430 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-27 11:14:28 +00:00
77c6188ec2
Fixed: gantt displays issues by date of creation.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4421 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-21 13:54:26 +00:00
06b0176a3e
Fixed: submitting a non numerical parent task input creates a 500 error ( #6932 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4414 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-20 10:20:53 +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
8ef06826c3
Raised maximum length of project names and identifiers to 255 and 100 respectively ( #6446 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4402 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-14 12:33:14 +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
0eb7d8f614
Moved some permission checks for issue update from controller to model.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4393 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-11 16:37:16 +00:00
fa3d71bed9
Allow non-unique names for projects ( #630 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4391 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-11 13:39:14 +00:00
63866407f1
Fixed: unchecking status filter on the issue list has no effect ( #6844 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4387 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-07 15:38:51 +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
338e407a91
Fixed: URLs broken in wiki notifications ( #6838 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-06 13:23:23 +00:00
905ac8c1e6
update to incorporate latest acts_as_journalized fixes
2010-11-05 19:48:50 +01:00
5dda7e34a3
test fixes
2010-11-05 11:20:58 +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
e9efa5b981
Refactor: use :id instead of :page when linking to Wiki Pages
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-27 16:27:06 +00:00
9bb45d9e75
Fix journal_observer
2010-10-27 11:53:20 +02:00
1a2aa363bd
fix journal observer tests, remove journal observer
2010-10-27 11:42:15 +02:00
8c5312e0ec
more merge fixups
2010-10-26 18:58:54 +02:00
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
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
17eab0f5f9
Fix wiki links on the activity page. #6746
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-26 15:44:30 +00:00
eea456ed84
Improved error message when trying to access an archived project ( #2995 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4285 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-23 09:48:01 +00:00
0ca74df604
Refactor: move method to model with compatibility wrapper
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4282 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-22 22:38:45 +00:00
Jean-Philippe Lang
Toshi MARUYAMA
Felix Schäfer
Eric Davis
Holger Just
Gregor Schmidt
Felix Schäfer
Tim Felgentreff