From: Nilovna Bascunan-Vasquez <contact@nilovna.com>
Date: Tue, 9 Aug 2011 21:09:01 +0000 (-0400)
Subject: Merge branch 'dev' into recrutement
X-Git-Tag: DAE+RH~255^2~19
X-Git-Url: https://git.auf.org/?p=auf_rh_dae.git;a=commitdiff_plain;h=dad0fb0677b7c44070ef3cff09bcc1b5dee4cca3

Merge branch 'dev' into recrutement
---

dad0fb0677b7c44070ef3cff09bcc1b5dee4cca3
diff --cc project/urls.py
index 27e3ca2,c0438ad..8a539f9
--- a/project/urls.py
+++ b/project/urls.py
@@@ -10,12 -10,10 +10,12 @@@ handler500 # Pyflake
  
  urlpatterns = patterns(
      '',
-     (r'^$', 'project.views.index'),
-     url(r'^captcha/', include('captcha.urls')),
-     url(r'^admin_tools/', include('admin_tools.urls')),
+     # système
+     url(r'^$', 'project.views.accueil', name='accueil'),
+ 
      (r'^admin/', include(admin.site.urls)),
 +    url(r'^api/(?P<method>[a-z_-]+)/(?P<offre_id>\d+)$', 'recrutement.api.api', 
 +            name='recrutement_api'),
      url(r'^api/(?P<method>[a-z_-]+)/$', 'recrutement.api.api', 
              name='recrutement_api'),
      (r'^connexion/$', 'django.contrib.auth.views.login'),