Commits · Support/2.2.X · Maarch / maarchRM

28 Mar, 2019 2 commits
- Merge branch 'hotfix/2.2.4' into 'Support/2.2.X' · 2cc64b13
  Alexandre Morin authored Mar 28, 2019
```
Fix check integrity journal

See merge request !231
```
  2cc64b13
- Fix check integrity journal · f9efaab8
  Alexandre Morin authored Mar 28, 2019
  
  f9efaab8
27 Sep, 2018 2 commits
- Merge branch 'master' into 'Support/2.2.X' · b7c918c5
  Alexis Ragot authored Sep 27, 2018
```
hotfix/2.2.3

See merge request !120
```
  b7c918c5
- hotfix/2.2.3 · a511a67a
  Alexis Ragot authored Sep 27, 2018
  
  a511a67a
13 Sep, 2018 5 commits
- Merge branch 'cherry-pick-86035154' into 'Support/2.2.X' · 01dab0cd
  Alexis Ragot authored Sep 13, 2018
```
hotfix/2.2.3 into Support

See merge request !114
```
  01dab0cd
- Merge branch 'hotfix/2.2.3' into 'master' · 22fe6df5
  Alexis Ragot authored Sep 13, 2018
```
Hotfix/2.2.3

See merge request !113

(cherry picked from commit 86035154)

4b059e07 Fix actions on the integrity check and description access of journal archives
7aa76c54 removed a specific public archive test
```
  22fe6df5
- Merge branch 'hotfix/2.2.3' into 'master' · 86035154
  Alexis Ragot authored Sep 13, 2018
```
Hotfix/2.2.3

See merge request !113
```
  86035154
- removed a specific public archive test · 7aa76c54
  Alexis Ragot authored Sep 13, 2018
  
  7aa76c54
- Fix actions on the integrity check and description access of journal archives · 4b059e07
  Alexis Ragot authored Sep 13, 2018
  
  4b059e07
23 Jul, 2018 3 commits
- Merge branch 'hotfix/2.2.2' into 'Support/2.2.X' · f6c97553
  Alexandre Morin authored Jul 23, 2018
```
Hotfix/2.2.2

See merge request !104
```
  f6c97553
- Merge branch 'Support/2.2.X' into 'hotfix/2.2.2' · adf1e7a7
  Alexandre Morin authored Jul 23, 2018
```
# Conflicts:
#   VERSION.md
```
  adf1e7a7
- Merge branch 'hotfix/2.2.2' into 'master' · 6e48ad4f
  Alexandre Morin authored Jul 23, 2018
```
Hotfix/2.2.2

See merge request !103
```
  6e48ad4f
19 Jul, 2018 3 commits
- fix bug with the possibility to make some archive actions on communicable archives · 50485636
  Alexis Ragot authored Jul 19, 2018
  
  50485636
- #8167 Protection from script execution in document preview · 69e534df
  Prosper De Laure authored Jul 19, 2018
  
  69e534df
- fix bug with the partitioning between originators · 96a75eb3
  Alexis Ragot authored Jul 19, 2018
  
  96a75eb3
12 Jul, 2018 2 commits

Merge branch 'hotfix/8076-archiveActions' into 'master' · f21e2095

Cyril Vazquez authored Jul 12, 2018

Hotfix/8076 archive actions

See merge request !99

(cherry picked from commit d0358722)

2bd70453 Modification of the version number
8aef6646 Migration process grouping in root folder
3955dbea Fix SQL data - The search form to maange archives was removed for standard users
4ce245e4 The freeze/unfreeze is possible only if the user has rights on all archives

f21e2095

Merge branch 'hotfix/8076-archiveActions' into 'master' · d0358722
Cyril Vazquez authored Jul 12, 2018
```
Hotfix/8076 archive actions

See merge request !99
```
d0358722

09 Jul, 2018 2 commits
- The freeze/unfreeze is possible only if the user has rights on all archives · 4ce245e4
  Alexis Ragot authored Jul 09, 2018
  
  4ce245e4
- Fix SQL data - The search form to maange archives was removed for standard users · 3955dbea
  Alexis Ragot authored Jul 09, 2018
  
  3955dbea
05 Jul, 2018 2 commits
- Migration process grouping in root folder · 8aef6646
  Alexis Ragot authored Jul 05, 2018
  
  8aef6646
- Modification of the version number · 2bd70453
  Alexis Ragot authored Jul 05, 2018
  
  2bd70453
21 Jun, 2018 14 commits
- Merge branch 'master' into 'Support/2.2.X' · 6a67736e
  Alexis Ragot authored Jun 21, 2018
```
Master

See merge request !93
```
  6a67736e
- Merge branch 'release/2.2' into 'master' · 57b83ff6
  Alexis Ragot authored Jun 21, 2018
```
fix duplicate archive description

See merge request !91
```
  57b83ff6
- fix duplicate archive description · 14476dc7
  Alexis Ragot authored Jun 21, 2018
  
  14476dc7
- Merge branch 'master' into 'Support/2.2.X' · eb0e2206
  Alexis Ragot authored Jun 21, 2018
```
Master

See merge request !90
```
  eb0e2206
- Merge branch 'release/2.2' into 'master' · 9c09ddfe
  Alexis Ragot authored Jun 21, 2018
```
fix sql data

See merge request !88
```
  9c09ddfe
- fix sql data · 6b4f834d
  Alexis Ragot authored Jun 21, 2018
  
  6b4f834d
- Merge branch 'master' into 'Support/2.2.X' · f09b5b06
  Alexis Ragot authored Jun 21, 2018
```
Master

See merge request !87
```
  f09b5b06
- Merge branch 'release/2.2' into 'master' · cbe61bc1
  Alexis Ragot authored Jun 21, 2018
```
Release/2.2

See merge request !86
```
  cbe61bc1
- Fix sql data · 84dbec32
  Alexis Ragot authored Jun 21, 2018
  
  84dbec32
- Fix : Date problem on search form · 275b01c7
  Alexandre Morin authored Jun 21, 2018
  
  275b01c7
- Fix search method · 860a36d9
  Alexis Ragot authored Jun 21, 2018
  
  860a36d9
- Fix sql data · 8bc7d466
  Alexis Ragot authored Jun 21, 2018
  
  8bc7d466
- Merge branch 'release/2.2' into 'master' · 69ced030
  Alexis Ragot authored Jun 21, 2018
```
Release/2.2

See merge request !84
```
  69ced030
- Fix not empty field · 7f0dceab
  Alexis Ragot authored Jun 21, 2018
  
  7f0dceab
19 Jun, 2018 1 commit
- Merge branch 'release/2.2' of labs.maarch.org:maarch/maarchRM into release/2.2 · ce182f63
  Alexandre Morin authored Jun 19, 2018
  
  ce182f63
18 Jun, 2018 4 commits
- label added for the DUA in the search form · 8cec18aa
  Alexis Ragot authored Jun 18, 2018
  
  8cec18aa
- fix translation of 'Error' · fe26732b
  Alexis Ragot authored Jun 18, 2018
  
  fe26732b
- Fix archive restitution request · 2367358c
  Alexis Ragot authored Jun 18, 2018
```
Now the restitution request check if the archive is restituable. Before, when an archive of an other service was communicable, it was included in the request
```
  2367358c
- fix ergo on description fields form · 547b817c
  Alexis Ragot authored Jun 18, 2018
  
  547b817c