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: playframework/playframework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: doswell/playframework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 1 file changed
  • 1 contributor

Commits on Oct 28, 2013

  1. Correct conf and share/doc/api directory packaging in zip 

    When packaged on a windows system a blank directory would be setup in the zip file under the conf and share/doc/api directories. Windows explorer unzipping would prompt for a password entry when extracting these files. 7-zip would display these are a blank directory. ie, for the logging.xml file, it would display (in 7-zip) as conf\\logging.xml
When extracting on a non-Windows based system, the files under the conf and api doc directory would be preceded with a backslash (\) and would not extract correctly.
    @doswell
    doswell committed Oct 28, 2013
    Configuration menu
    Copy the full SHA
    aac0d31 View commit details
    Browse the repository at this point in the history

  2. Scalariform correction

    @doswell
    doswell committed Oct 28, 2013
    Configuration menu
    Copy the full SHA
    9b6d791 View commit details
    Browse the repository at this point in the history

  3. Correct conf and share/doc/api directory packaging in zip 

    When packaged on a windows system a blank directory would be setup in the
zip file under the conf and share/doc/api directories. Windows explorer
unzipping would prompt for a password entry when extracting these files.
7-zip would display these are a blank directory. ie, for the logging.xml
file, it would display (in 7-zip) as conf\logging.xml
When extracting on a non-Windows based system, the files under the conf
and api doc directory would be preceded with a backslash () and would not
extract correctly.

Tested on Windows, don't have a linux based system to try the packaging
on.
    @doswell
    doswell committed Oct 28, 2013
    Configuration menu
    Copy the full SHA
    bd0d6b9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/doswell/playframework

    @doswell
    doswell committed Oct 28, 2013
    Configuration menu
    Copy the full SHA
    f53b85f View commit details
    Browse the repository at this point in the history

  5. Squashed commit of the following: 

    commit 35bcde97f548cb5a4315d546f37d9882151c75ed
Author: doswell <doswell@gmail.com>
Date:   Mon Oct 28 18:32:43 2013 -0400

    Correct conf and share/doc/api directory packaging in zip

    When packaged on a windows system a blank directory would be setup in the zip file under the conf and share/doc/api directories. Windows explorer unzipping would prompt for a password entry when extracting these files.
    7-zip would display these are a blank directory. ie, for the logging.xml file, it would display (in 7-zip) as conf\\logging.xml
    When extracting on a non-Windows based system, the files under the conf and api doc directory would be preceded with a backslash (\) and would not extract correctly.
    @doswell
    doswell committed Oct 28, 2013
    Configuration menu
    Copy the full SHA
    19a7671 View commit details
    Browse the repository at this point in the history
Loading