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: ASKBOT/askbot-devel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pirave/askbot-devel
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.
  • 9 commits
  • 226 files changed
  • 1 contributor

Commits on Jun 3, 2015

  1. renaming migrations to south_migrations to work with django 1.7; upda… 

    …ted requirments
    @pirave
    pirave committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    bc92c6e View commit details
    Browse the repository at this point in the history

  2. Updating simplejson imports to use json

    @pirave
    pirave committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    98a46e8 View commit details
    Browse the repository at this point in the history

  3. Allowing 1.6 and 1.7 with corresponding python version in askbot test

    @pirave
    pirave committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    93522ab View commit details
    Browse the repository at this point in the history

  4. Added backwards compatibility for md5_constructor and truncate_html_w… 

    …ords
    @pirave
    pirave committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    d933ee4 View commit details
    Browse the repository at this point in the history

  5. Removing regestering User to followit, unsupported in django 1.7

    @pirave
    pirave committed Jun 3, 2015
    Configuration menu
    Copy the full SHA
    bfdc300 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2015

  1. Fixed max value in forms; Updated depecrated libraries and calls

    @pirave
    pirave committed Jun 4, 2015
    Configuration menu
    Copy the full SHA
    669bee3 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2015

  1. Fixing issue with app_label

    @pirave
    pirave committed Jun 15, 2015
    Configuration menu
    Copy the full SHA
    609af54 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2015

  1. related_name; include package path for livesettings in url

    @pirave
    pirave committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    0952b3c View commit details
    Browse the repository at this point in the history

  2. Merging upstream

    @pirave
    pirave committed Jun 17, 2015
    Configuration menu
    Copy the full SHA
    c783be9 View commit details
    Browse the repository at this point in the history
Loading