Mirrors/redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2024-09-13 15:45:44 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7,996 Commits 33 Branches 201 Tags 200 MiB
2c0ba78f70
Commit Graph

4111 Commits

Author SHA1 Message Date
Jean-Philippe Lang
8fefb7c05b Merged r9390 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9400 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:52:49 +00:00
Jean-Philippe Lang
1feb373c89 Merged r9378 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9399 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:51:49 +00:00
Jean-Philippe Lang
32fd503cbb Merged r9381 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9398 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:50:58 +00:00
Jean-Philippe Lang
cf31aeaf81 Merged r9380 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9397 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:45:44 +00:00
Jean-Philippe Lang
83ea66fd2c Merged r9379 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9395 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-14 04:43:41 +00:00
Jean-Philippe Lang
ef2c5cab2d Merged r9392 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9393 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-13 19:41:05 +00:00
Jean-Philippe Lang
a4c0c18e3d Merged r9384, r9385 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9386 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-11 17:27:44 +00:00
Jean-Philippe Lang
68ded50edc Merged r9372 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9377 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:28:04 +00:00
Jean-Philippe Lang
72ecb80dc7 Merged r9358 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9376 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:27:07 +00:00
Jean-Philippe Lang
86ee285eb4 Merged r9367 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9375 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-09 06:22:31 +00:00
Jean-Philippe Lang
687fca170e Merged r9359 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9360 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 13:51:55 +00:00
Jean-Philippe Lang
34016c38bd Merged r9349 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9354 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 12:39:51 +00:00
Jean-Philippe Lang
15ff361894 Merged r9350 and r9351 from trunk. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9352 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 12:23:07 +00:00
Jean-Philippe Lang
b4975862d6 Uploading of attachments which filename contains non-ASCII chars fails with Ruby 1.9 on issue update (#10575). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9334 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 09:31:29 +00:00
Jean-Philippe Lang
331cf23345 Do not display the magnifier for added files in email notifications (#4774). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9333 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 09:20:40 +00:00
Jean-Philippe Lang
f05f84a2ea Moved the magnifier just after the filename. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9332 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 08:49:04 +00:00
Jean-Philippe Lang
bac7dff5bb Force encoding of custom field possible values (#10593). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9330 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 07:39:50 +00:00
Jean-Philippe Lang
f1cae4f7af WikiContent::Version#text may return ascii-8bit encoded string (#10590). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9329 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 07:21:51 +00:00
Toshi MARUYAMA
e964135b62 delete :only_path option from link_to options at application_helper link_to_attachment (#10602) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9328 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 06:07:13 +00:00
Toshi MARUYAMA
8828c0f13e fix attachment link has get parameter :class (#10602) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9327 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:45:04 +00:00
Toshi MARUYAMA
f277f127c6 add a view link to note attachment file (#4774) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9326 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:44:48 +00:00
Toshi MARUYAMA
b88586b56d code layout cleanup app/helpers/issues_helper.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9325 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:44:30 +00:00
Toshi MARUYAMA
c1dd88b015 replace tabs to spaces at app/views/attachments/_links.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9324 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-06 05:44:14 +00:00
Etienne Massip
d36d64f664 Fixed Internal Error in watchers XHR search (#10600). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9323 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-05 18:10:54 +00:00
Toshi MARUYAMA
ddce7ef142 code layout clean up app/views/repositories/show.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9321 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-04 10:43:29 +00:00
Toshi MARUYAMA
9aefe8b1e9 fix html tag at app/views/repositories/show.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9320 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-04 10:43:15 +00:00
Toshi MARUYAMA
72590ea997 code layout clean up app/views/repositories/show.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9319 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-04 10:19:55 +00:00
Toshi MARUYAMA
a5b480c62e replace tabs to spaces at app/views/repositories/show.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9318 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-04 10:19:41 +00:00
Toshi MARUYAMA
f0f7158d87 fix typo "RedMine" at app/models/wiki_content.rb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9316 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-03 14:04:38 +00:00
Toshi MARUYAMA
29782860b7 scm: mercurial: git: save parents in creating changesets (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9311 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-04-03 08:05:30 +00:00
Toshi MARUYAMA
0098c7b128 fix source indents of app/views/repositories/revisions.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9291 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-30 01:48:59 +00:00
Toshi MARUYAMA
f36eb54141 scm: git: use Changeset#create and Changeset#create_change as same with Subversion and Mercurial 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9290 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 22:41:20 +00:00
Toshi MARUYAMA
b2a2cb68dd scm: mercurial: transaction for each imported revisions (#10470) 
Subversion transaction switched at r2563.
Subversion and Mercurial have a sequential revision number.
So, Mercurial can use the same logic with Subversion.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 16:50:10 +00:00
Toshi MARUYAMA
76435033e7 scm: git: add the comment of the reason to scan database in fetching every time (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 10:05:13 +00:00
Toshi MARUYAMA
27dca22c91 scm: git: fix typo in fetching revisions comment. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9286 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-29 02:42:20 +00:00
Toshi MARUYAMA
5232d379f9 scm: git: fix model source indents (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9284 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-28 17:18:19 +00:00
Toshi MARUYAMA
9b333e1c87 scm: git: process new git revisions all at once rather than per branch (#10470) 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9283 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-28 17:18:04 +00:00
Toshi MARUYAMA
5f37d0d1c8 replace tabs to spaces and fix indents at app/views/issues/new.html.erb 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9279 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-28 03:34:39 +00:00
Jean-Philippe Lang
274566f13b Failing test with 1.8.7 and jruby (#10538). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-25 20:21:04 +00:00
Jean-Philippe Lang
6115a079ec Remove duplicate watchers (#10538). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9268 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-25 19:35:32 +00:00
Jean-Philippe Lang
1294f72175 Fixed that issues can be moved to projects with issue tracking disabled (#10467). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9267 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-25 19:32:05 +00:00
Jean-Philippe Lang
5663ca89fa Fixes error message for LDAP filter (#1060). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9258 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 14:07:42 +00:00
Jean-Philippe Lang
ee8002b0c9 Adds the repository identifier in the activity and search results (#779). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9257 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 13:51:28 +00:00
Jean-Philippe Lang
bb36fa5d12 Adds the repository identifier to Changeset#text_tag (#779). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9255 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 13:03:36 +00:00
Jean-Philippe Lang
fae5250e52 Ability to add non-member watchers on issue creation (#5159). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9254 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 12:57:28 +00:00
Toshi MARUYAMA
e2bb8721d9 Replace tables that were using the 'width' attribute with inline styles (should be replaced with an ID/class). 
Contributed by Andrew Smith.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9253 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 00:03:05 +00:00
Toshi MARUYAMA
103cd46f78 Remove some inline styling and some depreciated table cell attributes and replace them with proper class names. 
Contributed by Andrew Smith.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9252 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 00:02:49 +00:00
Toshi MARUYAMA
8bc638f404 Fix missing cells at app/views/issues/show.html.erb 
Contributed by Andrew Smith.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9251 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 00:02:35 +00:00
Toshi MARUYAMA
27c390bb62 Fix duplicated 'back_url' IDs 
Various hidden input fields are used to hold a URL to send the user back
to the correct page after submitting a form, however, they all use the
same ID which isn't allowed in HTML. Passing in 'id' as nil stops the
'hidden_field_tag' from adding an ID attribute to the tag.

Contributed by Andrew Smith.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9250 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-24 00:02:20 +00:00
Jean-Philippe Lang
7c5635f6c6 Typo (#1913). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9243 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2012-03-17 12:19:01 +00:00