kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,759 Commits 2 Branches 91 Tags 22 MiB
Commit Graph

5283 Commits

Author SHA1 Message Date
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 df7f00afce Merged r12970 (#16259). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@13021 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-03-29 14:36:29 +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 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 8b1a61d856 Merged r12941 (#16161). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12942 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-28 12:53:05 +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 51175ede2c revert r12925 of 2.5-stable 
I mistook to commit in stable branch.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12926 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-25 06:53:35 +00:00
Toshi MARUYAMA 9abdbd423d prevent issue tree hierarchy is broken in race conditions (#6579) 
awesome_nested_set 2.1.6 uses lock.
Issue model uses as same way.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12925 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-25 06:49:53 +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 88b3872179 Merged r12914 (#16134). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12922 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-23 08:15:37 +00:00
Jean-Philippe Lang 066e9b7f94 Merged r12912 and r12913 from trunk. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12921 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-23 08:14:59 +00:00
Jean-Philippe Lang 805debddd0 Merged r12910 and r12911 (#16091). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12920 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-23 08:11:59 +00:00
Jean-Philippe Lang 8b9a2ff871 Merged r12897. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12898 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-15 10:04:48 +00:00
Jean-Philippe Lang 97434b5aaa Merged r12894 (#16091). 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12895 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-15 09:01:16 +00:00
Jean-Philippe Lang 4308dd7d4c Merged r12892. 
git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12893 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-15 08:34:57 +00:00
Toshi MARUYAMA 22c7e0b8df fix source indent of Repository::Cvs model 
git-svn-id: http://svn.redmine.org/redmine/trunk@12878 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-13 07:13:59 +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 79d01c7fe5 Display watch link only when inside project with logged-in user (#2549). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12868 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-09 12:01:22 +00:00
Jean-Philippe Lang 2585ed2e3b Use spaces instead of tabs. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12867 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-09 11:58:19 +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
Jean-Philippe Lang 98cbbdf7f1 Reverts r12855. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12856 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 11:45:25 +00:00
Jean-Philippe Lang 3d64938adc Adds JS response support to #render_error (#15760). 
git-svn-id: http://svn.redmine.org/redmine/trunk@12855 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 09:26:27 +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 8b58c95212 Code cleanup. 
git-svn-id: http://svn.redmine.org/redmine/trunk@12851 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-07 08:00:39 +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 70ab59354f Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at app/views/issues/_list_simple.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12841 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:36:40 +00:00
Toshi MARUYAMA 52e043d0e4 Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at app/views/repositories/revision.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12840 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:36:24 +00:00
Toshi MARUYAMA b412f0cc00 Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at app/views/repositories/_dir_list_content.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12839 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:36:08 +00:00
Toshi MARUYAMA 3d77481081 Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at app/views/repositories/_revisions.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12838 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:35:52 +00:00
Toshi MARUYAMA 4498df2d7c Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at app/views/search/index.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12837 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:35:36 +00:00
Toshi MARUYAMA 34870add02 Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at app/views/auto_completes/issues.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12836 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:35:19 +00:00
Toshi MARUYAMA 8934e790fe Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at ApplicationHelper#format_activity_description 
git-svn-id: http://svn.redmine.org/redmine/trunk@12835 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:35:01 +00:00
Toshi MARUYAMA 16211f9a5b Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at ApplicationHelper#link_to_message 
git-svn-id: http://svn.redmine.org/redmine/trunk@12834 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:34:45 +00:00
Toshi MARUYAMA ae087d7578 Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at ApplicationHelper#parse_redmine_links 
git-svn-id: http://svn.redmine.org/redmine/trunk@12833 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:34:27 +00:00
Toshi MARUYAMA 3e38bd0654 Rails4: replace ActionView::Helpers::TextHelper#truncate by String#truncate at ApplicationHelper#link_to_issue 
git-svn-id: http://svn.redmine.org/redmine/trunk@12831 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-06 03:33:51 +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 2bcd63ad28 code format clean up app/views/issues/_list_simple.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12818 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-05 08:55:17 +00:00
Toshi MARUYAMA 4d806cc7f5 remove unneeded h() from app/views/repositories/_revisions.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12817 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-05 08:55:01 +00:00
Toshi MARUYAMA 8d0ce6498e remove unneeded h() from app/views/repositories/_dir_list_content.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12816 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-05 08:54:46 +00:00
Toshi MARUYAMA c714322530 remove unneeded h() from app/views/issues/_list_simple.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12815 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-05 08:54:28 +00:00
Toshi MARUYAMA fb1055eb3f code format clean up app/views/search/index.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12814 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-05 08:54:12 +00:00
Toshi MARUYAMA fb54d4e459 code format clean up ApplicationHelper#parse_redmine_links 
git-svn-id: http://svn.redmine.org/redmine/trunk@12809 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-05 03:24:22 +00:00
Toshi MARUYAMA f44c32557c code format clean up ApplicationHelper#link_to_issue 
git-svn-id: http://svn.redmine.org/redmine/trunk@12808 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-05 03:24:07 +00:00
Toshi MARUYAMA 09bbfad124 code format clean up app/views/projects/settings/_members.html.erb 
git-svn-id: http://svn.redmine.org/redmine/trunk@12797 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-04 23:50:32 +00:00
Toshi MARUYAMA b87a7b8984 scm: mercurial: insert long id to DB unless existing id in DB is not short id (#14361) 
git-svn-id: http://svn.redmine.org/redmine/trunk@12777 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-02 14:53:16 +00:00
Toshi MARUYAMA d301b8c0c1 scm: mercurial: switch short or long id of entry by existing value in DB (#14361) 
git-svn-id: http://svn.redmine.org/redmine/trunk@12760 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2014-02-02 04:44:20 +00:00