meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity
11,403 Commits 32 Branches 194 Tags
Commit Graph

11403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Philippe Lang
14473f45a1 Adds strings to locales (#4244). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13887 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:17:58 +00:00
Jean-Philippe Lang
e3618bdbec Add support for multiple email addresses per user (#4244). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13886 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-17 14:14:12 +00:00
Toshi MARUYAMA
7f29c2fd88 IssuesControllerTest: make encoding tests independent of ordering (#18856) 
Contributed by Antonio Terceiro.

git-svn-id: http://svn.redmine.org/redmine/trunk@13885 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-16 04:57:10 +00:00
Toshi MARUYAMA
e7346625f0 fix UsersControllerTest failure randomly 
<pre>
  1) Error:
UsersControllerTest#test_show:
ActionView::Template::Error: undefined method `name' for nil:NilClass
    app/models/issue.rb:53:in `block in <class:Issue>'
    lib/plugins/acts_as_event/lib/acts_as_event.rb:62:in `call'
    lib/plugins/acts_as_event/lib/acts_as_event.rb:62:in `event_title'
    app/views/users/show.html.erb:57:in `block (2 levels) in _app_views_users_show_html_erb___2965700471773239267_46119700'
    app/views/users/show.html.erb:53:in `each'
    app/views/users/show.html.erb:53:in `block in _app_views_users_show_html_erb___2965700471773239267_46119700'
    app/views/users/show.html.erb:50:in `each'
    app/views/users/show.html.erb:50:in `_app_views_users_show_html_erb___2965700471773239267_46119700'
    app/controllers/users_controller.rb:75:in `block (2 levels) in show'
    app/controllers/users_controller.rb:71:in `show'
    test/functional/users_controller_test.rb:76:in `test_show'
</pre>

This can be reproduced with following change.

<pre>
   fixtures :users, :projects, :members, :member_roles, :roles,
            :custom_fields, :custom_values, :groups_users,
-           :auth_sources
+           :auth_sources,
+           :enabled_modules,
+           :issues, :issue_statuses
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13883 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 16:31:01 +00:00
Toshi MARUYAMA
d31ecd9ec2 Japanese translation updated by Go MAEDA (#18844) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13882 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 13:48:58 +00:00
Toshi MARUYAMA
a609c702c3 add missing fixture to SearchControllerTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@13881 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 13:38:44 +00:00
Toshi MARUYAMA
25c854b893 remove jruby-21mode from .travis.yml 
git-svn-id: http://svn.redmine.org/redmine/trunk@13880 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 13:38:36 +00:00
Toshi MARUYAMA
a5d9499dfa Japanese translation updated and changed by Go MAEDA (#18794) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13879 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 06:38:49 +00:00
Toshi MARUYAMA
19b9c7406b Traditional Chinese translation updated by ChunChang Lo (#18819) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13878 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 06:38:41 +00:00
Toshi MARUYAMA
1093e6773c generate i18n key (#10734) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13877 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-15 06:38:33 +00:00
Jean-Philippe Lang
062be16542 Updates for 2.6.1 release. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13874 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:15:24 +00:00
Jean-Philippe Lang
000124f44f Copyright update. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 09:09:50 +00:00
Toshi MARUYAMA
34b3376b81 Gemfile: update rbpdf version to 1.18.4 (#18629) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13870 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-11 04:19:33 +00:00
Jean-Philippe Lang
a18c719fcc Fixed: Custom field is rendered, even if its value is empty (for multiple) (#18654). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13864 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 13:03:52 +00:00
Jean-Philippe Lang
a77d884157 Fixed: Redmine::FieldFormat::IntFormat does not accept "real" Integer values (#18781). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13863 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 11:06:27 +00:00
Jean-Philippe Lang
aca5bfdc05 Unlock capybara gem version (#18789). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13862 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:26:09 +00:00
Jean-Philippe Lang
50ab0728a8 Time dependend failures in UI tests (#18789). 
Patch by Ondřej Ezr.

git-svn-id: http://svn.redmine.org/redmine/trunk@13861 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:24:19 +00:00
Jean-Philippe Lang
b236be138d Fixed errors in UI tests (#18782). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13860 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:20:50 +00:00
Jean-Philippe Lang
a4499274a2 Fixed open div tag position. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13859 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:10:48 +00:00
Jean-Philippe Lang
0ed895388b Option to search open issues only (#10734). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13858 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-10 10:09:34 +00:00
Jean-Philippe Lang
6e94d2f2af Adds strings to locales (#4383). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13857 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-09 21:06:50 +00:00
Jean-Philippe Lang
576a13e99d Option to search attachment filenames and description (#4383). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13856 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-09 21:06:09 +00:00
Jean-Philippe Lang
742895183a Search custom fields and journals with different queries to take advantage of indexes on text columns if present. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13855 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-08 22:04:00 +00:00
Toshi MARUYAMA
e2e9d7185e replace tab to space at test/test_helper.rb 
git-svn-id: http://svn.redmine.org/redmine/trunk@13854 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-08 06:20:32 +00:00
Jean-Philippe Lang
fec68fcfc1 Same fix as r13582 for trackers and statuses (#18769). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13853 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:56:34 +00:00
Jean-Philippe Lang
b1e105abe2 Redirect to the current page when reordering roles (#18769). 
Patch by Jérôme BATAILLE.

git-svn-id: http://svn.redmine.org/redmine/trunk@13852 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:52:23 +00:00
Jean-Philippe Lang
0eda7765fa Skip validation if attribute did not change. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13851 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:51:45 +00:00
Jean-Philippe Lang
e98e7c8c43 Missing break (#18734). 
git-svn-id: http://svn.redmine.org/redmine/trunk@13850 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:45:11 +00:00
Jean-Philippe Lang
8db1cdd6f1 Deprecates Project#set_allowed_parent!. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13849 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:33:25 +00:00
Jean-Philippe Lang
fd4a911304 Fixed that project copy triggers a 500 error if project validation fails. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13848 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:29:50 +00:00
Jean-Philippe Lang
5d2eea1489 Cleans up parent project assignment in ProjectsController. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13847 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:19:57 +00:00
Jean-Philippe Lang
b7ad1e82cc Move always possible for new records. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13846 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 22:18:58 +00:00
Jean-Philippe Lang
dcda9977e3 Use r13844 workaround for SQLServer only. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13845 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 21:11:05 +00:00
Jean-Philippe Lang
a7378e450d Fixed dead locks with SQLServer. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13844 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 20:57:52 +00:00
Jean-Philippe Lang
ded15dfc80 Moved Project#hierarchy to NestedSet::Traversing. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13843 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 20:37:06 +00:00
Jean-Philippe Lang
daef6a8037 Insert children issues to respect same order as ids. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13842 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 20:26:21 +00:00
Jean-Philippe Lang
1a851318fd Replaces awesome_nested_set gem with a simple and more robust implementation of nested sets. 
The concurrency tests added in this commit trigger dead locks and/or nested set inconsistency with awesome_nested_set.

git-svn-id: http://svn.redmine.org/redmine/trunk@13841 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-07 20:19:49 +00:00
Toshi MARUYAMA
bf5d58a768 Gemfile: pin pg version 0.17 
On Rails 4.1.8, pg 0.18.0 cause error.

<pre>
  1) Failure:
WikiContentTest#test_update_with_gzipped_history [test/unit/wiki_content_test.rb:88]:
Expected: "gzip"
  Actual: ""
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13839 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-04 07:31:41 +00:00
Toshi MARUYAMA
c23c949d95 remove duplicated :remote key from app/views/messages/show.html.erb 
Ruby 2.2 shows warning.

git-svn-id: http://svn.redmine.org/redmine/trunk@13836 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-04 04:20:49 +00:00
Toshi MARUYAMA
11f2ccd42f remove duplicated :id key from app/views/timelog/report.html.erb 
Ruby 2.2 shows warning.

git-svn-id: http://svn.redmine.org/redmine/trunk@13835 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-04 04:20:40 +00:00
Toshi MARUYAMA
a9298224b1 fix Ruby 2.2 warning at lib/redmine/scm/adapters/cvs_adapter.rb 
On ruby 2.2.0p0 (2014-12-25 revision 49005) [x86_64-linux]:

<pre>
lib/redmine/scm/adapters/cvs_adapter.rb:342:
  warning: Comparable#== will no more rescue exceptions of #<=> in the next release.
lib/redmine/scm/adapters/cvs_adapter.rb:342:
  warning: Return nil in #<=> if the comparison is inappropriate or avoid such comparison.
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@13831 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 17:31:01 +00:00
Toshi MARUYAMA
9da6bb31c1 Gemfile: pin activerecord-jdbcsqlite3-adapter version 1.3.11 
1.3.13 breaks test/functional/issues_controller_test.rb.

git-svn-id: http://svn.redmine.org/redmine/trunk@13829 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 16:18:31 +00:00
Toshi MARUYAMA
643e4917ca add jruby-21mode to .travis.yml 
git-svn-id: http://svn.redmine.org/redmine/trunk@13826 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 15:56:53 +00:00
Toshi MARUYAMA
e817ea15f9 Adds table reference to textile help (#12734). 
Patch by Matt Wiseley.

git-svn-id: http://svn.redmine.org/redmine/trunk@13825 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 14:59:01 +00:00
Toshi MARUYAMA
a3ea25ad34 Japanese wiki_syntax_detailed.html translation updated by Go MAEDA (#18637) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13824 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 13:36:05 +00:00
Toshi MARUYAMA
f5cf7a5c04 Wiki formatting documentation for nested lists in translated languages (#4518) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13823 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 13:35:56 +00:00
Toshi MARUYAMA
f49ce92d27 revert r13762 because character encodings are broken (#12734) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13822 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 13:35:45 +00:00
Toshi MARUYAMA
89bdf72d19 fix Japanese "label_sort_by" misspelling (#18671) 
Contributed by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/trunk@13821 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 12:00:40 +00:00
Toshi MARUYAMA
3cfd395a4f Swedish translation updated by Khedron Wilk (#18587) 
git-svn-id: http://svn.redmine.org/redmine/trunk@13819 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2015-01-03 11:05:24 +00:00
Jean-Philippe Lang
bfdd9f7c29 The descendant count in the issues delete confirmation message is wrong if issues share some descendants. 
git-svn-id: http://svn.redmine.org/redmine/trunk@13818 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-12-30 11:24:00 +00:00