summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merged r13922 (#18896).Jean-Philippe Lang2015-02-181-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14021 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13921 (#18894).Jean-Philippe Lang2015-02-181-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14020 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14014 (#17722).Jean-Philippe Lang2015-02-181-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14018 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r14016 (#19117).Jean-Philippe Lang2015-02-172-4/+4
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@14017 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Copyright update in 2.6-stable.Jean-Philippe Lang2015-01-11157-157/+157
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13873 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13852 and r13853 (#18769).Jean-Philippe Lang2015-01-106-6/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13866 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13836 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-1/+0
| | | | | | | | remove duplicated :remote key from app/views/messages/show.html.erb Ruby 2.2 shows warning. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13838 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13835 from trunk to 2.6-stableToshi MARUYAMA2015-01-041-2/+2
| | | | | | | | remove duplicated :id key from app/views/timelog/report.html.erb Ruby 2.2 shows warning. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13837 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13787 (#18667).Jean-Philippe Lang2014-12-261-4/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13803 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13785 (#18665).Jean-Philippe Lang2014-12-262-8/+16
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13802 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13670 (#18499).Jean-Philippe Lang2014-12-261-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13800 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13784 (#14699).Jean-Philippe Lang2014-12-261-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13798 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13638 (#18060).Jean-Philippe Lang2014-11-231-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13642 e93f8b46-1217-0410-a6f0-8f06a7374b81
* 2.6-stable: fix syntax error on Ruby 1.8.7 (#18280)Toshi MARUYAMA2014-11-221-1/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13640 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13625 (#18410).Jean-Philippe Lang2014-11-221-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13637 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13486 to r13489 and r13492 (#8817).Jean-Philippe Lang2014-11-222-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13635 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13593 (#17705).Jean-Philippe Lang2014-11-221-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13634 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13477 (#18051).Jean-Philippe Lang2014-11-221-0/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13633 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backported r13560 and r13569 (#18280).Jean-Philippe Lang2014-11-221-0/+18
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13631 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13562 (#18269).Jean-Philippe Lang2014-11-221-4/+8
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13630 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13557 (#17744).Jean-Philippe Lang2014-11-221-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13629 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13556 (#13673).Jean-Philippe Lang2014-11-221-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13628 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13555 (#13608).Jean-Philippe Lang2014-11-221-0/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13627 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13451 (#18119).Jean-Philippe Lang2014-10-201-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13463 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Merged r13457 from trunk to 2.6-stable (#14491)Toshi MARUYAMA2014-10-201-1/+1
| | | | | | use deep_dup to prevent losing mail receiving options. git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13459 e93f8b46-1217-0410-a6f0-8f06a7374b81
* MailHandler: Don't use String#respond_to?(:force_encoding) (#18047)Toshi MARUYAMA2014-10-081-1/+1
| | | | | | Contributed by Felix Schäfer. git-svn-id: http://svn.redmine.org/redmine/trunk@13432 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Reverts change in r13428, project can't be found by identifier (#17959).Jean-Philippe Lang2014-10-051-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13429 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed that preview doesn't show notes when issue project is changed (#17959).Jean-Philippe Lang2014-10-051-2/+2
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13428 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Don't link multiple changesets from the same commit multiple times (#17931).Jean-Philippe Lang2014-10-052-1/+19
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13427 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds css classes to get sort order on the issue list (#17993).Jean-Philippe Lang2014-10-042-1/+13
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13425 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Removes routes for time entries nested under project/issues.Jean-Philippe Lang2014-10-044-8/+38
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13424 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds a link to /time_entries/new from My Page Spent Time block (#17955).Jean-Philippe Lang2014-10-041-0/+6
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13423 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Let the new time_entry form be submitted without project (#17954).Jean-Philippe Lang2014-10-046-52/+41
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13422 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Adds buit-in groups to give specific permissions to anonymous and non ↵Jean-Philippe Lang2014-09-2818-43/+219
| | | | | | members users per project (#17976). git-svn-id: http://svn.redmine.org/redmine/trunk@13417 e93f8b46-1217-0410-a6f0-8f06a7374b81
* rename jQuery Datepicker i18n file nameToshi MARUYAMA2014-09-271-1/+1
| | | | | | | jquery-ui renamed these files. https://github.com/jquery/jquery-ui/commit/21154cfa2e02ef1814a6aff68b14553bdad165cb git-svn-id: http://svn.redmine.org/redmine/trunk@13415 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Ignore email keywords after truncation line (#8758).Jean-Philippe Lang2014-09-201-3/+3
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13413 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Expire other sessions on password change (#17796).Jean-Baptiste Barth2014-09-163-1/+17
| | | | | | | Contributed by Jan Schulz-Hofen. git-svn-id: http://svn.redmine.org/redmine/trunk@13412 e93f8b46-1217-0410-a6f0-8f06a7374b81
* remove trailing white-space from app/models/issue_custom_field.rbToshi MARUYAMA2014-09-161-1/+1
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13410 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Backport r13313 from rails-4.1 to trunk.Toshi MARUYAMA2014-09-149-11/+11
| | | | | | Upgrade to JQuery 1.11.1 git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Code cleanup (#17717).Jean-Philippe Lang2014-09-141-3/+5
| | | | git-svn-id: http://svn.redmine.org/redmine/trunk@13403 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Parent issue autocomplete does not follow to the "Allow cross-project ↵Jean-Philippe Lang2014-09-143-2/+24
| | | | | | subtasks" setting (#14281). git-svn-id: http://svn.redmine.org/redmine/trunk@13400 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: Issues counters in roadmap only link to issues in the same project ↵Jean-Philippe Lang2014-09-142-14/+32
| | | | | | | | (#9660). Contributed by Sridhar Dhanapalan. git-svn-id: http://svn.redmine.org/redmine/trunk@13398 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Invalidate security tokens on password or email changes (#17717).Jean-Baptiste Barth2014-09-141-1/+13
| | | | | | | Contributed by Jan Schulz-Hofen. git-svn-id: http://svn.redmine.org/redmine/trunk@13396 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Issue API: include is_private attribute in xml/json output (#10914).Jean-Philippe Lang2014-09-132-0/+2
| | | | | | Patch by Shivam Daryanani. git-svn-id: http://svn.redmine.org/redmine/trunk@13395 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Moves project sidebar content to a partial (#17380).Jean-Philippe Lang2014-09-132-11/+13
| | | | | | Patch by Jérôme BATAILLE. git-svn-id: http://svn.redmine.org/redmine/trunk@13393 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: The error flash message on session expiration is not in the language ↵Jean-Philippe Lang2014-09-131-3/+4
| | | | | | of the user but of the user of the previous request (#17023). git-svn-id: http://svn.redmine.org/redmine/trunk@13391 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Fixed: Files assigned to a version can not be deleted if Issue Tracking ↵Jean-Philippe Lang2014-09-131-0/+4
| | | | | | | | module is disabled (#17163). Patch by Michael Esemplare. git-svn-id: http://svn.redmine.org/redmine/trunk@13390 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Mark private notes more clearly (#16240).Jean-Baptiste Barth2014-09-091-1/+2
| | | | | | | Contributed by Jan Schulz-Hofen. git-svn-id: http://svn.redmine.org/redmine/trunk@13367 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Make 2nd parameter optional in User#allowed_to_globally? for consistency ↵Jean-Baptiste Barth2014-09-061-1/+5
| | | | | | (#6498). git-svn-id: http://svn.redmine.org/redmine/trunk@13364 e93f8b46-1217-0410-a6f0-8f06a7374b81
* Include enabled modules in projects API (#17602).Jean-Baptiste Barth2014-09-063-12/+23
| | | | | | | Contributed by Jan Schulz-Hofen <jan@plan.io> git-svn-id: http://svn.redmine.org/redmine/trunk@13363 e93f8b46-1217-0410-a6f0-8f06a7374b81