forked from benadida/helios-server
-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
update to upstream/master #61
Open
stanley89
wants to merge
232
commits into
pirati-cz:master
Choose a base branch
from
benadida:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated psycopg2 version to latest as the previous one did not work on Heroku.
Updated psycopg2 version to latest
Use syntax from new django-webtest package. Fixes issue #8
Merge from benadida master repo
If you try to verify a election and you aren't allowed, you get the following error. This is because it is expected a JSON result and you get, for instance, a html page to login. VM65:1 Uncaught SyntaxError: Unexpected token < in JSON at position 0 at JSON.parse (<anonymous>) at Function.HELIOS.Election.fromJSONString (helios.js:127) at Object.success (verify.html?election_url=/helios/elections/258ca6b1-afa4-49a3-b484-c31679d2ebbe:100) at success (jquery-1.2.2.min.js:28) at onreadystatechange (jquery-1.2.2.min.js:27)
Step toward future django version upgrade Currently, the following warning is received: RemovedInDjango19Warning: `request.REQUEST` is deprecated, use `request.GET` or `request.POST` instead.
…te_election Catch non json results when verifying election
Make cast vote email a template
Add a proper label so you can easily make selections.
View voter list as it is in voter file upload
….REQUEST_is_deprecated Alter request.REQUEST to request.GET
From https://icon-library.com/icon/ldap-icon-6.html.html>Ldap Icon # 353936
…ully cast just yet.
This reverts commit 65e30cf.
…ngo.urls.re_path or path instead
…oved, using gettext()
…ispatch.Signal is removed
…plate tags are removed
update celery call in worker to 5.0 style
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.