Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit 80d139805199a0e46b078cffce99989b910d5433
- Author: farhaanbukhsh <farhaan.bukhsh@gmail.com>
- Date: Thu Sep 24 04:52:37 2015 +0530
- Adding deatils related to end of submission beside the election button
- commit 37f3d91187d14dbf041991fa343e629e6ed68d07
- Author: Micah Abbott <miabbott@redhat.com>
- Date: Thu Sep 17 10:57:23 2015 -0400
- # This is a combination of 4 commits.
- # The first commit's message is:
- Fix incorrect FAS URLs
- I found a couple instances where the URL to the FAS page was pointing to
- the wrong location. This change fixes the URL to the right spot.
- Signed-off-by: Micah Abbott <miabbott@redhat.com>
- # This is the 2nd commit message:
- tried to fix issue#75
- # This is the 3rd commit message:
- Try to fix issue#75
- # This is the 4th commit message:
- Adding deatils related to end of submission beside the election button
- diff --git a/nuancier/templates/contribute_index.html b/nuancier/templates/contribute_index.html
- index d07ab79..3bcfb52 100644
- --- a/nuancier/templates/contribute_index.html
- +++ b/nuancier/templates/contribute_index.html
- @@ -169,6 +169,8 @@
- <a class="large_button" href="{{ url_for('contribute', election_id=election.id) }}">
- {{ election.election_name }} - {{ election.election_year }}
- </a>
- + <span>Submission ends on : </span>
- + {{ election.election_date_start }}
- </li>
- {% endfor %}
- </ul>
- diff --git a/nuancier/templates/elections_list.html b/nuancier/templates/elections_list.html
- index cde1d93..8f852ae 100644
- --- a/nuancier/templates/elections_list.html
- +++ b/nuancier/templates/elections_list.html
- @@ -15,7 +15,7 @@
- <p>
- <span class="warning">Only Fedora contributors can vote.</span>
- A contributor is defined by someone having an account on
- - <a href="https://admin.fedoraproject.org/account">FAS</a>, having signed
- + <a href="https://admin.fedoraproject.org/accounts">FAS</a>, having signed
- the <a href="https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement"
- >FPCA</a> and being in one additional group.
- </p>
- diff --git a/nuancier/templates/index.html b/nuancier/templates/index.html
- index 64403d6..7f5aa39 100644
- --- a/nuancier/templates/index.html
- +++ b/nuancier/templates/index.html
- @@ -52,7 +52,7 @@ wallpapers included in Fedora.
- <p>
- <span class="warning">Only Fedora contributors can vote.</span>
- A contributor is defined by someone having an account on
- -<a href="https://admin.fedoraproject.org/account">FAS</a>, having signed
- +<a href="https://admin.fedoraproject.org/accounts">FAS</a>, having signed
- the <a href="https://fedoraproject.org/wiki/Legal:Fedora_Project_Contributor_Agreement"
- >FPCA</a> and being in one additional group.
- </p>
- commit 0ff58542021e4df244c6dbce1a4c331683e354e8
- Author: Pierre-Yves Chibon <pingou@pingoured.fr>
- Date: Tue Aug 4 12:02:14 2015 +0200
- Adjust the url to faitout for the tests
- diff --git a/tests/__init__.py b/tests/__init__.py
- index b5b308b..2541bf0 100644
- --- a/tests/__init__.py
- +++ b/tests/__init__.py
- @@ -51,7 +51,7 @@ DB_PATH = 'sqlite:///:memory:'
- PICTURE_FOLDER = os.path.join(os.path.dirname(__file__), 'pictures')
- CACHE_FOLDER = os.path.join(os.path.dirname(__file__), 'cache')
- TODAY = datetime.utcnow().date()
- -FAITOUT_URL = 'http://209.132.184.152/faitout/'
- +FAITOUT_URL = 'http://faitout.fedorainfracloud.org/'
- if os.environ.get('BUILD_ID'):
- try:
- commit 925463f364346536c72072f7296ccddd231ad474
- Author: Pierre-Yves Chibon <pingou@pingoured.fr>
- Date: Wed Apr 29 11:50:51 2015 +0200
- Release 0.8.2 and adjust documentation accordingly
- diff --git a/doc/about.rst b/doc/about.rst
- index 1d967f0..4739fb1 100644
- --- a/doc/about.rst
- +++ b/doc/about.rst
- @@ -43,12 +43,12 @@ It was first named ``nuancier-lite`` and renamed to ``nuancier`` when support
- for uploads and moderation was added.
- -On April 29, 2014 (versoin 0.8.1), the list looks as follow:
- +On April 29, 2014 (versoin 0.8.2), the list looks as follow:
- ================= ===========
- Number of commits Contributor
- ================= ===========
- - 613 Pierre-Yves Chibon <pingou@pingoured.fr>
- + 616 Pierre-Yves Chibon <pingou@pingoured.fr>
- 31 Ralph Bean <rbean@redhat.com>
- 9 Ryan Lerch <ryanlerch@fedoraporject.org>
- 5 Jenn <jennlkotler@gmail.com>
- diff --git a/doc/conf.py b/doc/conf.py
- index b235fd2..cfad1aa 100644
- --- a/doc/conf.py
- +++ b/doc/conf.py
- @@ -53,7 +53,7 @@ copyright = u'2013-2014, Red Hat Inc. - Pierre-Yves Chibon <pingou@pingoured.fr>
- #
- # The short X.Y version.
- #version = __version__
- -version = '0.8.1'
- +version = '0.8.2'
- # The full version, including alpha/beta/rc tags.
- #release = '1'
- diff --git a/nuancier/__init__.py b/nuancier/__init__.py
- index 9e58db1..94bd6a0 100644
- --- a/nuancier/__init__.py
- +++ b/nuancier/__init__.py
- @@ -55,7 +55,7 @@ import nuancier.proxy
- # pylint: disable=E1101, E1103
- -__version__ = '0.8.1'
- +__version__ = '0.8.2'
- APP = flask.Flask(__name__)
- diff --git a/utility/nuancier.spec b/utility/nuancier.spec
- index 1b071be..0dc0c8e 100644
- --- a/utility/nuancier.spec
- +++ b/utility/nuancier.spec
- @@ -2,7 +2,7 @@
- %distutils.sysconfig import get_python_lib; print (get_python_lib())")}
- Name: nuancier
- -Version: 0.8.1
- +Version: 0.8.2
- Release: 1%{?dist}
- Summary: A web-based voting application for wallpapers
- @@ -94,6 +94,10 @@ cp -r alembic/ $RPM_BUILD_ROOT/%{_datadir}/nuancier/
- %changelog
- +* Wed Apr 29 2015 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.8.2-1
- +- Update to 0.8.2
- +- Fix the graph on the stats page
- +
- * Wed Apr 29 2015 Pierre-Yves Chibon <pingou@pingoured.fr> - 0.8.1-1
- - Update to 0.8.1
- - Improve documentation for new contributors
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
