Commit Graph

421 Commits

Author SHA1 Message Date
Jérôme Schneider e963ac7483 Merge branch 'master' into wip/portail-entreprise 2014-03-26 11:27:15 +01:00
Jérôme Schneider dacc8691dc settings: add sentry support 2014-03-26 11:15:38 +01:00
Benjamin Dauvergne e1d05a4871 admin: as authentic also register the custom user model, unregister it first 2014-03-25 14:34:56 +01:00
Benjamin Dauvergne a728411f08 settings: put VersionMiddleware at beginning of middleware class list 2014-03-25 11:15:11 +01:00
Benjamin Dauvergne 0f18a3509d msp: fix app path in urls.py 2014-03-24 16:47:01 +01:00
Benjamin Dauvergne b3959251eb urls: fix application path for msp 2014-03-24 16:38:07 +01:00
Benjamin Dauvergne 5c9c3c7724 auquotidien_plugin: remove javascript hiding of locality titles in category template
fixes #4543
2014-03-24 11:45:10 +01:00
Benjamin Dauvergne eb68b66e63 profile_form_plugin.html: show username in a read-only field 2014-03-21 18:03:03 +01:00
Benjamin Dauvergne 62af1a1ec7 settings: adopt new layout for defining STATICFILES_DIRS and TEMPLATE_DIRS 2014-03-21 17:51:04 +01:00
Benjamin Dauvergne cc374f2467 settings: adapt to module reorganization in authentic2 2014-03-21 17:50:31 +01:00
Benjamin Dauvergne a42cc02686 cms_plugins: rename hook get_object to get_form_instance as it interacts with ModelAdmin existing method 2014-03-21 17:49:24 +01:00
Benjamin Dauvergne e727271967 force version 2.5.0 of django-cms 2014-03-21 15:26:09 +01:00
Benjamin Dauvergne aa79048b6b urls: do not use i18npatterns for cms pages 2014-03-21 12:33:02 +01:00
Benjamin Dauvergne 864542fdca fix django-cms plugins loading, remove sys.path tampering 2014-03-21 11:23:44 +01:00
Benjamin Dauvergne 2f0284bf06 fix django-cms plugins loading, remove sys.path tampering 2014-03-21 10:38:05 +01:00
Benjamin Dauvergne b3876d0c0c Merge branch 'master' into wip/portail-entreprise 2014-03-20 16:53:25 +01:00
Benjamin Dauvergne 8f4ded1106 settings.py: add cms_ajax_text_plugin to INSTALLED_APPS 2014-03-20 16:53:08 +01:00
Benjamin Dauvergne 29d373ae6f Merge branch 'master' into wip/portail-entreprise
Conflicts:
	portail_citoyen/locale/fr/LC_MESSAGES/django.po
2014-03-20 16:46:55 +01:00
Benjamin Dauvergne 843bf986db fixtures/demo.json: rename "Mes e-services" to "Accueil" 2014-03-20 10:02:30 +01:00
Frédéric Péters cfdc293d33 add some basic responsiveness to default theme 2014-03-18 21:07:03 +01:00
Benjamin Dauvergne e156eaac90 update french translation 2014-03-18 18:19:52 +01:00
Benjamin Dauvergne cc0b9a8d9e remove dead app login_plugin 2014-03-18 18:18:25 +01:00
Benjamin Dauvergne 8bfafec7e5 models: add field enterprise_name, enterprise_siret and enterprise_id 2014-03-18 17:23:16 +01:00
Benjamin Dauvergne b5cbf318b2 start.sh: add pyasn1 for support pyOpenSSL in pip 2014-03-18 13:56:41 +01:00
Benjamin Dauvergne 71071a136e admin: do not load auquotidien_plugin.models if auquotidien_plugin is not installed 2014-03-13 11:26:53 +01:00
Jérôme Schneider e41452e06e settings: reuse admin tools 2014-03-13 10:25:18 +01:00
Jérôme Schneider 7f5893cb10 settings.py: fix settings 2014-03-12 18:19:26 +01:00
Benjamin Dauvergne bf3dac1b2a settings: overload all templates with portail_citoyen templates 2014-03-12 17:46:33 +01:00
Jérôme Schneider 3662480bbf settings: reorder INSTALLED_APPS v2 2014-03-12 17:04:58 +01:00
Jérôme Schneider 1f47734b03 settings: reset order of applications
Thanks Serghei
2014-03-12 16:57:14 +01:00
Benjamin Dauvergne 5633ed61a2 admin: create an AuQuotidienAPI instance for each new WcsInstance 2014-03-10 10:12:27 +01:00
Benjamin Dauvergne 84897e6ebb auquotidien_plugin: the category plugin should also display categories of provider which we do not have a federation with 2014-03-07 12:00:17 +01:00
Serghei Mihai 6db2258e1f URLField changed to CharField in order to allow template vars in plugin url 2014-03-05 09:33:31 +01:00
Serghei Mihai 2b1f256a18 exporting tool initial version 2014-03-05 09:24:24 +01:00
Benjamin Dauvergne e286c686ae msp: make login-or-link the default behaviour also for connexion from the login page 2014-02-25 15:50:52 +01:00
Benjamin Dauvergne 7935aa23a2 pyOpenSSL 0.13 is ok 2014-02-24 23:50:45 +01:00
Benjamin Dauvergne 2be2eafe1b jenkins.sh,start.sh: recent version of pyOpenSSL are incompatible with requests
Bug is fixed in trunk
https://github.com/kennethreitz/requests/issues/1887 but waiting for
requests 2.3.0 we will force pyOpenSSL<0.13.
2014-02-24 23:10:08 +01:00
Benjamin Dauvergne 69ffddef9e auquotidien_plugin/static/js: always hide titles 2014-02-24 11:08:11 +01:00
Jérôme Schneider de6622fff4 portail_citoyen/admin.py: always use existing liberty provider
Fixes #4337
2014-02-21 19:09:45 +01:00
Benjamin Dauvergne c94a883948 auquotidien_plugin: allow to show a subset of all sources 2014-02-10 16:32:38 +01:00
Benjamin Dauvergne 5418778fb3 auquotidien_plugin: add plugin to show categories from many e-service portals 2014-02-10 10:59:25 +01:00
Benjamin Dauvergne ea0f0fac76 msp: log when deleting stale msp accounts 2014-02-06 14:21:26 +01:00
Benjamin Dauvergne 4528aaa943 feed_plugin: fix bug of overwriting entries before returning them
The entries variables was shared by two threads, the thread of the
request and the relodaing thread.
2014-02-06 14:21:26 +01:00
Benjamin Dauvergne ff517765c6 auquotidien_plugin: remove dead statements 2014-02-06 14:21:26 +01:00
Benjamin Dauvergne c90433c921 jenkins.sh: remove misplaced pylint call on compte-agglo-montpellier 2014-01-29 15:32:07 +01:00
Serghei Mihai cb4441d1e4 add cms ajax text plugin url if installed 2014-01-27 22:36:25 +01:00
Benjamin Dauvergne 9cd8629b6e data_source_plugin: only keep in cache succesfull retrieval of a data source 2014-01-27 16:39:47 +01:00
Benjamin Dauvergne eb77d6e4ac cms_plugins,models: remove ProfileFormPlugin empty plugin model 2014-01-27 16:38:29 +01:00
Benjamin Dauvergne 117952da4c data_source_plugin: report timeout errors details 2014-01-27 16:38:29 +01:00
Benjamin Dauvergne 42bd357c96 data_source_plugin: add DataSource.timeout field to limit the time taken to download a data source 2014-01-27 16:38:29 +01:00