Commit e46a01794cb7166ef252ec031d5383d004beb1ce
Exists in
master
and in
39 other branches
Merge branch 'master' into xmpp_password
Showing
5 changed files
with
43 additions
and
2 deletions
Show diff stats
puppet/modules/colab/templates/nginx/site_default.erb
... | ... | @@ -40,6 +40,14 @@ server { |
40 | 40 | proxy_pass http://10.1.2.81; |
41 | 41 | } |
42 | 42 | |
43 | + location /ci/static { | |
44 | + proxy_pass http://10.1.2.171:8080; | |
45 | + } | |
46 | + | |
47 | + location /ci/adjuncts { | |
48 | + proxy_pass http://10.1.2.171:8080; | |
49 | + } | |
50 | + | |
43 | 51 | location / { |
44 | 52 | try_files /home/colab/colab/www$uri @django; |
45 | 53 | } | ... | ... |
requirements.txt
src/accounts/views.py
... | ... | @@ -129,6 +129,14 @@ class ManageUserSubscriptionsView(UserProfileBaseMixin, DetailView): |
129 | 129 | http_method_names = [u'get', u'post'] |
130 | 130 | template_name = u'accounts/manage_subscriptions.html' |
131 | 131 | |
132 | + def get_object(self, *args, **kwargs): | |
133 | + obj = super(ManageUserSubscriptionsView, self).get_object(*args, | |
134 | + **kwargs) | |
135 | + if self.request.user != obj and not self.request.user.is_superuser: | |
136 | + raise PermissionDenied | |
137 | + | |
138 | + return obj | |
139 | + | |
132 | 140 | def post(self, request, *args, **kwargs): |
133 | 141 | user = self.get_object() |
134 | 142 | for email in user.emails.values_list('address', flat=True): | ... | ... |
... | ... | @@ -0,0 +1,25 @@ |
1 | +<rules | |
2 | + xmlns="http://namespaces.plone.org/diazo" | |
3 | + xmlns:css="http://namespaces.plone.org/diazo/css" | |
4 | + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> | |
5 | + | |
6 | + <before theme-children="/html/head" content-children="/html/head" /> | |
7 | + <before css:theme-children="#main-content" css:content-children="body" /> | |
8 | + | |
9 | + <merge attributes="class" css:theme="body" css:content="body" /> | |
10 | + <drop css:content="#top-panel" /> | |
11 | + | |
12 | + <after theme-children="/html/head"> | |
13 | + <script>jQuery.noConflict();</script> | |
14 | + <style> | |
15 | + #breadcrumbs { | |
16 | + border: 0 !important; | |
17 | + } | |
18 | + | |
19 | + #right-top-nav { | |
20 | + margin-right: 5em !important; | |
21 | + } | |
22 | + </style> | |
23 | + </after> | |
24 | + | |
25 | +</rules> | ... | ... |
src/tz/templates/tz/set_utc_offset.html