Commit 01e6ecb9 authored by okhin's avatar okhin 🚴

Merge branch '196-cleanup-deceptive-old-name' into 'master'

Resolve "Cleanup deceptive old name"

Closes #196

See merge request !207
parents 082c4578 44f02964
Pipeline #1080 passed with stage
in 17 minutes and 57 seconds
...@@ -33,5 +33,4 @@ deploy: ...@@ -33,5 +33,4 @@ deploy:
domain: memopol domain: memopol
deployment_branch: master deployment_branch: master
on: on:
repo: political-memory/political_memory repo: memopol/memopol master
branch: master
...@@ -12,7 +12,7 @@ You should fork the project on github and use the fork's clone url. For the ...@@ -12,7 +12,7 @@ You should fork the project on github and use the fork's clone url. For the
sake of the demo, we'll use the main repository URL:: sake of the demo, we'll use the main repository URL::
$ git clone https://git.laquadrature.net/memopol/memopol.git $ git clone https://git.laquadrature.net/memopol/memopol.git
Cloning into 'political_memory'... Cloning into 'memopol.
remote: Counting objects: 2516, done. remote: Counting objects: 2516, done.
remote: Compressing objects: 100% (109/109), done. remote: Compressing objects: 100% (109/109), done.
remote: Total 2516 (delta 44), reused 0 (delta 0), pack-reused 2402 remote: Total 2516 (delta 44), reused 0 (delta 0), pack-reused 2402
...@@ -20,7 +20,7 @@ sake of the demo, we'll use the main repository URL:: ...@@ -20,7 +20,7 @@ sake of the demo, we'll use the main repository URL::
Resolving deltas: 100% (1103/1103), done. Resolving deltas: 100% (1103/1103), done.
Checking connectivity... done. Checking connectivity... done.
$ cd political_memory/ $ cd memopol/
Create your own branch, ie:: Create your own branch, ie::
......
...@@ -148,15 +148,15 @@ Install Python dependencies ...@@ -148,15 +148,15 @@ Install Python dependencies
Then, install the package for development:: Then, install the package for development::
$ pip install -e . $ pip install -e .
Obtaining file:///tmp/political_memory Obtaining file:///tmp/memopol
Collecting django (from political-memory==0.0.1) Collecting django (from memopol==0.0.1)
Using cached Django-1.9-py2.py3-none-any.whl Using cached Django-1.9-py2.py3-none-any.whl
[output snipped for readability] [output snipped for readability]
Installing collected packages: django, sqlparse, django-debug-toolbar, django-pdb, six, django-extensions, werkzeug, south, pygments, markdown, hamlpy, django-coffeescript, ijson, python-dateutil, pytz, political-memory Installing collected packages: django, sqlparse, django-debug-toolbar, django-pdb, six, django-extensions, werkzeug, south, pygments, markdown, hamlpy, django-coffeescript, ijson, python-dateutil, pytz, memopol
Running setup.py develop for political-memory Running setup.py develop for memopol
Successfully installed django-1.9 django-coffeescript-0.7.2 django-debug-toolbar-1.4 django-extensions-1.5.9 django-pdb-0.4.2 hamlpy-0.82.2 ijson-2.2 markdown-2.6.5 political-memory pygments-2.0.2 python-dateutil-2.4.2 pytz-2015.7 six-1.10.0 south-1.0.2 sqlparse-0.1.18 werkzeug-0.11.2 Successfully installed django-1.9 django-coffeescript-0.7.2 django-debug-toolbar-1.4 django-extensions-1.5.9 django-pdb-0.4.2 hamlpy-0.82.2 ijson-2.2 markdown-2.6.5 memopol pygments-2.0.2 python-dateutil-2.4.2 pytz-2015.7 six-1.10.0 south-1.0.2 sqlparse-0.1.18 werkzeug-0.11.2
Install client dependencies Install client dependencies
=========================== ===========================
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="col-sm-7"> <div class="col-sm-7">
<p class="lead">What is Memopol ?</p> <p class="lead">What is Memopol ?</p>
<p>Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p>Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p> <p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p>
</div> </div>
</div--> </div-->
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="col-sm-7"> <div class="col-sm-7">
<p class="lead">What is Memopol ?</p> <p class="lead">What is Memopol ?</p>
<p>Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p>Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p> <p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p>
</div> </div>
</div--> </div-->
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="col-sm-7"> <div class="col-sm-7">
<p class="lead">What is Memopol ?</p> <p class="lead">What is Memopol ?</p>
<p>Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p>Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p> <p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p>
</div> </div>
</div--> </div-->
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="col-sm-7"> <div class="col-sm-7">
<p class="lead">What is Memopol ?</p> <p class="lead">What is Memopol ?</p>
<p>Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p>Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p> <p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p>
</div> </div>
</div--> </div-->
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="col-sm-7"> <div class="col-sm-7">
<p class="lead">What is Memopol ?</p> <p class="lead">What is Memopol ?</p>
<p>Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p>Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p> <p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p>
</div> </div>
</div--> </div-->
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> </div>
<div class="col-sm-7"> <div class="col-sm-7">
<p class="lead">What is Memopol ?</p> <p class="lead">What is Memopol ?</p>
<p>Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p>Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p> <p class="text-right custom-plus"><a class="btn btn-sm btn-default"><span class="glyphicon glyphicon-plus"></span></a></p>
</div> </div>
</div--> </div-->
......
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
INTRO INTRO
-----------------> ----------------->
<h1 class="text-center"><span class="glyphicon glyphicon-eye-open"></span><br/>Political memory</h1> <h1 class="text-center"><span class="glyphicon glyphicon-eye-open"></span><br/>Memopol</h1>
<p class="lead text-center">What is Memopol ?</p> <p class="lead text-center">What is Memopol ?</p>
<p class="text-justify">Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p class="text-justify">Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
......
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
INTRO INTRO
-----------------> ----------------->
<h1 class="text-center"><span class="glyphicon glyphicon-eye-open"></span><br/>Political memory</h1> <h1 class="text-center"><span class="glyphicon glyphicon-eye-open"></span><br/>Memopol</h1>
<p class="lead text-center">What is Memopol ?</p> <p class="lead text-center">What is Memopol ?</p>
<p class="text-justify">Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p class="text-justify">Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
......
...@@ -43,10 +43,10 @@ ...@@ -43,10 +43,10 @@
INTRO INTRO
-----------------> ----------------->
<h1 class="text-center"><span class="glyphicon glyphicon-eye-open"></span><br/>Political memory</h1> <h1 class="text-center"><span class="glyphicon glyphicon-eye-open"></span><br/>Memopol</h1>
<p class="lead text-center">What is Memopol ?</p> <p class="lead text-center">What is Memopol ?</p>
<p class="text-justify">Political Memory is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p> <p class="text-justify">Memopol is a tool designed by La Quadrature du Net to help European citizens to reach members of European Parliament (MEPs) and track their voting records on issues related to fundamental freedoms online. </p>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
......
from setuptools import setup, find_packages from setuptools import setup, find_packages
setup(name='political-memory', setup(name='meopol',
version='0.0.1', version='0.0.1',
description='Political Memory Project Memopol', description='Memopol Project',
packages=find_packages('src'), packages=find_packages('src'),
package_dir={'': 'src'}, package_dir={'': 'src'},
include_package_data=True, include_package_data=True,
zip_safe=False, zip_safe=False,
author='James Pic, Laurent Peuch, Arnaud Fabre, Nicolas Joyard', author='James Pic, Laurent Peuch, Arnaud Fabre, Nicolas Joyard',
author_email='cortex@worlddomination.be', author_email='cortex@worlddomination.be',
url='http://github.com/political-memory/political_memory/', url='https://git.laquadrature.net/memopol/memopol',
install_requires=[ install_requires=[
'django-autocomplete-light==3.2.0', 'django-autocomplete-light==3.2.0',
'django-autoslug>=1.9,<1.10', 'django-autoslug>=1.9,<1.10',
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<a href="{% url 'home' %}"> <a href="{% url 'home' %}">
<img id="logo" src="{% static 'images/logo.png' %}"> <img id="logo" src="{% static 'images/logo.png' %}">
<br> <br>
{% trans "Political memory" %} {% trans "Memopol" %}
</a> </a>
</h1> </h1>
<p class="lead text-center hidden-xs">{% trans "What is Memopol ?" %}</p> <p class="lead text-center hidden-xs">{% trans "What is Memopol ?" %}</p>
...@@ -26,4 +26,4 @@ ...@@ -26,4 +26,4 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
</div> </div>
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<!-- Set the viewport width to device width for mobile --> <!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width" /> <meta name="viewport" content="width=device-width" />
<title>{% block title %}Home - Political Memory{% endblock %}</title> <title>{% block title %}Home - Memopol{% endblock %}</title>
<link rel="icon" type="image/png" href="{% static 'images/favicon.png' %}" /> <link rel="icon" type="image/png" href="{% static 'images/favicon.png' %}" />
{% fontawesome_stylesheet %} {% fontawesome_stylesheet %}
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<p> <p>
{% blocktrans %} {% blocktrans %}
Use this form to submit a public position taken by a representative and Use this form to submit a public position taken by a representative and
related to one of the themes followed on this instance of Political Memory. related to one of the themes followed on this instance of Memopol.
Public positions may include blog or social network posts, interviews, Public positions may include blog or social network posts, interviews,
parliament interventions... parliament interventions...
{% endblocktrans %} {% endblocktrans %}
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
"pk": "HOMEPAGE_INTRO_TEXT", "pk": "HOMEPAGE_INTRO_TEXT",
"fields": { "fields": {
"value": "** Use comment field for this setting **", "value": "** Use comment field for this setting **",
"comment": "Political Memory is a tool to help citizens reach their representatives and track their voting records." "comment": "Memopol is a tool to help citizens reach their representatives and track their voting records."
} }
}, },
{ {
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
"comment": "This instance of Memopol is run by La Quadrature du Net and tracks issues related to fundamental freedoms online." "comment": "This instance of Memopol is run by La Quadrature du Net and tracks issues related to fundamental freedoms online."
} }
} }
] ]
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment