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: Learn2CodeOrg/sharee
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ca0852a
Choose a base ref
...
head repository: Learn2CodeOrg/sharee
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1978ffa
Choose a head ref
  • 20 commits
  • 12 files changed
  • 2 contributors

Commits on Jul 18, 2016

  1. Merge pull request #1 from Learn2CodeOrg/test-codeship 

    Test codeship
    Dominik Horniak
    Dominik Horniak authored Jul 18, 2016
    Configuration menu
    Copy the full SHA
    6d9dffe View commit details
    Browse the repository at this point in the history

  2. Commented fail tests

    Dominik Horniak
    Dominik Horniak committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    929f7d0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:Learn2CodeOrg/sharee into develop

    Dominik Horniak
    Dominik Horniak committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    8ff86fc View commit details
    Browse the repository at this point in the history

  4. Added basic http authentication --skip-ci

    Dominik Horniak
    Dominik Horniak committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    582cd4a View commit details
    Browse the repository at this point in the history

  5. Added referer email to merchant show campaign --skip-ci

    Dominik Horniak
    Dominik Horniak committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    20339ba View commit details
    Browse the repository at this point in the history

  6. Fixed commissions controller --skip-ci

    Dominik Horniak
    Dominik Horniak committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    7ad10e6 View commit details
    Browse the repository at this point in the history

  7. Used single quotes in http basic auth args --skip-ci

    mtakac
    mtakac committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    746daae View commit details
    Browse the repository at this point in the history

  8. Temporary commented out 'creating_links_spec.rb' --skip-ci

    mtakac
    mtakac committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    247ad31 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2 from Learn2CodeOrg/basic-http-auth 

    Add basic HTTP auth
    Marek Takac
    Marek Takac authored Jul 18, 2016
    Configuration menu
    Copy the full SHA
    9565190 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into add-user-referer

    mtakac
    mtakac committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    cfe9be5 View commit details
    Browse the repository at this point in the history

  11. Fixes in campaign link index table headers --skip-ci

    mtakac
    mtakac committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    3d11a3d View commit details
    Browse the repository at this point in the history

  12. Merge pull request #3 from Learn2CodeOrg/add-user-referer 

    Add referer email to merchant campaign show
    Marek Takac
    Marek Takac authored Jul 18, 2016
    Configuration menu
    Copy the full SHA
    020c738 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'develop' into payment-redirect

    mtakac
    mtakac committed Jul 18, 2016
    Configuration menu
    Copy the full SHA
    8225e3e View commit details
    Browse the repository at this point in the history

  14. Merge pull request #4 from Learn2CodeOrg/payment-redirect 

    Fix referer commission
    Marek Takac
    Marek Takac authored Jul 18, 2016
    Configuration menu
    Copy the full SHA
    95b4876 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2016

  1. Bugfix in sharee button initialization

    mtakac
    mtakac committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    5e0ac96 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into develop

    mtakac
    mtakac committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    25dbbac View commit details
    Browse the repository at this point in the history

  3. Bugfix in sharee button initialization

    mtakac
    mtakac committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    e99a368 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into develop

    mtakac
    mtakac committed Jul 19, 2016
    Configuration menu
    Copy the full SHA
    2b38b02 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2016

  1. Fixed sharee public JS script

    Dominik Horniak
    Dominik Horniak committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    6675c3a View commit details
    Browse the repository at this point in the history

  2. Deleted consolelog from sharee.js

    Dominik Horniak
    Dominik Horniak committed Jul 22, 2016
    Configuration menu
    Copy the full SHA
    1978ffa View commit details
    Browse the repository at this point in the history
Loading