4b098d7774
Merge branch 'journals' into 1.0-stable
...
Conflicts:
app/controllers/issues_controller.rb
app/controllers/journals_controller.rb
app/helpers/journals_helper.rb
app/views/issues/_history.rhtml
lib/redmine/activity/fetcher.rb
test/functional/issues_controller_test.rb
test/test_helper.rb
2010-09-14 09:32:35 +02:00
0d7cead479
Merged r4013 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4025 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:49:26 +00:00
b8d5a05b20
Merged r4008 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4020 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:57 +00:00
e29244652c
Merged r4007 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4019 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:52 +00:00
27ef72c35e
Merged r4006 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4018 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:45 +00:00
86e986f014
Merged r4005 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4017 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:38 +00:00
d60cc50d99
Merged r4004 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4016 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:32 +00:00
9e5d2100b6
Merged r4003 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4015 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-22 19:48:26 +00:00
80e833cd88
Merged r3946 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3996 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:14 +00:00
a12a073a6e
Merged r3945 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3995 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:34:08 +00:00
2012c60bfd
Merged r3941 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3991 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:46 +00:00
fab5064643
Merged r3936 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3986 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:33:18 +00:00
2f529fd834
Merged r3918 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3968 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:31:30 +00:00
acaa223cf8
Merged r3907 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3957 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:23 +00:00
59f98693ae
Merged r3897 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3900 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-30 19:20:46 +00:00
0843b188fb
Merged r3893 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3895 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-29 15:03:06 +00:00
41c6d3cef6
Merged r3875 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3876 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-25 09:56:07 +00:00
a2a3dae974
Merged r3847 from trunk.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3850 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-07-18 15:53:46 +00:00
2d282f8deb
move (almost) everything over to acts_as_journalized
2010-07-15 18:24:12 +02:00
d7768ce600
remove journals to start moving it all out to vestal_versions based plugin
2010-07-14 14:13:55 +02:00
305cab100f
Rename code and locale typo: Developper. #5751
...
Contributed by Holger Just
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3820 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-30 01:55:44 +00:00
68bdbbac7d
Refresh locales
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3810 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-21 19:58:17 +00:00
e21b91485e
New language en-GB ( #5648 thank to Tom Knight for work)
...
Updates:
* ja (#5715 )
* sv (#5671 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3809 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-21 19:54:55 +00:00
c98f46d691
Handle unsuccessful destroys in TimelogController. #5700
...
Contributed by Jan
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3805 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 19:30:51 +00:00
116c7a7964
Add a link to the cross project time entries page to /projects. #4935
...
Contributed by Jan.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3802 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-20 16:29:12 +00:00
5f93750c80
Pin shoulda, 2.11.x changes it's API and deprecates a lot of macros.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3782 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-19 19:01:53 +00:00
3096166f09
fr update ( #5617 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3767 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-06-05 07:20:30 +00:00
af726ea8f0
Locales update
...
* ja (#5607 )
* ru (#5606 )
* pt-BR (#5611 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3762 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-28 15:32:01 +00:00
b88b15183b
Translation updates, Locales sync (rake locales:update)
...
* ru
* zh-TW (#5602 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3758 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-27 15:34:22 +00:00
6e529f82a7
Make the Gantt zoom images more accessible
...
* Correct the alt text
* Add text links next to the images
* Size the images in em to support browser scaling
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3757 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-26 22:48:35 +00:00
2b203fe5ab
Translation update: Japanese ( #5600 get haha, congratulations!)
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3754 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-26 20:59:51 +00:00
ef1c63efbf
Translation updates
...
* de (#5558 )
* sv (#5570 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3753 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-26 17:43:50 +00:00
8c02e4c723
zh-TW update ( #5597 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-26 17:36:25 +00:00
513c18d2d3
Translation sync
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3751 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-26 17:33:01 +00:00
0d34c3731b
Add error messages to MembersController#new so a user is informed of missing data.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-24 20:21:16 +00:00
52a92b1822
Added a missing label to my/page_layout.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3747 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-24 18:23:42 +00:00
3601c291d0
Typo in french locale.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3741 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-22 08:54:43 +00:00
1933f9ddb2
Typo in french locale.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3740 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-22 08:54:17 +00:00
e474a6095b
Updates ( #5409 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3739 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-15 13:12:52 +00:00
8c93cc4381
sr and sr-CY languages ( #5409 )
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3738 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-15 13:11:26 +00:00
cd097a5758
New translation (Latvian, #5446 , thanks to Dzintars Bergs), translation updates
...
* ja (#5368 )
* he (#5370 )
* hu (#5364 )
* no (#5471 )
* ru (#5476 )
* sk (#5432 )
* sr (#5409 )
* sv (#5467 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3737 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-14 18:15:41 +00:00
36c82ecc1f
Refactor: move Project Calendar to it's own controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3732 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-05-03 16:02:37 +00:00
e65c3cfc7d
Refactor: Move gantts to a separate controller.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3695 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-28 15:54:46 +00:00
2c898d8a81
Refactor: Split IssuesController#new to #new and #create to match REST pattern.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3688 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-22 15:43:57 +00:00
7e9d4811ec
Translation updates
...
* eu (#5291 )
* ru (#5296 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3676 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-17 10:37:23 +00:00
77795d41ba
Translation updates:
...
* ko (#5245 )
* fr (#5247 )
* pt-BR (#5244 )
* zh
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3629 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-06 16:57:51 +00:00
db453db497
Translation updates
...
* ja (#5240 )
* zn-TW (#5241 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3628 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-03 18:02:51 +00:00
eb80b79c26
New strings to localization ( #5225 )
...
* error_can_not_delete_custom_field: Unable to delete custom field
* error_unable_to_connect: Unable to connect ({{value}})
* error_can_not_remove_role: This role is in use and can not be deleted.
* error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3627 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-03 11:54:24 +00:00
f2993f6ed0
Translation updates and new Mongolian language ( #5237 )
...
* da (#5197 )
* pt-BR (#5205 and #5210 )
* zh (#5227 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3626 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-03 10:49:16 +00:00
d29adc9bb7
Translation updates and fixes
...
* ja.yml (#5097 )
* pt-BR.yml (#5120 )
* sl.yml (#5063 )
* sv.yml (#5144 )
* zh-TW (#5075 )
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3610 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-24 16:55:01 +00:00
Tim Felgentreff
Eric Davis
Jean-Philippe Lang
Azamat Hackimov