Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: redmine/redmine
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: occ-corp/redmine
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2.6/occ
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 71 files changed
  • 5 contributors

Commits on Oct 12, 2014

  1. Added 2.6-stable branch. 

    git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13437 e93f8b46-1217-0410-a6f0-8f06a7374b81
    @jplang
    jplang committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    32f67a5 View commit details
    Browse the repository at this point in the history

  2. Set version to stable. 

    git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13438 e93f8b46-1217-0410-a6f0-8f06a7374b81
    @jplang
    jplang committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    0b34d5e View commit details
    Browse the repository at this point in the history

  3. Merged r13439 from trunk to 2.6-stable (#18069) 

    Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13440 e93f8b46-1217-0410-a6f0-8f06a7374b81
    Toshi MARUYAMA committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    93d43cf View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2014

  1. Merged r13457 from trunk to 2.6-stable (#14491) 

    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
    Toshi MARUYAMA committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    ebd3435 View commit details
    Browse the repository at this point in the history

  2. Merged r13458 from trunk to 2.6-stable (#13781) 

    pdf: define "general_pdf_fontname" at i18n yaml for multilingual environment.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13460 e93f8b46-1217-0410-a6f0-8f06a7374b81
    Toshi MARUYAMA committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    5bbcc06 View commit details
    Browse the repository at this point in the history

  3. Merged r13450 (#18110). 

    git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13462 e93f8b46-1217-0410-a6f0-8f06a7374b81
    @jplang
    jplang committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    778625d View commit details
    Browse the repository at this point in the history

  4. Merged r13451 (#18119). 

    git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13463 e93f8b46-1217-0410-a6f0-8f06a7374b81
    @jplang
    jplang committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    3a0a55c View commit details
    Browse the repository at this point in the history

  5. Merged r13464 (#18144). 

    git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13465 e93f8b46-1217-0410-a6f0-8f06a7374b81
    @jplang
    jplang committed Oct 20, 2014
    Configuration menu
    Copy the full SHA
    178c7da View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2014

  1. Merged r13471. 

    git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13472 e93f8b46-1217-0410-a6f0-8f06a7374b81
    @jplang
    jplang committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    05c2cea View commit details
    Browse the repository at this point in the history

  2. tagged version 2.6.0 

    git-svn-id: http://svn.redmine.org/redmine/tags/2.6.0@13475 e93f8b46-1217-0410-a6f0-8f06a7374b81
    @jplang
    jplang committed Oct 21, 2014
    Configuration menu
    Copy the full SHA
    1d1afd9 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2014

  1. add plugins 

    $ git submodule add -f https://github.com/occ-corp/redmine_custom_field_aggregator plugins/redmine_custom_field_aggregator
$ git submodule add -f https://github.com/Tomohiro/redmine_text_format_selector plugins/redmine_text_format_selector
$ git submodule add -f https://github.com/occ-corp/redmine_gantt_view_overwrite plugins/redmine_gantt_view_overwrite
$ git submodule init
$ git submodule update
    Yusaku ONO committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    2eea6bc View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4 from occ-corp/add_plugins

    @tomohiro
    tomohiro committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    bfa1307 View commit details
    Browse the repository at this point in the history

  3. add themes

    Yusaku ONO committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    133c74f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from occ-corp/add_themes

    @tomohiro
    tomohiro committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    1720635 View commit details
    Browse the repository at this point in the history

  5. disable html escaping for markdown

    Yusaku ONO committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    caced6e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #6 from occ-corp/disable_html_escape

    @tomohiro
    tomohiro committed Dec 5, 2014
    Configuration menu
    Copy the full SHA
    bf92f1b View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2015

  1. add csv_import_issues plugin

    @yono
    yono committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    3b08716 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from occ-corp/add_csv_import_issues_plugin 

    add csv_import_issues plugin
    @tomohiro
    tomohiro committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    8723e3e View commit details
    Browse the repository at this point in the history
Loading