Skip to content

Commit

Permalink
Merge pull request #24 from kuboschek/tom
Browse files Browse the repository at this point in the history
Update openjub domain
  • Loading branch information
tkw1536 committed May 13, 2016
2 parents 12066a5 + b82c826 commit 0501a36
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions doc/help.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ Any field in the user profile object can be used in a primitive filter expressio
"lastName": "Kuboschek",
"fullName": "Leonhard Kuboschek",
"country": "Germany",
"flag": "https://api.jacobs-cs.club/flags/Germany.png",
"picture": "https://api.jacobs-cs.club/user/image/lkuboschek/image.jpg",
"flag": "https://api.jacobs.university/flags/Germany.png",
"picture": "https://api.jacobs.university/user/image/lkuboschek/image.jpg",
"college": "Nordmetall",
"phone": "6210",
"room": "NB-351",
Expand Down
2 changes: 1 addition & 1 deletion templates/help/help.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h4 id="logic">Logic</h4>
</ul>
<h4 id="user-profile-fields">User profile fields</h4>
<p>Any field in the user profile object can be used in a primitive filter expression. A sample user is provided below.</p>
<pre class="editor-colors lang-text"><div class="line"><span class="text plain"><span class="meta paragraph text"><span>{</span></span></span></div><div class="line"><span class="text plain"><span>&nbsp;&nbsp;</span><span class="meta paragraph text"><span>&quot;eid&quot;:&nbsp;&quot;39126&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;email&quot;:&nbsp;&quot;[email protected]&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;username&quot;:&nbsp;&quot;lkuboschek&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;active&quot;:&nbsp;true,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;firstName&quot;:&nbsp;&quot;Leonhard&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;lastName&quot;:&nbsp;&quot;Kuboschek&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;fullName&quot;:&nbsp;&quot;Leonhard&nbsp;Kuboschek&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;country&quot;:&nbsp;&quot;Germany&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;flag&quot;:&nbsp;&quot;</span><span class="markup underline link https hyperlink"><span>https://api.jacobs-cs.club/flags/Germany.png</span></span><span>&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;picture&quot;:&nbsp;&quot;</span><span class="markup underline link https hyperlink"><span>https://api.jacobs-cs.club/user/image/lkuboschek/image.jpg</span></span><span>&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;college&quot;:&nbsp;&quot;Nordmetall&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;phone&quot;:&nbsp;&quot;6210&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;room&quot;:&nbsp;&quot;</span><span class="storage type class nb"><span>NB</span></span><span>-351&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isCampusPhone&quot;:&nbsp;true,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;type&quot;:&nbsp;[</span></span></span></div><div class="line"><span class="text plain"><span>&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="meta paragraph text"><span>&quot;Student&quot;</span></span></span></div><div class="line"><span class="text plain"><span>&nbsp;&nbsp;</span><span class="meta paragraph text"><span>],</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isStudent&quot;:&nbsp;true,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isFaculty&quot;:&nbsp;false,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isStaff&quot;:&nbsp;false,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;description&quot;:&nbsp;&quot;ug&nbsp;17&nbsp;CS&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;status&quot;:&nbsp;&quot;undergrad&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;year&quot;:&nbsp;&quot;17&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;majorShort&quot;:&nbsp;&quot;CS&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;major&quot;:&nbsp;&quot;Computer&nbsp;Science&quot;</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>}</span></span></span></div></pre><h1 id="votes">Votes</h1>
<pre class="editor-colors lang-text"><div class="line"><span class="text plain"><span class="meta paragraph text"><span>{</span></span></span></div><div class="line"><span class="text plain"><span>&nbsp;&nbsp;</span><span class="meta paragraph text"><span>&quot;eid&quot;:&nbsp;&quot;39126&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;email&quot;:&nbsp;&quot;[email protected]&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;username&quot;:&nbsp;&quot;lkuboschek&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;active&quot;:&nbsp;true,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;firstName&quot;:&nbsp;&quot;Leonhard&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;lastName&quot;:&nbsp;&quot;Kuboschek&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;fullName&quot;:&nbsp;&quot;Leonhard&nbsp;Kuboschek&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;country&quot;:&nbsp;&quot;Germany&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;flag&quot;:&nbsp;&quot;</span><span class="markup underline link https hyperlink"><span>https://api.jacobs.university/flags/Germany.png</span></span><span>&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;picture&quot;:&nbsp;&quot;</span><span class="markup underline link https hyperlink"><span>https://api.jacobs.university/user/image/lkuboschek/image.jpg</span></span><span>&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;college&quot;:&nbsp;&quot;Nordmetall&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;phone&quot;:&nbsp;&quot;6210&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;room&quot;:&nbsp;&quot;</span><span class="storage type class nb"><span>NB</span></span><span>-351&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isCampusPhone&quot;:&nbsp;true,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;type&quot;:&nbsp;[</span></span></span></div><div class="line"><span class="text plain"><span>&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="meta paragraph text"><span>&quot;Student&quot;</span></span></span></div><div class="line"><span class="text plain"><span>&nbsp;&nbsp;</span><span class="meta paragraph text"><span>],</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isStudent&quot;:&nbsp;true,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isFaculty&quot;:&nbsp;false,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;isStaff&quot;:&nbsp;false,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;description&quot;:&nbsp;&quot;ug&nbsp;17&nbsp;CS&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;status&quot;:&nbsp;&quot;undergrad&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;year&quot;:&nbsp;&quot;17&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;majorShort&quot;:&nbsp;&quot;CS&quot;,</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>&nbsp;&nbsp;&quot;major&quot;:&nbsp;&quot;Computer&nbsp;Science&quot;</span></span></span></div><div class="line"><span class="text plain"><span class="meta paragraph text"><span>}</span></span></span></div></pre><h1 id="votes">Votes</h1>
<h4 id="staging">Staging</h4>
<p>Votes have 5 stages that are activated in the following order:</p>
<h5 id="init">Init</h5>
Expand Down
2 changes: 1 addition & 1 deletion users/ojub_auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import requests

OPENJUB_BASE = "https://api.jacobs-cs.club/"
OPENJUB_BASE = "https://api.jacobs.university/"

class OjubBackend(object):
"""
Expand Down

0 comments on commit 0501a36

Please sign in to comment.