Commit Graph

7986 Commits

Author SHA1 Message Date
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
Etienne Massip
dee6f6b138 Merged r9374 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9388 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-11 18:31:32 +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
4c82fbb6f8 Merged r9382 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9383 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-11 17:21:35 +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
c229ea6386 Merged r9371 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-08 21:01:20 +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
Toshi MARUYAMA
26564b06f7 Merged r9355 from trunk
remove 1.3-stable merged issues from CHANGELOG 1.4.0 list

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9356 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 13:01:12 +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
b45b5f4322 Merged r9346 and r9347 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9348 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 11:17:31 +00:00
Toshi MARUYAMA
8addbc537a Merged r9343 from trunk
Simplified Chinese translation updated by fangzheng (#10611)

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9344 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 10:45:24 +00:00
Jean-Philippe Lang
87eeacba80 Merged r9341 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9342 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 10:27:22 +00:00
Jean-Philippe Lang
a7250c41e2 Merged r9339 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9340 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 10:25:03 +00:00
Jean-Philippe Lang
7c45396d92 Set version to stable.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9338 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 09:45:43 +00:00
Jean-Philippe Lang
c1f98c835c Adds 1.4-stable branch.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9337 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 09:41:15 +00:00
Jean-Philippe Lang
6a9e16deda Set version to 1.4.0.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9336 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 09:40:38 +00:00
Jean-Philippe Lang
7993f2f329 Adds a quick and dirty task for creating databases on the CI server.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9335 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 09:36: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
dd5b091321 Aligns the magnifier in issue history details.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9331 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-06 08:48: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
b96710fb57 fix source indents of lib/diff.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9317 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-03 15:20:39 +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
bc2a22e17f Dutch translation updated (#10591)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9315 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-03 12:29:34 +00:00
Toshi MARUYAMA
186f9400d0 fix Dutch "label_file_added" translation (#10591)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9313 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-03 11:53:21 +00:00
Toshi MARUYAMA
1a87912b06 pdf: fix tcpdf automatic line break bug (#10554)
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9312 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-03 11:22:21 +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
cd250714e5 Japanese translation updated by Go MAEDA (#10587)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9310 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 23:18:33 +00:00
Toshi MARUYAMA
4df99674ff Bulgarian translation updated by Ivan Cenov (#10586)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9309 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 23:18:11 +00:00
Toshi MARUYAMA
f93261a7ea German translation updated by Hannes Meier (#10585)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9308 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 16:05:27 +00:00
Toshi MARUYAMA
aaa8232a27 generate i18n "label_search_for_watchers" key (#5159)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9307 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 14:33:31 +00:00
Toshi MARUYAMA
c11dc925de Japanese translation updated by Go MAEDA (#10584)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9306 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 14:33:15 +00:00
Toshi MARUYAMA
f800d2185e remove trailing white-spaces from vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9305 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 13:50:12 +00:00
Toshi MARUYAMA
90bd015467 remove trailing white-spaces from vendor/plugins/acts_as_event/lib/acts_as_event.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9304 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 13:49:57 +00:00
Toshi MARUYAMA
dd5c702e11 remove trailing white-spaces from vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9303 e93f8b46-1217-0410-a6f0-8f06a7374b81
2012-04-02 13:49:43 +00:00