Public Git Hosting - mygpo.git/commit

commit	069d940a9400cc8bb4ed61a45c0b8aa6edbcc656
author	Stefan Kögl <stefan@skoegl.net>
	Sat, 1 Sep 2012 20:10:51 +0000 (1 22:10 +0200)
committer	Stefan Kögl <stefan@skoegl.net>
	Sat, 1 Sep 2012 20:10:51 +0000 (1 22:10 +0200)
tree	43c0a6c9650c87005d4c017583bd3b1b4825d383	tree \| snapshot (tar.gz zip)
parent	5d8567ce23d5efccc9606d79506a30f339e4b2e8	commit \| diff
parent	92745c24e09ed7d4aebf1503781a2a0f1e847be7	commit \| diff

Merge branch 'master' into design

Conflicts:
couchdb/_design/listeners/views/by_user/map.js
htdocs/media/screen.css
mygpo/api/advanced/__init__.py
mygpo/api/backend.py
mygpo/directory/templates/episode_toplist.html
mygpo/share/urls.py
mygpo/share/views.py
mygpo/users/models.py
mygpo/web/templates/share.html
mygpo/web/templatetags/menu.py
mygpo/web/views/episode.py

31 files changed:

htdocs/media/screen.css	diff1 \|	diff2 \|	blob \| history
mygpo/api/advanced/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/api/backend.py	diff1 \|	diff2 \|	blob \| history
mygpo/core/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/couch.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/tags.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/directory.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/episode_toplist.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/podcast_lists.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/search.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/toplist.html	diff1 \|	diff2 \|	blob \| history
mygpo/maintenance/management/commands/dump-sample.py	diff1 \|	diff2 \|	blob \| history
mygpo/publisher/templates/publisher/episodes.html	diff1 \|	diff2 \|	blob \| history
mygpo/share/templates/list.html	diff1 \|	diff2 \|	blob \| history
mygpo/share/templates/list_search.html	diff1 \|	diff2 \|	blob \| history
mygpo/share/templates/share/overview.html	\|	diff2 \|	blob \| history
mygpo/share/templates/userpage.html	\|	diff2 \|	blob \| history
mygpo/share/urls.py	diff1 \|	diff2 \|	blob \| history
mygpo/share/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/templates/podcast.html	diff1 \|	diff2 \|	blob \| history
mygpo/web/templates/user_subscriptions.html	diff1 \|	diff2 \|	blob \| history
mygpo/web/templatetags/charts.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/templatetags/menu.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/urls.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/utils.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/episode.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/podcast.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/subscriptions.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/backend.py	diff1 \|	diff2 \|	blob \| history
mygpo/core/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/couch.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/tags.py	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/directory.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/episode_toplist.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/podcast_lists.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/search.html	diff1 \|	diff2 \|	blob \| history
mygpo/directory/templates/toplist.html	diff1 \|	diff2 \|	blob \| history
mygpo/maintenance/management/commands/dump-sample.py	diff1 \|	diff2 \|	blob \| history
mygpo/publisher/templates/publisher/episodes.html	diff1 \|	diff2 \|	blob \| history
mygpo/share/templates/list.html	diff1 \|	diff2 \|	blob \| history
mygpo/share/templates/list_search.html	diff1 \|	diff2 \|	blob \| history
mygpo/share/templates/share/overview.html	\|	diff2 \|	blob \| history
mygpo/share/templates/userpage.html	\|	diff2 \|	blob \| history
mygpo/share/urls.py	diff1 \|	diff2 \|	blob \| history
mygpo/share/views.py	diff1 \|	diff2 \|	blob \| history
mygpo/users/models.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/templates/podcast.html	diff1 \|	diff2 \|	blob \| history
mygpo/web/templates/user_subscriptions.html	diff1 \|	diff2 \|	blob \| history
mygpo/web/templatetags/charts.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/templatetags/menu.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/urls.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/utils.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/__init__.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/episode.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/podcast.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/settings.py	diff1 \|	diff2 \|	blob \| history
mygpo/web/views/subscriptions.py	diff1 \|	diff2 \|	blob \| history