Mathieu Magnin
|
702a1456f1
|
Remove duplicate line
|
2017-02-20 14:46:06 +01:00 |
|
Mathieu Magnin
|
d8eb197609
|
Merge branch 'develop' into staging
|
2017-02-20 14:11:47 +01:00 |
|
Mathieu Magnin
|
62152e0b6e
|
After environment.rb updated this should work
|
2017-02-20 14:11:12 +01:00 |
|
Mathieu Magnin
|
5b22a34cff
|
Merge branch 'develop' into staging
|
2017-02-17 17:18:36 +01:00 |
|
Mathieu Magnin
|
2798d225fd
|
Fix uninitialized constant
|
2017-02-17 17:18:10 +01:00 |
|
Mathieu Magnin
|
c302be782b
|
Merge branch 'develop' into staging
|
2017-02-16 18:05:56 +01:00 |
|
Mathieu Magnin
|
85c07f8095
|
Quick & dirty fix
|
2017-02-16 18:05:42 +01:00 |
|
Mathieu Magnin
|
71e4e096cd
|
Merge branch 'develop' into staging
|
2017-02-16 17:12:54 +01:00 |
|
Mathieu Magnin
|
ff9c95f18e
|
Merge branch 'develop' into admin_can_modify_procedure_description_after_published
|
2017-02-16 15:59:49 +01:00 |
|
Mathieu Magnin
|
9fcc0920e6
|
Css update
|
2017-02-16 13:59:32 +01:00 |
|
Mathieu Magnin
|
6a8c9c67de
|
Merge pull request #22 from sgmap/delete_duplicate_mail_received
Delete duplicate mail received
|
2017-02-15 17:15:00 +01:00 |
|
Mathieu Magnin
|
6979f6b5f6
|
Add some tests
|
2017-02-15 17:09:25 +01:00 |
|
Simon Lehericey
|
a124069210
|
Procedure: use after_create to build_default_mails
|
2017-02-15 15:44:27 +01:00 |
|
Simon Lehericey
|
8995c67542
|
Add timestamp to mailtemplate
|
2017-02-15 15:44:27 +01:00 |
|
Simon Lehericey
|
58d5e40130
|
Remove duplicate email received
|
2017-02-15 15:44:27 +01:00 |
|
Mathieu Magnin
|
1d0a236813
|
Typo
|
2017-02-15 15:21:34 +01:00 |
|
Mathieu Magnin
|
a0d84eda5c
|
Fix logo display in development
|
2017-02-15 15:13:49 +01:00 |
|
Mathieu Magnin
|
a636d4f98d
|
Filter procedure update parms if procedure is locked
|
2017-02-15 14:13:02 +01:00 |
|
Mathieu Magnin
|
85608f18ab
|
Description page is accessible, some field are disabled if procedure is locked
|
2017-02-14 18:13:19 +01:00 |
|
Mathieu Magnin
|
a7b7c8b63f
|
Merge pull request #20 from sgmap/remove_cerfa_text
Remove specific cerfa in favor of default enclosed documents
|
2017-02-14 18:00:14 +01:00 |
|
Mathieu Magnin
|
c0ae500aa3
|
Merge branch 'develop' into remove_cerfa_text
|
2017-02-14 17:59:41 +01:00 |
|
Mathieu Magnin
|
9986ab1f01
|
Merge pull request #21 from sgmap/clean_grid
Clean grid
|
2017-02-14 17:58:15 +01:00 |
|
LeSim
|
7bc6e67e15
|
Merge pull request #19 from sgmap/clickable-links-in-champs-description
Add clickable links in champ description and use bootstrap layout for…
|
2017-02-14 17:28:03 +01:00 |
|
Simon Lehericey
|
5359c046e6
|
Clean grid usage
|
2017-02-14 17:12:44 +01:00 |
|
Simon Lehericey
|
3b827fa5e3
|
Remove specific cerfa in favor of default enclosed documents
|
2017-02-14 16:26:25 +01:00 |
|
Mathieu Magnin
|
11c793a60c
|
Remove custom button code, use bootstrap classes
|
2017-02-14 16:23:48 +01:00 |
|
Mathieu Magnin
|
6c41cbcc5e
|
Clean css
|
2017-02-14 16:20:52 +01:00 |
|
Mathieu Magnin
|
e7b91c3db5
|
Bootstrap default font-size is set to 16px
|
2017-02-14 16:09:52 +01:00 |
|
Mathieu Magnin
|
1e3c5bf14a
|
Fix engagement field
|
2017-02-14 15:23:39 +01:00 |
|
Xavier J
|
933d1ac09a
|
Move JS: true for start demande spec
|
2017-02-14 15:20:10 +01:00 |
|
Mathieu Magnin
|
f60098311e
|
Fix hidden checkbox bug, address field : full width
|
2017-02-14 14:55:08 +01:00 |
|
Mathieu Magnin
|
b08a4c5091
|
Fix style for checkbox and radios
|
2017-02-14 14:34:00 +01:00 |
|
Mathieu Magnin
|
8a3df4979b
|
remove byebug and guard until it works
|
2017-02-14 12:05:08 +01:00 |
|
LeSim
|
86901f7f20
|
Update type_de_champ_decorator.rb
|
2017-02-14 11:22:28 +01:00 |
|
Mathieu Magnin
|
308a037f19
|
Add clickable links in champ description and use bootstrap layout for forms
|
2017-02-14 11:13:48 +01:00 |
|
Xavier J
|
5d733c11fd
|
Delete references @opensimplif
|
2017-02-13 15:46:28 +01:00 |
|
Xavier J
|
f880608735
|
Merge branch 'develop' into staging
|
2017-02-13 15:25:29 +01:00 |
|
Xavier Julien
|
3c6ae2d005
|
Merge pull request #14 from sgmap/customizable-emails
Customizable emails
|
2017-02-13 15:20:04 +01:00 |
|
Xavier J
|
138b5ac498
|
Merge branch 'develop' into staging
|
2017-02-13 13:52:34 +01:00 |
|
Xavier J
|
c344c99fbb
|
Merge branch 'sync-passwords-on-login' into develop
|
2017-02-13 13:47:36 +01:00 |
|
Xavier J
|
e4b0638762
|
Merge branch 'archive_dossier' into develop
|
2017-02-13 13:41:50 +01:00 |
|
Xavier J
|
807a8112e3
|
Fix some features tests (DONE)
|
2017-02-13 13:15:37 +01:00 |
|
Xavier J
|
de4bddee93
|
delete bin
|
2017-02-13 12:16:48 +01:00 |
|
Xavier J
|
306650ee89
|
Fix some features tests
|
2017-02-13 11:57:35 +01:00 |
|
Xavier J
|
bc918446f2
|
Fix some tests
|
2017-02-10 12:48:49 +01:00 |
|
Mathieu Magnin
|
5613b896b1
|
Gestionnaire can archive dossier
|
2017-02-08 17:35:28 +01:00 |
|
Mathieu Magnin
|
3502e046e2
|
Merge branch 'develop' into staging
|
2017-02-08 15:33:29 +01:00 |
|
Mathieu Magnin
|
82546a3ad4
|
Fix merge error
|
2017-02-08 15:32:49 +01:00 |
|
Xavier J
|
812b8f7f27
|
Merge develop into staging
|
2017-02-07 18:28:22 +01:00 |
|
Mathieu Magnin
|
8ba8135e6b
|
Allow blank for lien_demarche
|
2017-02-07 18:12:25 +01:00 |
|