meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-23 08:51:13 +00:00
Code Issues Releases Wiki Activity
6,817 Commits 32 Branches 194 Tags
Commit Graph

3637 Commits

Author SHA1 Message Date
Jean-Philippe Lang
add23a54b5 Backported r9132 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9149 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 18:28:04 +00:00
Jean-Philippe Lang
8f66932a46 Merged r9131 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9148 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 18:24:51 +00:00
Jean-Philippe Lang
bddc546bf0 Backported r9130 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9147 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 18:24:00 +00:00
Jean-Philippe Lang
5141f1e474 Merged r9129 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9146 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-07 18:22:06 +00:00
Jean-Philippe Lang
8c6f674973 Backported r8883 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9119 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 13:09:46 +00:00
Jean-Philippe Lang
41dba6864a Merged r8917 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9117 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 13:07:24 +00:00
Jean-Philippe Lang
4cf38052c2 Merged r8880 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9116 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 13:05:31 +00:00
Jean-Philippe Lang
f587807f6b Merged r8865 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9115 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 13:04:36 +00:00
Jean-Philippe Lang
f74e4eddba Backported r8835 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9114 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 12:51:24 +00:00
Jean-Philippe Lang
39af3f1b79 Merged r8804 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9113 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 12:46:41 +00:00
Jean-Philippe Lang
92dde0d75f Merged r8863 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9112 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 12:45:51 +00:00
Jean-Philippe Lang
488926276d Merged r8841 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9111 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 12:44:39 +00:00
Jean-Philippe Lang
4930b3e8bf Merged r8871 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9109 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-05 12:42:29 +00:00
Jean-Philippe Lang
26db0de8cc Merged r8909 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8910 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-19 15:41:24 +00:00
Jean-Philippe Lang
e0b4f151a2 Merged r8682 and r8800 from trunk for 1.3.1 release. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8801 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-06 11:16:39 +00:00
Jean-Philippe Lang
eb2638a25f Backported r8686 from trunk (#10013). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8770 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:17:30 +00:00
Jean-Philippe Lang
6d66abe3ac Merged r8568 from trunk (#9937). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8769 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:15:22 +00:00
Jean-Philippe Lang
6c6519e595 Merged r8231, r8235, r8236, 8237 from trunk (#9795). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8768 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:14:23 +00:00
Jean-Philippe Lang
1dcdba7cdc Merged r8210 from trunk (#9792). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8766 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:08:00 +00:00
Jean-Philippe Lang
3a474ead99 Merged r8209 from trunk (#9775). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8765 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 11:06:34 +00:00
Toshi MARUYAMA
9318cd2fbe Merged r8761 from trunk 
attachment: fix that diff type is not saved in user preference.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8763 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-02-04 08:26:28 +00:00
Jean-Philippe Lang
65a7c7e96c Merged r8113 from trunk (#9738). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8159 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-10 12:07:13 +00:00
Jean-Philippe Lang
b7d813047b Merged r8096 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8097 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-05 19:55:23 +00:00
Jean-Philippe Lang
faad143c03 Merged r8030 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8032 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-02 22:31:14 +00:00
Toshi MARUYAMA
08b6d7b654 Merged r8022 from trunk 
scm: git: mercurial: not show revision graph in sub directory.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@8023 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-12-01 23:46:26 +00:00
Jean-Philippe Lang
5c2a146b24 Misplaced closing tbody tag. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7988 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 20:17:34 +00:00
Jean-Philippe Lang
d92c204ed3 Fixed: version files in Files module cannot be downloaded if issue tracking is disabled (#9055). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7984 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 19:36:49 +00:00
Jean-Philippe Lang
cce80c690c Adds an autoscroll div around time entry list and report (#8809). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7982 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 18:32:28 +00:00
Jean-Philippe Lang
740dc53aab Removed useless rescue. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7981 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 18:20:39 +00:00
Jean-Philippe Lang
361c059a6f Removed unused method. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7980 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 18:15:27 +00:00
Jean-Philippe Lang
b7d0ee3f47 Code cleanup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7979 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 18:14:12 +00:00
Jean-Philippe Lang
f45fc1a1ba Removed a useless rescue. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7978 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 18:11:59 +00:00
Jean-Philippe Lang
b8836d89b1 Removed deprecated methods. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7977 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-29 18:11:11 +00:00
Jean-Philippe Lang
622b3ae61c Removed delete button on enumeration edit form. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7974 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-28 20:32:12 +00:00
Jean-Philippe Lang
2dbbdafbc6 Removed EnumerationsController#list action. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7973 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-28 20:23:57 +00:00
Jean-Philippe Lang
b8a924e4e1 Adds #current_version? method to wiki content. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7972 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-28 20:12:03 +00:00
Jean-Philippe Lang
744e4357a0 Fixed: Wiki export link doesn't work for users without :view_wiki_edits permission (#9682). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7971 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-28 20:04:38 +00:00
Jean-Philippe Lang
63dc83fc0d Fixed: Section-edit buttons not available when a the version parameter is provided even if it's the current version (#9674). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7970 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-28 18:11:30 +00:00
Toshi MARUYAMA
1d00ec11a0 Rails3: helper: html_safe for robot_exclusion_tag 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7967 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-28 12:20:37 +00:00
Toshi MARUYAMA
f59d8bae97 Rails3: view: html_safe for login user link 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7966 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-28 12:18:53 +00:00
Jean-Philippe Lang
5a51ac7663 Update MessagesController#quote to match the input id changed in r7682 (#9672). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7961 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 21:30:50 +00:00
Jean-Philippe Lang
5ac8020801 Do not include extra_info attribute in SysController responses because it breaks reposman activeresource client (#8707). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7956 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 17:30:28 +00:00
Jean-Philippe Lang
6076db74f1 Improved user creation from incoming email. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7952 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 15:27:14 +00:00
Toshi MARUYAMA
a79e0fa5f6 fix csv decimal separator of time entry csv (#8368) 
Contributed by Francisco José Martínez.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7950 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 12:14:20 +00:00
Jean-Philippe Lang
885605b439 Resourcified attachments. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7948 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 11:16:47 +00:00
Toshi MARUYAMA
b95fd6315c fix time entry csv last line encoding (#8549) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 10:53:08 +00:00
Jean-Philippe Lang
f680e7f8ac Adds routes for group users. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7946 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 10:47:36 +00:00
Jean-Philippe Lang
1ebe9640a6 Replaced error_messages_for with #error_messages. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7945 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 10:44:58 +00:00
Toshi MARUYAMA
55d41cf77b backout r6356: HTML escape of app/helpers/timelog_helper.rb 
When export time entry csv, "undefined method `h'" error raises.
HTML escapes in view.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7941 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-27 08:25:12 +00:00
Jean-Philippe Lang
0e2733a7cb View cleanup. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7939 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-11-26 17:56:52 +00:00