meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 15:31:12 +00:00
Code Issues Releases Wiki Activity
11,396 Commits 32 Branches 194 Tags
Commit Graph

11396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
191a4a61f1 First db:migrate fails with SQLServer (undefined method type for nil class in sqlserver adapter). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13645 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-23 17:38:38 +00:00
Jean-Philippe Lang
1e0045e69b Removed duplicate element ids. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13644 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-23 13:45:24 +00:00
Jean-Philippe Lang
e0a034164f Move wiki page to other project (#5450). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13643 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-23 13:36:01 +00:00
Toshi MARUYAMA
1ada789a6c Merged r13640 from 2.6-stable to trunk (#18280) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13641 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 13:52:32 +00:00
Toshi MARUYAMA
d1982d8156 replace tab to space at app/models/issue.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13639 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 11:59:33 +00:00
Jean-Philippe Lang
827ab38725 Selected projects in email notifications on "my account" are lost when the page is redisplayed after a validation error (#18060). 
Patch by Felix Schäfer.

git-svn-id: http://svn.redmine.org/redmine/trunk@13638 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 10:56:59 +00:00
Jean-Philippe Lang
4e69edb5b8 Code cleanup. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13626 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 09:42:09 +00:00
Jean-Philippe Lang
65a62431dd Clear @spent_hours on reload (#18410). 
Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@13625 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 09:39:10 +00:00
Jean-Philippe Lang
f3e573b5f8 Replaced remaining #assert_tag with #assert_select. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13624 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-22 09:38:21 +00:00
Toshi MARUYAMA
3602cd637c RTL css improvement (#18390) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13623 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-21 04:56:50 +00:00
Toshi MARUYAMA
21bd572c6c German Self-registration translation changed by Filou Centrinov (#18392) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13622 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-21 04:22:46 +00:00
Toshi MARUYAMA
e512fe1c77 fix typo and use "GitHub" instead of "github" at CONTRIBUTING.md 
git-svn-id: http://svn.redmine.org/redmine/trunk@13621 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-21 04:11:02 +00:00
Jean-Philippe Lang
36d487fe50 Replaced some #assert_tag with #assert_select. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13620 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-20 19:57:06 +00:00
Jean-Philippe Lang
2a43f1adbc Quote values in DOM selectors for Nokogiri compatibility. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13619 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-20 19:38:40 +00:00
Jean-Philippe Lang
a7559e669f Moved select_list_move.js content to application.js. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13618 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 22:14:34 +00:00
Jean-Philippe Lang
4bfbabfdfa Removed submit_query_form function. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13617 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 22:02:23 +00:00
Jean-Philippe Lang
ff0a91d97d Use an handler instead of onsubmit attribute. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13616 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 21:53:25 +00:00
Jean-Philippe Lang
8b6939e2f4 Rewritten select_list_move.js functions with JQuery. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13615 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 21:44:45 +00:00
Toshi MARUYAMA
08bae5928a fix English syntax of skipping test comment of Bazaar non ASCII environment 
git-svn-id: http://svn.redmine.org/redmine/trunk@13614 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 11:23:16 +00:00
Toshi MARUYAMA
5d4ab52a66 fix "test:routing" rake task comment changed by r13604 
git-svn-id: http://svn.redmine.org/redmine/trunk@13613 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 11:23:07 +00:00
Toshi MARUYAMA
09e62fbc68 Gemfile: update Rails to 4.1.8 
git-svn-id: http://svn.redmine.org/redmine/trunk@13611 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-18 10:59:43 +00:00
Jean-Philippe Lang
cbf10b0eb8 Allows to move multiple columns in selection list (#18357). 
Patch by Filou Centrinov.

git-svn-id: http://svn.redmine.org/redmine/trunk@13610 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-17 22:57:40 +00:00
Jean-Philippe Lang
043c2c92da Removed deep nested time entries routes. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13609 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 21:28:03 +00:00
Jean-Philippe Lang
ecda1c7a4f Use should_route in routing tests. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13608 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 14:23:32 +00:00
Jean-Philippe Lang
d72e1f95ba Renamed #test_watchers to #test_issue_watchers. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13607 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 11:02:04 +00:00
Jean-Philippe Lang
dd2a0554c6 Adds API routing tests for time entries. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13606 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 11:00:29 +00:00
Jean-Philippe Lang
d550238894 Removed API tests for routes that are not implemented. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13605 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 10:58:15 +00:00
Jean-Philippe Lang
eae9c9ab2b Isolates all API routing tests to a specific test case. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13604 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 10:54:33 +00:00
Jean-Philippe Lang
cd6b2f2268 Adds tests for new routes. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13603 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 09:01:44 +00:00
Jean-Philippe Lang
1508cd7b8b Moved new group user to its own action GroupsController#new_users. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13602 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-16 08:53:39 +00:00
Jean-Philippe Lang
67835aa74d Adds a hook at the bottom of the calender (#6586). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13601 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-15 20:46:11 +00:00
Jean-Philippe Lang
36fc7beb2f Moved new project member to its own action MemberController#new. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13600 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-15 11:20:47 +00:00
Jean-Philippe Lang
f21a005fea Removed debug messages (#18349). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13599 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 21:58:44 +00:00
Jean-Philippe Lang
8712a0f13e Use named routes. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13598 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 21:51:32 +00:00
Jean-Philippe Lang
209babeedb Code cleanup. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13597 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 21:39:34 +00:00
Jean-Philippe Lang
eac3b2b27d Fixed that Redmine links should not be parsed inside links (#18301). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13596 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 21:31:27 +00:00
Jean-Philippe Lang
46756cbd56 Fixed 500 error when displaying a news with comments in reverse order (#18332). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13595 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 20:53:14 +00:00
Jean-Philippe Lang
48205aa7d9 Removed debug messages (#18349). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13594 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 20:49:05 +00:00
Jean-Philippe Lang
9b971925db Ignore bogus issue strings like [some-string#1234] in email subjects (#17705). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13593 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 20:43:15 +00:00
Jean-Philippe Lang
c12ba8a76c Fixed that URLs separated by line break are not rendered as links (#18349). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13592 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-14 20:18:09 +00:00
Toshi MARUYAMA
429e266bef Bulgarian translation updated by Ivan Cenov (#18324) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13591 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-12 03:55:27 +00:00
Toshi MARUYAMA
f2ddfcda9a add missing fixtures to test/functional/wiki_controller_test.rb 
Tests fail randomly.

<pre>
  1) Error:
WikiControllerTest#test_show_with_sidebar:
ActionView::Template::Error: undefined method `name' for nil:NilClass
    app/helpers/application_helper.rb:797:in `block in parse_redmine_links'
    app/helpers/application_helper.rb:757:in `gsub!'
    app/helpers/application_helper.rb:757:in `parse_redmine_links'
    app/helpers/application_helper.rb:601:in `block (2 levels) in textilizable'
    app/helpers/application_helper.rb:600:in `each'
    app/helpers/application_helper.rb:600:in `block in textilizable'
    app/helpers/application_helper.rb:621:in `parse_non_pre_blocks'
    app/helpers/application_helper.rb:599:in `textilizable'
    app/views/wiki/_content.html.erb:2:in `_app_views_wiki__content_html_erb___3773333740575742579_33736820'
    app/views/wiki/show.html.erb:44:in `_app_views_wiki_show_html_erb__965327089377623997_33504680'
    app/controllers/wiki_controller.rb:97:in `show'
    test/functional/wiki_controller_test.rb:119:in `test_show_with_sidebar'
</pre>

It can be reproduced by following change.

<pre>
 class WikiControllerTest < ActionController::TestCase
   fixtures :projects, :users, :roles, :members, :member_roles,
            :enabled_modules, :wikis, :wiki_pages, :wiki_contents,
-           :wiki_content_versions, :attachments
+           :wiki_content_versions, :attachments,
+           :issues #, :issue_statuses
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13590 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-12 03:44:47 +00:00
Jean-Philippe Lang
05edd89811 Use bundle exec. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13589 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-11 21:13:18 +00:00
Jean-Philippe Lang
a0ca45b99c Code cleanup, removed duplicate project activity route. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13588 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-11 18:07:50 +00:00
Jean-Philippe Lang
c74098bbd6 Don't load user activity for API responses (#18128). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13587 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-11 13:28:41 +00:00
Jean-Philippe Lang
47e723c617 Display visible users only for when adding project members (#11724). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13586 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-11 13:18:01 +00:00
Jean-Philippe Lang
78620da801 Adds strings to locales (#11724). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13585 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-11 13:10:11 +00:00
Jean-Philippe Lang
bdd3ccf8e5 Adds a role setting for controlling visibility of users: all or members of visible projects (#11724). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13584 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-11 13:08:52 +00:00
Jean-Philippe Lang
140ca9532c Adds a test for default issue columns order (#18310). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13583 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-11 12:33:06 +00:00
Toshi MARUYAMA
55c49a6d46 German "button_update" translation changed by Alexander Loechel (#18314) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13582 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-11-10 23:14:47 +00:00