[09:04] so, merging action… [09:04] inyoka [prod-sa06]: EnTeQuAk * c2ea80b26ed0:5088 inyoka/portal/user.py: merged with upstream [09:04] inyoka [prod-sa06]: EnTeQuAk * 88c36ad87c1f:5089 inyoka/portal/services.py: removed debug print [09:04] inyoka [prod-sa06]: soeren * 4c4dee21686c:5076 inyoka/portal/models.py: Added column in subscriptions to subscribe to other users. [09:04] inyoka [prod-sa06]: soeren * 74dbe5b6e99b:5077 inyoka/portal/migrations/0006_auto__add_field_subscription_member__add_unique_subscription_member_us.py: Added migration for subscriptions. [09:04] inyoka [prod-sa06]: soeren * 2d7e77d3b174:5078 inyoka/portal/ (views.py urls.py): Added views and urlpatterns to (un)subscribe to other users. [09:04] inyoka [prod-sa06]: soeren * 7a93fd8ede96:5079 inyoka/ (3 files in 2 dirs): Added notification for new topics of watched users. [09:04] inyoka [prod-sa06]: soeren * 686d9ef36a05:5080 inyoka/ (3 files in 2 dirs): Added notification for new posts of watched users. [09:04] inyoka [prod-sa06]: soeren * 1036a254bb5d:5081 inyoka/ (3 files in 2 dirs): Added "action" in get_absolute_url of user model for (un)subscribe, but action did not get passed to method in template with {{ user|url('subscribe') ... [09:04] inyoka [prod-sa06]: soeren * 73cf547569d2:5082 inyoka/portal/ (3 files in 2 dirs): Added (un)subscribe link in user profile, typofix in subscription model. [09:04] inyoka [prod-sa06]: soeren * d7a9a8b5041e:5083 inyoka/portal/templates/portal/profile.html: Typofix in template. [09:04] inyoka [prod-sa06]: soeren * 7f2abe44a3ed:5084 inyoka/portal/ (3 files in 2 dirs): Added PERMISSION to restrict the usage of subscribing to users. [09:04] inyoka [prod-sa06]: soeren * ea4ac8c183db:5085 inyoka/portal/templates/portal/usercp/subscriptions.html: Extended usercp/subscriptions to show user subscriptions. [09:04] inyoka [prod-sa06]: soeren * 7ee6e78ff1a7:5086 inyoka/portal/templates/portal/profile.html: Just fulfilled pit's wish of the label for "subscribe to user" :) [09:04] inyoka [prod-sa06]: EnTeQuAk * 8e950db446eb:5087 inyoka/ (6 files in 3 dirs): merged user-stalking feature from soeren/inyoka-prod-stalking [09:06] inyoka [prod-wikirewrite]: soeren * d7a9a8b5041e:5120 inyoka/portal/templates/portal/profile.html: Typofix in template. [09:06] inyoka [prod-wikirewrite]: soeren * 7f2abe44a3ed:5121 inyoka/portal/ (3 files in 2 dirs): Added PERMISSION to restrict the usage of subscribing to users. [09:06] inyoka [prod-wikirewrite]: soeren * ea4ac8c183db:5122 inyoka/portal/templates/portal/usercp/subscriptions.html: Extended usercp/subscriptions to show user subscriptions. [09:06] inyoka [prod-wikirewrite]: soeren * 7ee6e78ff1a7:5123 inyoka/portal/templates/portal/profile.html: Just fulfilled pit's wish of the label for "subscribe to user" :) [09:06] inyoka [prod-wikirewrite]: EnTeQuAk * 8e950db446eb:5124 inyoka/ (6 files in 3 dirs): merged user-stalking feature from soeren/inyoka-prod-stalking [09:06] inyoka [prod-wikirewrite]: EnTeQuAk * c2ea80b26ed0:5125 inyoka/portal/user.py: merged with upstream [09:06] inyoka [prod-wikirewrite]: EnTeQuAk * 88c36ad87c1f:5126 inyoka/portal/services.py: removed debug print [09:06] inyoka [prod-wikirewrite]: EnTeQuAk * 6f5021701774:5127 inyoka/ (3 files in 2 dirs): merged with upstream [09:06] inyoka [prod-wikirewrite]: apollo13 * 1770a05313cd:5099 inyoka/wiki/models.py: pass bytestrings into ctypes for filenames, as our python-magic implementation expects bytestrings [09:06] inyoka [prod-wikirewrite]: apollo13 * 5d10a215a8ee:5100 inyoka/ (wiki/models.py utils/magic.py): make inyoka.utils.magic.from_file unicode aware. (Note: The ctype funcs still expect byte strings, so always use from_file instead of magic_file) [09:06] inyoka [prod-wikirewrite]: intrepid * a78fc77b1055:5101 inyoka/static/style/planet.css: Planet: Round corners for Opera [09:06] inyoka [prod-wikirewrite]: intrepid * c632f393b9e9:5102 inyoka/static/style/planet.css: Automated merge with ssh://bitbucket.org/EnTeQuAk/inyoka-prod-sa06 [09:06] inyoka [prod-wikirewrite]: intrepid * a8c5d303fb61:5103 inyoka/static/img/planet/bubble-nipple.png: Planet bubble-nipple color transition [09:06] inyoka [prod-wikirewrite]: intrepid * ebd9eb864913:5104 inyoka/static/style/ (forum-sprite.css main.css): Smartsprite CSS changes [09:06] inyoka [prod-wikirewrite]: apollo13 * 97e73278108e:5105 inyoka/wiki/actions.py: guard Django ORM Query in a try/catch, so creating new pages works again (this fixes the regression introduced by e61ee0d9f5ae) [09:06] inyoka [prod-wikirewrite]: apollo13 * dfb6a84d15a9:5106 inyoka/static/js/ (FeedSelector.min.js FeedSelector.js): fix Feedselector.js which had some syntax errors, wth did noone notice? [09:06] inyoka [prod-wikirewrite]: apollo13 * 92a082247205:5107 inyoka/forum/models.py: (Re-)Add ordering in forum feed [09:06] inyoka [prod-wikirewrite]: apollo13 * 14e6ae6e9c1e:5108 inyoka/admin/templates/admin/planet_edit.html: Fix the is_active flag in the planet_edit admin template, fixes #210 [09:06] inyoka [prod-wikirewrite]: apollo13 * bf0ca7089884:5109 (12 files in 2 dirs): add a compile_css command to the fabfile; requires java [09:06] inyoka [prod-wikirewrite]: apollo13 * c22cb140b54a:5110 inyoka/ (4 files in 3 dirs): use urlsafe_username for some links in the admin cp, this fixes #201 [09:06] inyoka [prod-wikirewrite]: intrepid * 891255b0bd07:5111 inyoka/static/style/planet.css: Lowered line-height for planet headlines. Fixes #209 [09:06] inyoka [prod-wikirewrite]: soeren * d2f36014ca08:5112 inyoka/ (6 files in 5 dirs): Send the current component with toggle_sidebar and save them individually, fixes #206. [09:06] inyoka [prod-wikirewrite]: soeren * 4c4dee21686c:5113 inyoka/portal/models.py: Added column in subscriptions to subscribe to other users. [09:06] inyoka [prod-wikirewrite]: soeren * 74dbe5b6e99b:5114 inyoka/portal/migrations/0006_auto__add_field_subscription_member__add_unique_subscription_member_us.py: Added migration for subscriptions. [09:06] inyoka [prod-wikirewrite]: soeren * 2d7e77d3b174:5115 inyoka/portal/ (views.py urls.py): Added views and urlpatterns to (un)subscribe to other users. [09:06] inyoka [prod-wikirewrite]: soeren * 7a93fd8ede96:5116 inyoka/ (3 files in 2 dirs): Added notification for new topics of watched users. [09:06] inyoka [prod-wikirewrite]: soeren * 686d9ef36a05:5117 inyoka/ (3 files in 2 dirs): Added notification for new posts of watched users. [09:06] inyoka [prod-wikirewrite]: soeren * 1036a254bb5d:5118 inyoka/ (3 files in 2 dirs): Added "action" in get_absolute_url of user model for (un)subscribe, but action did not get passed to method in template with {{ user|url('subscribe') ... [09:06] inyoka [prod-wikirewrite]: soeren * 73cf547569d2:5119 inyoka/portal/ (3 files in 2 dirs): Added (un)subscribe link in user profile, typofix in subscription model. [09:35] inyoka [prod-sa06]: EnTeQuAk * d43aa43e4afc:5090 inyoka/forum/views.py: Fixed NoResultFound exception when something tries to unsubscribe a slug that does not exist anymore. This is a bit ugly but the only way to ... [09:35] inyoka [prod-sa06]: EnTeQuAk * c919cd07d58a:5091 inyoka/forum/models.py: fixed typo in Forum.split() [09:55] mag mir bitte jemand lesezugriff auf prod-wikirewrite geben? [09:56] un WZT mach der logbot von Ubuntu hier?