Closed dbrgn closed 10 years ago
Please rebase the branch to our current master. The commits that are already merged should automatically disappear.
Please rebase the branch to our current master. The commits that are already merged should automatically disappear.
Oops, it wasn't already rebased? Strange. I already wondered why there were so many new commits in this PR :) We'll do the rebase soon, together with the other changes.
Branch has been rebased against upstream master.
Great, thanks.
Features
This pull request includes many changes, including:
Caveats
These things were enabled to facilitate testing. If you want us to remove them for security reasons, let us know and we'll add them to this pull request. If not, we'll change those issues with the last pull request during this project.
Upgrade Notes
If you've already installed a version that contains django-dajaxice-ng, you should uninstall it before upgrading to the new requirements. This is necessary because we switched from django-dajaxice-ng to django-dajaxice. These two packages are conflicting.
If you have an already existing database and don't want to switch to the included default database, we provided a SQL script (https://github.com/tnc-ba/strongTNC/blob/integration4/scripts/fix_db.sql) that fixes the following issues:
COLLATE NOCASE
to some of the columns to enable natural sortingtrusted
fieldTo apply, first create a backup of the current database and then run the following commands: