DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
12408 commits 250 branches 1166 tags 78 MiB
Commit graph

12408 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul Chavard
252a7f931e
Merge pull request #4443 from tchak/update-javascript-dependencies 
Update javascript dependencies
 2019-10-31 11:22:38 +01:00
Pierre de La Morinerie
cf388d0d62
2019-10-31-01 (#4458) 
2019-10-31-01
 2019-10-31 11:19:38 +01:00
Paul Chavard
2336a4c490 Update javascript dependencies 2019-10-31 11:13:51 +01:00
Pierre de La Morinerie
a74fa9b1bb
Merge pull request #4280 from Keirua/procedure-new-design 
Administrateur : nouvelle page de création et d'édition des démarche
 2019-10-31 10:42:45 +01:00
Pierre de La Morinerie
817662f7d9 procedure: move description to views/shared 
Now that the description is used not only in the layout, but also in the
procedure form, better to make it an official shared partial.
 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
2e0ef84941 images: rename 'attachment' icon to 'attached' 
This avoids conflicts with the 'attachment' component.
 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
aea93779cc procedure: use the attachment view to upload files 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
1c61f2de58 views: refactor the attachment/edit view 
Make it more reusable, by:

- Renaming `attachment/update` to `attachment/edit`
- Refactoring the CSS styles into their own stylesheet
- Allow to specify the 'accept' option
 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
5be83bd01e procedure: make the layout more similar to the mockup 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
02384b078c procedure: remove UI to edit the european flag 
This is an option we want to deprecate, and remove entirely in the
future.

Admins can still add the EU flag manually to their uploaded logo.
 2019-10-31 10:27:19 +01:00
Pierre de La Morinerie
112b44bdea procedure: align radio buttons vertically 
- Remove the unused `.radios.vertical`
- Add a `.editable-champ-radio.vertical` variant for vertical radios
- Add an example of vertical radios to the patron
- Use vertical radios to display the procedure options
 2019-10-31 10:27:19 +01:00
Nicolas Bouilleaud
72b7ff221c move procedure to new design 2019-10-31 10:27:19 +01:00
Paul Chavard
53349a6c20
Merge pull request #4456 from betagouv/dev 
2019-10-30-01
 2019-10-30 16:47:39 +01:00
LeSim
77bf1fea1a
Merge pull request #4455 from tchak/ds-proxy-url 
Add a DS_PROXY_URL env variable
 2019-10-30 16:29:53 +01:00
Paul Chavard
73d4ecf35d Add a DS_PROXY_URL env variable 2019-10-30 16:15:38 +01:00
LeSim
bc257911e9
Merge pull request #4450 from betagouv/instructeur_manage_groupe 
Gestion des groupes instructeurs par les instructeurs
 2019-10-30 14:37:39 +01:00
simon lehericey
652e95d0c5 Add link from instructeur procedure view 2019-10-30 14:27:51 +01:00
simon lehericey
477f7c9837 Remove instructeur 2019-10-30 14:27:51 +01:00
simon lehericey
79b808470c Add instructeur 2019-10-30 14:27:51 +01:00
simon lehericey
94081a3997 Show Groupe Instructeur 2019-10-30 14:27:51 +01:00
simon lehericey
4491dca19a Index Groupe Instructeur 2019-10-30 14:27:51 +01:00
simon lehericey
07aefdd40b Fix test in new_admin/groupe_instructeur_controller 2019-10-30 14:27:51 +01:00
simon lehericey
def9c67c56 Clean html 2019-10-30 14:27:51 +01:00
LeSim
d2bd5f497c
Merge pull request #4454 from tchak/bump-openstack 
Bump openstack
 2019-10-30 14:25:28 +01:00
Paul Chavard
de8a163707 Bump openstack and fog-openstack 2019-10-30 12:12:31 +01:00
Paul Chavard
5a87db9920 Revert "Revert "Update activestorage-openstack"" 
This reverts commit c102dc63b7.
 2019-10-30 12:11:53 +01:00
Paul Chavard
6a3d725134 Revert "Revert "Decommission ActiveStorage proxy service and use openstack service"" 
This reverts commit 71227be37f.
 2019-10-30 12:11:45 +01:00
LeSim
28acdfd36a
Merge pull request #4452 from betagouv/dev 
2019-10-29-01
 2019-10-29 11:04:43 +01:00
LeSim
c8da5a22fc
Merge pull request #4451 from betagouv/fix_pj 
Fix pj
 2019-10-29 10:57:02 +01:00
simon lehericey
c102dc63b7 Revert "Update activestorage-openstack" 
This reverts commit 9088495272.
 2019-10-29 10:31:29 +01:00
simon lehericey
71227be37f Revert "Decommission ActiveStorage proxy service and use openstack service" 
This reverts commit 0ff6c793ae.
 2019-10-29 10:30:40 +01:00
LeSim
db8ba304e6
Merge pull request #4449 from betagouv/do_not_break_the_prod 
Corrige la pr d'activation des admins
 2019-10-28 15:08:10 +01:00
simon lehericey
c6513318b8 Revert "DB: drop active column from adminsitrateurs table" 
This reverts commit 2cb8041560.
 2019-10-28 14:59:58 +01:00
LeSim
0d8405d37e
Merge pull request #4446 from betagouv/last_defaut_groupe_instructeur 
Suppression des derniers defaut_groupe_instructeur illégitimes
 2019-10-25 10:05:48 +02:00
LeSim
818e7eeeb6
Merge pull request #4447 from betagouv/fix_some_typos 
Corrections de quelques fautes d'orthographe
 2019-10-25 10:02:31 +02:00
simon lehericey
cba9ffb753 full_scenario extended with notifications controle 2019-10-25 09:42:17 +02:00
simon lehericey
4febf1851f notifications_for_procedure is now based on instructeur.groupe_instructeurs 2019-10-25 09:42:17 +02:00
simon lehericey
d411bfddc8 We can send a dossier to instructeurs from the same groupe 2019-10-25 09:42:17 +02:00
Jérôme Desboeufs
86819cd532 Fix typos 2019-10-25 09:41:22 +02:00
LeSim
ddbcf58be2
Merge pull request #4435 from betagouv/fix_active_admin_for_real 
Corrige le bug qui maintenait les administrateurs dans un état inactif
 2019-10-24 18:42:18 +02:00
simon lehericey
e290fc3674 No need to update column as the sign_up process activates the user 2019-10-24 18:32:48 +02:00
simon lehericey
2cb8041560 DB: drop active column from adminsitrateurs table 2019-10-24 18:32:48 +02:00
simon lehericey
8ae592fe25 [fix #4361] administrateur active 2019-10-24 18:32:48 +02:00
Pierre de La Morinerie
2a052ab1ac
Amélioration du bouton "Ajouter une ligne" des blocs répétables (#4430) 
Amélioration du bouton "Ajouter une ligne" des blocs répétables
 2019-10-24 17:09:55 +02:00
Pierre de La Morinerie
5fc88eb6a2 specs: fix a flaky repetitions test 
The test would sometime fail when the two fields are created in a
different order than expected.
 2019-10-24 16:52:29 +02:00
Pierre de La Morinerie
dc1f3b4220 champs: add a "plus" icon to the "Add row" button 2019-10-24 16:52:29 +02:00
Pierre de La Morinerie
906f0fc468 champs: fix margin of "Add row" button in the Preview 2019-10-24 16:52:29 +02:00
Pierre de La Morinerie
35e97ac617 patron: add content to the repetition champ 2019-10-24 16:52:29 +02:00
Pierre de La Morinerie
8f4ead96b0 patron: make the labels more readable 2019-10-24 16:52:29 +02:00
LeSim
83900b49c6
Merge pull request #4445 from betagouv/dev 
2019-10-24-02
 2019-10-24 16:45:37 +02:00