require module version

pyparsing 2 is for python3
markdown 2.3 and beyond targets python 2.6 and beyond

So, while tiddlyspace targets 2.5, this is what we've got.
Badly need to change this.
Merge branch 'master' of github.com:TiddlySpace/tiddlyspace
Include TidddlyFileImporter locallly, annotate about inclusion

The plugin depends on tiddlyspace so may as well be local.

In the process annotate the URL form field with a reference
to inclusion. See:

  https://github.com/bengillies/tiddlyweb-client-plugins/pull/6

which was done shortly before moving the code into this repo.
fix missing status variable declaration in setBag.
setBag: refreshIcon(status) needs to be valid. FireFox 20 caused a problem
Merge pull request #1034 from pmario/fix-ToggleTiddlerPrivacyPlugin

fix missing status variable declaration in setBag.
rename status variables to tiddlerStatus and bagStatus

using the irrefutable logic of: if my editor colors the
variable name as a keyword, then I shouldn't use this as
a variable name.
some jslint cleanups to a recently bugfixed tiddlywiki plugin

This certainly doesn't get all the issues, but tidies things
up a bit. Due to TiddlyWiki's use of lots of globals it's never
gonna be complete.

We should probably do this on most of the plugins. If we had the
problem that was fixed by 2f6413b73d76a529c15b22cc666bcc41491af39e
would have been found by linting.
release 1.2.2

* fix from @pmario for ToggleTiddlerPrivacyPlugin in Firefox20
* Warn about inclusion in the import backstage.
release 1.2.3

* current versions of selector, feedgenerator and Markdown will
  not work with Python 2.5
Merge branch 'master' of github.com:TiddlySpace/tiddlyspace

Conflicts:
	setup.py
Proper configuration settings for modern mysql/mariadb

We do want to use_unicode and we want a utf8mb4 charset.

This will allow all unicode planes.
Ensure test database is recreated with proper collation

Otherwise a tiddler named 'One Two' is the same as 'one two',
which we do not want.

Also update setup.py to reflect our plan to use modern python.
Clarify and constrain test environment

I'm not sure when, but at some point the test_environment
lost track of where its templates were and stopped using
the correct database configuration when starting up.

These changes make sure that

* templates and the current code are linked into the test_instance
* the test_instance uses the right database settings
* the Session for the current test module is freshly configured
* that we don't recursively generate test_instances within each
  one

This is one of a few different instances of

* how did it ever work right before
* these tests are just wrong and we ought to make them right

This solution was reached by trial and error and was only discovered
because when manipulating templates for tests the changed templates
were not being reflected in the tests.
Fix links in profiles

fix #1038

This addresses to separate but related issues:

1. recently changed tiddler lists were non-friendly, non-space
   links, now they are
2. wikilinks in the profile text, when relative (markdown, twikifier)
   were going to 404 because they are looked for in tiddlyspace.com/profiles

Fix 2 was relatively straightforward: adding a <base> pointing
to the user's space. This gets behavior that is similar to what would
happen if the profile was viewed in the user's space.

Fix 1 was weird. Simply adding 'friendly=True' to the tiddler_url call
when listing tiddlers didn't work. This is because the fixups were
not applying in the profile module. Viewing the diff indicates the
necessary changes.

This change also adds a title to the profile page. Apparently this
had never been there.
make tiddlyweb.css local and set type to text/css

fix #1039

see also #1041

also set type on profile.css
Merge branch 'master' into server3
require modern twp.mysql3 for utf8mb4
update docs related mysql
release 1.2.4

* updated to use modern MySQL
* updated to use modern Python
* corrections for link handling in /profiles
* corrected test handling
* better mime type on some CSS files
urllib.getcode() returns an int