kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,370 Commits 5 Branches 46 Tags 17 MiB
Commit Graph

4370 Commits

Author SHA1 Message Date
Eric Davis bdc7325a82 Merge branch 'master' into unstable 
Conflicts:
	doc/CHANGELOG.rdoc
 2011-05-01 13:58:02 -07:00
Eric Davis 9d13deee46 Merge branch 'release-v1.3.0' 2011-05-01 13:56:36 -07:00
Eric Davis 07772e7eb7 Bump version to 1.3.0 2011-05-01 13:09:15 -07:00
Eric Davis db89e91927 Update Changelog for 1.3.0 release 2011-05-01 12:47:16 -07:00
Eric Davis afe5a2b2e8 Merge branch 'ticket/master/347-execution-after-redirect' 2011-05-01 12:31:43 -07:00
Eric Davis 614bad89a5 Merge branch 'ticket/unstable/310-skip-issue-mail-notifications' into unstable 
Conflicts:
	config/locales/en.yml
	test/unit/journal_test.rb
 2011-04-29 08:46:13 -07:00
Eric Davis d2973a641e [#347] Fix potential Execution After Redirect bugs 
Execution After Redirect (EAR) happens when redirect in a controller is
triggered but there still is code that is executed in the action.

Contributed by Adam Doupé
 2011-04-28 14:39:19 -07:00
Eric Davis 72cd7f2049 [#347] Add missing fixture when running a focused test 2011-04-28 14:22:29 -07:00
Eric Davis 65692235a4 [#352] Use ChiliProject on error pages 2011-04-26 15:19:44 -07:00
Eric Davis d02d8e7e17 Merge remote-tracking branch 'schmidt/b/346-fix-invalid-yaml' into unstable 2011-04-21 13:08:52 -07:00
Gregor Schmidt 90987ca34e [#346] Fixing polish and swedish translations to work with psych 2011-04-21 13:24:49 +02:00
Gregor Schmidt 31d292ce95 [#346] Fixing hebrew translations to work with psyc 2011-04-21 13:21:13 +02:00
Gregor Schmidt 50faef3712 [#346] also fixing errornous string starting with % 2011-04-21 12:04:04 +02:00
Gregor Schmidt 3b7ea67a99 [#346] changing i18n files to use valid yaml syntax that may be parsed by psych 2011-04-21 11:47:32 +02:00
Eric Davis ed252f7246 [#309] Set the back_url after sending a lost password so HTTP_REFERER isn't used 
Contributed by Robert Chady
 2011-04-20 16:24:54 -07:00
Eric Davis 1eee7312f6 [#289] Remove single helpers in favor of :all in ApplicationController 2011-04-20 16:08:00 -07:00
Eric Davis d14417070d Merge branch 'ticket/unstable/288-april-upstream-redmine-review' into unstable 2011-04-16 16:38:00 -07:00
Eric Davis f06f846fce Locales update post-merge 2011-04-16 16:19:31 -07:00
Jean-Philippe Lang 42653cef32 Shorten query[column_names] param name. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5304 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:54 -07:00
Jean-Philippe Lang e78149f85c Keep issue filter params on sort headers. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:54 -07:00
Jean-Philippe Lang 1335548949 Changes pagination links to non-AJAX requests (#5138). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5302 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:53 -07:00
Jean-Philippe Lang 07cf681d61 Makes all pagination-like links use #link_to_content_update (#5138). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5301 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:15:50 -07:00
Jean-Philippe Lang 844c0d97aa Removed the changeset-changes class to the commit logs on the issue view (#8038). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5300 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 0c0763ad4b Disable unused fields when switching the period type. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5299 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 82b638f727 Removed hidden project_id and issue_id parameters. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5298 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Jean-Philippe Lang 789ccec246 Changed timelogs filters to use non-AJAX requests (#1965). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5297 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:20 -07:00
Toshi MARUYAMA 966a7a9c34 PDF: code clean up lib/redmine/export/pdf.rb. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5296 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Toshi MARUYAMA 73c5191196 PDF: fix width calculation of multi byte character in Simplified and Traditional Chinese (#61). 
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5295 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Jean-Philippe Lang 1cab1bd51e Skip a count(*) SQL query. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5294 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Jean-Philippe Lang 1d0b4dcdcc Do not load projects association in #rolled_up_trackers. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5293 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Jean-Philippe Lang 3374130e60 Skip a few count(*) SQL queries on the issue list. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5292 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Toshi MARUYAMA 7f0a29f7c2 PDF: set enable to use TCPDF UTF-8 on Windows except CJK and Thai (#61). 
Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5291 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Toshi MARUYAMA 6485f15bb9 PDF: fix the problem that TCPDF built-in font breaks in the Windows (#61). 
This problem occurs because the EOF character string is included in the built-in font.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5290 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Jean-Philippe Lang ed867c4a7f Adds an index on users.type for faster retrieval of groups. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5288 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Jean-Philippe Lang 2431d830b1 No PUT request to get previous/next month. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5287 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Jean-Philippe Lang e6659501de Limits nested set overhead when destroying an issue without children. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5286 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:19 -07:00
Jean-Philippe Lang cfbe69ab59 Fixed: deleting a parent issue may lead to a stale object error (#7920). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5285 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:18 -07:00
Jean-Philippe Lang 61d4a623a8 Fixed: list of users for adding to a group may be empty if 100 first users have been added (#8029). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5284 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:18 -07:00
Jean-Philippe Lang bb4a10fc85 Fixed: bulk destroying parent and child issues raises a stale object error (#7920). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5283 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:18 -07:00
Toshi MARUYAMA 8ca3a46db0 PDF: back out r5253 (#7794, #61). 
r5256 fixed #7794 completely.
r5253 effects the width of the ASCII character of Japanese PDF.

Contributed by Jun NAITOH.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5281 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:13:18 -07:00
Jean-Philippe Lang 62a4170531 Shortens filter param names. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5279 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 4e6962e7c9 Keep filter params in 'Per page' links. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5278 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 561fc8b0f2 Disable unused filter fields so they don't get submitted. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5277 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 35a848dac7 Initialize TimeEntry with issue and project for the issue edit form. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5274 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang 8fae4e2ee5 Fixes #possible_values_options when given an object with nil project. 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5273 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Jean-Philippe Lang d8fbdca760 Adds User and Version custom field format that can be used to reference a project member or version in custom fields (#2096). 
These new field formats are available for project, issue, version and time entry custom fields.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5272 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Toshi MARUYAMA 0bf7a60480 Fix test/integration/api_test/users_test.rb fails due to changing en.yml (#8035, #7855). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5270 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Toshi MARUYAMA 52be4a13b0 Fix annotate functional roles_controller_test.rb due fails to changing en.yml (#8035, #7855). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5269 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:53 -07:00
Toshi MARUYAMA 6ac1b6d4ef scm: git: fix annotate test due to changing en.yml (#8035, #7855). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5268 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00
Toshi MARUYAMA 4d6475cdcf PDF: fix syntax errors at vendor/plugins/rfpdf/lib/tcpdf.rb on Ruby 1.9 (#61). 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5267 e93f8b46-1217-0410-a6f0-8f06a7374b81
 2011-04-16 16:11:52 -07:00