Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-16 12:32:58 +01:00
Code Issues Packages Projects Releases Activity
10,813 Commits 35 Branches 225 Tags
e94debe4151b23be9edd7f6e5cbc4e724cde832a
Commit Graph

3890 Commits

Author SHA1 Message Date
Jean-Philippe Lang
51e4705d0e Merged r13213 (#16530). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13225 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-06 10:32:21 +00:00
Jean-Philippe Lang
58a06386ca Merged r13218 (#16989). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13224 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-06 10:31:15 +00:00
Jean-Philippe Lang
e4e7d1b6bd Merged r13216, r13217 (#17003). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13222 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-06 10:29:22 +00:00
Toshi MARUYAMA
3d5cb007ad Merged r13115 and r13171 from trunk to 2.5-stable (#16194) 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13204 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-07-02 03:50:02 +00:00
Jean-Philippe Lang
438cd4d6fa Merged r13055 (#16519). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13193 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-26 19:35:53 +00:00
Jean-Philippe Lang
37417628f4 Merged r13167 (#16798). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13191 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-06-26 19:34:12 +00:00
Jean-Philippe Lang
66084c8f97 Merged r13122 (#16781). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13166 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:40:29 +00:00
Jean-Philippe Lang
a6d62710cd Merged r13125 (#16700). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13164 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:39:18 +00:00
Jean-Philippe Lang
54a12ccb69 Merged r13141 (#16926). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13163 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:38:36 +00:00
Jean-Philippe Lang
221c8392c6 Merged r13140 and r13142 (#16795). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13162 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:37:38 +00:00
Jean-Philippe Lang
cc37898d15 Merged r13124 (#16755). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13161 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:36:04 +00:00
Jean-Philippe Lang
6b0b38b863 Merged r13109 (#16739). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13160 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:34:47 +00:00
Jean-Philippe Lang
d548d9338e Merged r13105 (#16669). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13158 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:33:13 +00:00
Jean-Philippe Lang
d84c3d35f0 Merged r13106 (#16668). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13157 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:32:28 +00:00
Jean-Philippe Lang
7352f1781b Merged r13104 (#16655). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13156 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:30:41 +00:00
Jean-Philippe Lang
fb0c262f8f Merged r13126 (#16619). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13155 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-05-24 16:29:46 +00:00
Jean-Philippe Lang
6c0f393ad1 Merged r13040 (#16467). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13046 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-04-05 14:34:07 +00:00
Jean-Philippe Lang
1807093b75 Merged r13018 (#16466). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13027 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:53:13 +00:00
Jean-Philippe Lang
65c9223fe5 Merged r12990 (#16338). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13022 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:37:17 +00:00
Jean-Philippe Lang
c5b52ec29f Merged r12989 and r12997 (#16236). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13020 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:35:47 +00:00
Jean-Philippe Lang
58786e8d80 Merged r12985 (#14298). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13019 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:34:28 +00:00
Jean-Philippe Lang
c61a6a707f Merged r12971 (#16255). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12979 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-17 08:30:30 +00:00
Jean-Philippe Lang
4aab2ed303 Merged r12967 (#16321). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12978 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-17 08:29:20 +00:00
Jean-Philippe Lang
91a161fadb Merged r12951. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12952 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 11:24:13 +00:00
Jean-Philippe Lang
dbe03f5443 Merged r12944 (#16143). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12947 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:34:00 +00:00
Jean-Philippe Lang
5b1799f245 Merged r12896 (#16081). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12945 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-02 09:29:22 +00:00
Jean-Philippe Lang
9cb17f598d Merged r12938 (#16169). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12939 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 11:39:01 +00:00
Toshi MARUYAMA
41667cd5de Merged r12929 from trunk to 2.5-stable (#16177) 
scm: mercurial: add one "closed" branch to test repository.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12931 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-26 13:01:43 +00:00
Jean-Philippe Lang
63212e5c16 Merged r12915 to 12918 (#16107). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12923 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-23 08:20:42 +00:00
Jean-Philippe Lang
01aa2db0af Merged r12899 (#16077). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12919 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-23 08:10:31 +00:00
Toshi MARUYAMA
23fb42a890 use escaped "Can't" constant at MailerTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@12883 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-14 05:05:39 +00:00
Toshi MARUYAMA
e8df3d50e8 Rails4: fix time related git adapter test failures 
git-svn-id: http://svn.redmine.org/redmine/trunk@12882 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-14 05:05:24 +00:00
Toshi MARUYAMA
3d79ddfe75 add missing fixtures to TimeEntryReportsControllerTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@12880 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-14 02:02:06 +00:00
Toshi MARUYAMA
49e0489bc8 Rails4: fix PreviewsControllerTest assert_template failures 
<pre>
  1) Failure:
PreviewsControllerTest#test_preview_issue_notes [test/functional/previews_controller_test.rb:44]:
expecting <"preview"> but rendering with <["previews/issue"]>
</pre>

git-svn-id: http://svn.redmine.org/redmine/trunk@12879 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-13 08:17:04 +00:00
Toshi MARUYAMA
7a594a2c3d Rails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links 
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12877 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-13 06:29:34 +00:00
Toshi MARUYAMA
2fc8ede093 Rails4: replace hard-coded html with class at Redmine::WikiFormatting::MacrosTest 
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12876 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-13 05:40:09 +00:00
Toshi MARUYAMA
889a5ed77a Rails4: replace hard-coded html with class at IssuesHelperTest 
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12872 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-11 07:27:30 +00:00
Jean-Philippe Lang
83dae30140 Test failure with Postgresql+ruby1.8 (#2549). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12870 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-09 16:34:41 +00:00
Jean-Philippe Lang
ff46e9d0a4 Makes #watcher_link return an empty string when given nil. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12869 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-09 12:04:44 +00:00
Jean-Philippe Lang
1ad33134d3 Enable the watching of news (#2549). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12866 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-09 11:54:21 +00:00
Toshi MARUYAMA
833068207c fix source indent of ApplicationHelperTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@12857 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 12:12:09 +00:00
Jean-Philippe Lang
171581da7e Project.activities should always return a ActiveRecord::Relation (#15983). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12854 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 08:36:49 +00:00
Jean-Philippe Lang
7b127ee489 Show tabs for existing custom field types only and adds a view for choosing the type when adding a new custom field. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12849 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 07:57:59 +00:00
Jean-Philippe Lang
09b95905dc Make sure that Repository#extra_info returns a Hash or nil (#16032). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12848 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 20:23:06 +00:00
Toshi MARUYAMA
a0baf7ee5d fix wrong issue 'assigned-to-my-group' css class (#16038) 
git-svn-id: http://svn.redmine.org/redmine/trunk@12844 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 12:16:27 +00:00
Toshi MARUYAMA
3817f1e304 Rails4: replace hard-coded html with class at ApplicationHelperTest#test_wiki_links_within_wiki_page_context 
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12843 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 04:45:54 +00:00
Toshi MARUYAMA
50eed3f9ab use escaped "Can't" constant at IssuesHelperTest 
git-svn-id: http://svn.redmine.org/redmine/trunk@12842 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 04:45:38 +00:00
Toshi MARUYAMA
ae7a4b9678 Rails4: add ApplicationHelper#truncate_single_line_raw method replacing truncate_single_line 
git-svn-id: http://svn.redmine.org/redmine/trunk@12830 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:33:33 +00:00
Toshi MARUYAMA
e4d152e84a add tests of ApplicationHelper#link_to_issue subject and title 
git-svn-id: http://svn.redmine.org/redmine/trunk@12829 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 02:38:37 +00:00
Toshi MARUYAMA
b6668e3ebf Rails4: replace hard-coded html with class at ApplicationHelperTest#test_pre_content_should_not_parse_wiki_and_redmine_links 
See r12784 comment.

git-svn-id: http://svn.redmine.org/redmine/trunk@12828 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 01:30:45 +00:00