diff --git a/.travis.yml b/.travis.yml index 88b3d78c47687824b7aa6f6aa58244b585a496d0..d76f0278e99c3498107fd8ca5986628aee831d2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,5 +33,4 @@ deploy: domain: memopol deployment_branch: master on: - repo: political-memory/political_memory - branch: master + repo: memopol/memopol master diff --git a/docs/deploy-openshift.rst b/docs/deploy-openshift.rst index e2202e20fd71b8efc7b231eb0d56467d86cfc049..8f211504dd295d62d614dccec4f4f61a68d9108b 100644 --- a/docs/deploy-openshift.rst +++ b/docs/deploy-openshift.rst @@ -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:: $ git clone https://git.laquadrature.net/memopol/memopol.git - Cloning into 'political_memory'... + Cloning into 'memopol. remote: Counting objects: 2516, done. remote: Compressing objects: 100% (109/109), done. 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:: Resolving deltas: 100% (1103/1103), done. Checking connectivity... done. - $ cd political_memory/ + $ cd memopol/ Create your own branch, ie:: diff --git a/docs/development.rst b/docs/development.rst index b64c22ecd0b4b5394da930f43c18e65c176fde3d..9982114fe89109700a42fba9340bc42d42fcacfc 100644 --- a/docs/development.rst +++ b/docs/development.rst @@ -148,15 +148,15 @@ Install Python dependencies Then, install the package for development:: $ pip install -e . - Obtaining file:///tmp/political_memory - Collecting django (from political-memory==0.0.1) + Obtaining file:///tmp/memopol + Collecting django (from memopol==0.0.1) Using cached Django-1.9-py2.py3-none-any.whl [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 - Running setup.py develop for political-memory - 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 + 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 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 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 =========================== diff --git a/reference/design-v3/MEP-mandates.html b/reference/design-v3/MEP-mandates.html index 9ae2def09c1c93ada5688800cbaf5085abad94fc..39080c74a9c4161244df64bcafad9f054d5dd8f1 100644 --- a/reference/design-v3/MEP-mandates.html +++ b/reference/design-v3/MEP-mandates.html @@ -35,7 +35,7 @@

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/MEP-positions.html b/reference/design-v3/MEP-positions.html index 8f6b35ef92d7a493b47546a6f702b77e7f364209..3671ff8b2b8d005af12d93209eca393acfaae927 100644 --- a/reference/design-v3/MEP-positions.html +++ b/reference/design-v3/MEP-positions.html @@ -35,7 +35,7 @@

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/MEP-votes.html b/reference/design-v3/MEP-votes.html index 1a7f7f4ee4d6158aaaaeb3db86ee851e8df295c6..c6e46ebf8843af840eee368e9553aa50954b21cd 100644 --- a/reference/design-v3/MEP-votes.html +++ b/reference/design-v3/MEP-votes.html @@ -35,7 +35,7 @@

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/MEP.html b/reference/design-v3/MEP.html index dae7497ecbb87e59bdd661ddd29b8f4947590597..7ca7de776be0998906324b66c651f73d71b816e4 100644 --- a/reference/design-v3/MEP.html +++ b/reference/design-v3/MEP.html @@ -35,7 +35,7 @@

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/dossier-positions.html b/reference/design-v3/dossier-positions.html index c9a068e9719fc7430528dcf22930f499010b15cb..14cd8862b3259245bfb30cc01b538c33abfd77eb 100755 --- a/reference/design-v3/dossier-positions.html +++ b/reference/design-v3/dossier-positions.html @@ -35,7 +35,7 @@

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/dossier-votes.html b/reference/design-v3/dossier-votes.html index 0ee4c69d3614be728115de2eaaea856b26e6c698..654f919fa532b0ca62aef984eae45bc04dca1d38 100755 --- a/reference/design-v3/dossier-votes.html +++ b/reference/design-v3/dossier-votes.html @@ -35,7 +35,7 @@

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/dossier.html b/reference/design-v3/dossier.html index 7711cbc4ff8032e40fbf726645720e1809a9dee2..e312a538629c37609acf74bd9ff26fcc54bd2279 100755 --- a/reference/design-v3/dossier.html +++ b/reference/design-v3/dossier.html @@ -43,10 +43,10 @@ INTRO -----------------> -


