Commits · development · Pixel Humain / costum

22 Jan, 2021 26 commits
- Merge remote-tracking branch 'origin/development' into development · 056f3db2
  Nicolas Nambinintsoa authored Jan 22, 2021
  
  056f3db2
- fix label Json editor · 7cd389ef
  Nicolas Nambinintsoa authored Jan 22, 2021
  
  7cd389ef
- fix tplsEngine · 54273483
  Sylvany Mirana authored Jan 22, 2021
  
  54273483
- Auto stash before merge of "development" and "origin/development" · c5349570
  Sylvany Mirana authored Jan 22, 2021
  
  c5349570
- Merge remote-tracking branch 'origin/development' into development · f5fb17ff
  ramiandrison gova authored Jan 22, 2021
  
  f5fb17ff
- separate cmsEngine code · 3273d2a0
  ramiandrison gova authored Jan 22, 2021
  
  3273d2a0
- Merge remote-tracking branch 'origin/development' into development · 9218fed9
  Ifaliana Arimanana authored Jan 22, 2021
  
  9218fed9
- fix engine cms · 47a09483
  Ifaliana Arimanana authored Jan 22, 2021
  
  47a09483
- fix · b0708868
  ramiandrison gova authored Jan 22, 2021
  
  b0708868
- fix cms's screenshot preview · 44b15f3c
  Ifaliana Arimanana authored Jan 22, 2021
  
  44b15f3c
- cmsEngine · a9bcbbcf
  Sylvany Mirana authored Jan 22, 2021
  
  a9bcbbcf
- Merge remote-tracking branch 'origin/development' into development · 3146f04b
  Clément Damiens authored Jan 22, 2021
  
  3146f04b
- up fix engine cms and refactor cms save · 73bad5b7
  Clément Damiens authored Jan 22, 2021
  
  73bad5b7
- Merge remote-tracking branch 'origin/development' into development · 82292fc1
  Sylvany Mirana authored Jan 22, 2021
  
  82292fc1
- fix cms · 3c77cc4f
  Sylvany Mirana authored Jan 22, 2021
  
  3c77cc4f
- tpl engine · 4caaadee
  Ifaliana Arimanana authored Jan 22, 2021
  
  4caaadee
- Merge remote-tracking branch 'origin/development' into development · 95a00d92
  Ifaliana Arimanana authored Jan 22, 2021
  
  95a00d92
- Cms & tpls engine · d290e286
  Ifaliana Arimanana authored Jan 22, 2021
  
  d290e286
- Merge remote-tracking branch 'origin/development' into development · 0e655b25
  Sylvany Mirana authored Jan 22, 2021
  
  0e655b25
- fix blocCss · c820e916
  Sylvany Mirana authored Jan 22, 2021
  
  c820e916
- Merge branch 'development' of https://gitlab.adullact.net/pixelhumain/costum into development · 8367e83a
  ramiandrison gova authored Jan 22, 2021
  
  8367e83a
- change · c2378c45
  ramiandrison gova authored Jan 22, 2021
  
  c2378c45
- Merge remote-tracking branch 'origin/development' into development · c499111b
  Sylvany Mirana authored Jan 22, 2021
  
  c499111b
- fix bloc events , community · fd99c09a
  Sylvany Mirana authored Jan 22, 2021
  
  fd99c09a
- Merge branch 'development' of https://gitlab.adullact.net/pixelhumain/costum into development · 19bf67ce
  ramiandrison gova authored Jan 22, 2021
  
  19bf67ce
- hotfix · d9159fec
  ramiandrison gova authored Jan 22, 2021
  
  d9159fec
21 Jan, 2021 14 commits
- admin circuit migration to common co2 ctk · e3e4669d
  Clément Damiens authored Jan 21, 2021
  
  e3e4669d
- Merge remote-tracking branch 'origin/development' into development · df819d6b
  ramiandrison gova authored Jan 21, 2021
  
  df819d6b
- · 6be058ce
  Clément Damiens authored Jan 21, 2021
```
finish migrate all admin ctenat to co2 common process
```
  6be058ce
- fix · 7826987f
  ramiandrison gova authored Jan 21, 2021
  
  7826987f
- · 5d9beafd
  Clément Damiens authored Jan 21, 2021
```
migrate etiquetage admin ctenat to co2 process
```
  5d9beafd
- Merge remote-tracking branch 'origin/development' into development · 408defd9
  Clément Damiens authored Jan 21, 2021
  
  408defd9
- · cd8fc3cf
  Clément Damiens authored Jan 21, 2021
```
migrate directory ctenat to co2/admin/directory 
```
  cd8fc3cf
- Merge remote-tracking branch 'origin/development' into development · 813c54b8
  Sylvany Mirana authored Jan 21, 2021
  
  813c54b8
- fix block projects, news, events · 6ae06cb1
  Sylvany Mirana authored Jan 21, 2021
  
  6ae06cb1
- fix engine · c0466fce
  Ifaliana Arimanana authored Jan 21, 2021
  
  c0466fce
- Merge remote-tracking branch 'origin/development' into development · 88abf9de
  ramiandrison gova authored Jan 21, 2021
  
  88abf9de
- fix typeObj · 9a4cd852
  ramiandrison gova authored Jan 21, 2021
  
  9a4cd852
- · da46634a
  Clément Damiens authored Jan 21, 2021
```
migrate admin users ctenat on co2 process
```
  da46634a
- · 4e768b48
  Clément Damiens authored Jan 21, 2021
```
fix all admin ctenat fiche action and fusion with co2 admin process
```
  4e768b48