Public Git Hosting - mygpo.git/commit

commit	ee6853a15d3bc42e8ce6f964a046d33b85ccad9c
author	Stefan Kögl <stefan@skoegl.net>
	Thu, 28 Apr 2011 13:14:23 +0000 (28 16:14 +0300)
committer	Stefan Kögl <stefan@skoegl.net>
	Thu, 28 Apr 2011 13:14:23 +0000 (28 16:14 +0300)
tree	bcf5d7c0eb97f93d12d5edadbfcbff0512b9bde5	tree \| snapshot (tar.gz zip)
parent	5ba3f32645fece4ec89823e66cb7957ae35ea518	commit \| diff
parent	24d345a259eaee44aa4eb9bba74a50e5e54c529c	commit \| diff

Merge branch 'couchdb-episode-states' into couchdb

Migrates EpisodeActions into CouchDB based EpisodeUserStates

Conflicts:
mygpo/core/models.py
mygpo/directory/views.py
mygpo/users/models.py
mygpo/utils.py

htdocs/media/screen.css	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/directory.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/models/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/simple.py	diff1 \|	diff2 \|	blob \| history
mygpo/core/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/episode_toplist.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/migrate.py	diff1 \|	diff2 \|	blob \| history
mygpo/utils.py	diff1 \|	diff2 \|	blob \| history

gpodder.net is a webservice that connects podcast players

RSS Atom

htdocs/media/screen.css	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/directory.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/models/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/simple.py	diff1 \|	diff2 \|	blob \| history
mygpo/core/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/episode_toplist.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/migrate.py	diff1 \|	diff2 \|	blob \| history
mygpo/utils.py	diff1 \|	diff2 \|	blob \| history