Political memory

+


Memopol

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/index.html b/reference/design-v3/index.html index c3d4f135607ffb17f538fd37ef4853532ca2ad13..230e10b27968c876984122c40996dc853adddd8c 100755 --- a/reference/design-v3/index.html +++ b/reference/design-v3/index.html @@ -43,10 +43,10 @@ INTRO -----------------> -


Political memory

+


Memopol

What is Memopol ?

-

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.

+

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.

diff --git a/reference/design-v3/listDossiers.html b/reference/design-v3/listDossiers.html index 4c3e618fd2c2e3753b2fb23e4452daf7234d50f3..43f4444914520d36e36d30d7735cd541a0e8dee8 100755 --- a/reference/design-v3/listDossiers.html +++ b/reference/design-v3/listDossiers.html @@ -43,10 +43,10 @@ INTRO -----------------> -


Political memory

+


Memopol

What is Memopol ?

-

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.

+

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.

diff --git a/setup.py b/setup.py index bd515f9e4b5fd92182b3ac074c90dc2a065a00cc..b9a014a4304236ac06a5fd58ed1ca2ca287bb906 100644 --- a/setup.py +++ b/setup.py @@ -1,15 +1,15 @@ from setuptools import setup, find_packages -setup(name='political-memory', +setup(name='meopol', version='0.0.1', - description='Political Memory Project Memopol', + description='Memopol Project', packages=find_packages('src'), package_dir={'': 'src'}, include_package_data=True, zip_safe=False, author='James Pic, Laurent Peuch, Arnaud Fabre, Nicolas Joyard', author_email='cortex@worlddomination.be', - url='http://github.com/political-memory/political_memory/', + url='https://git.laquadrature.net/memopol/memopol', install_requires=[ 'django-autocomplete-light==3.2.0', 'django-autoslug>=1.9,<1.10', diff --git a/src/memopol/templates/_base_intro.html b/src/memopol/templates/_base_intro.html index d2badc97968b73f186c20f1ff5a5875d2988240e..30da40141ed0e265a42e4f6cda4de89dc7bb93eb 100644 --- a/src/memopol/templates/_base_intro.html +++ b/src/memopol/templates/_base_intro.html @@ -7,7 +7,7 @@
- {% trans "Political memory" %} + {% trans "Memopol" %}
@@ -26,4 +26,4 @@
{% endif %} -
\ No newline at end of file +
diff --git a/src/memopol/templates/base.html b/src/memopol/templates/base.html index bb6b91e7ecd390cf2fb61e24a4237b8f84fa2053..d2d3cee807f143bd208fc33fad854d2539f17e69 100644 --- a/src/memopol/templates/base.html +++ b/src/memopol/templates/base.html @@ -13,7 +13,7 @@ - {% block title %}Home - Political Memory{% endblock %} + {% block title %}Home - Memopol{% endblock %} {% fontawesome_stylesheet %} diff --git a/src/memopol/templates/text/position_info.html b/src/memopol/templates/text/position_info.html index 5d1aec5f899968bb1425237c6b896ee4ddafac13..febfc27f2779267daad730ade0deda4574069dcd 100644 --- a/src/memopol/templates/text/position_info.html +++ b/src/memopol/templates/text/position_info.html @@ -3,7 +3,7 @@

{% blocktrans %} 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, parliament interventions... {% endblocktrans %} diff --git a/src/memopol_settings/fixtures/homepage_settings.json b/src/memopol_settings/fixtures/homepage_settings.json index 3a9fd843f80cafa19d22d8f6049b291f619e8ea8..958dac2a3197ca54f2a780100d8faf2a0487d29e 100644 --- a/src/memopol_settings/fixtures/homepage_settings.json +++ b/src/memopol_settings/fixtures/homepage_settings.json @@ -12,7 +12,7 @@ "pk": "HOMEPAGE_INTRO_TEXT", "fields": { "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 @@ "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 +]