Commit Graph

14 Commits

Author SHA1 Message Date
Thibaud Fabre
23c939f13c Merge master 2016-12-05 17:48:19 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache
- wip
2016-10-26 16:13:47 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits.
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
2016-04-20 16:22:14 +02:00
Florian BLOUET
83f3bd4084 cleanup move and delete actions 2016-03-18 10:08:05 +01:00
Benoît Burnichon
b9f1f84020 More deprecation removal 2016-03-06 23:30:12 +01:00
Benoît Burnichon
6cdc9d7a31 Remove some deprecated methods calls 2016-03-06 23:05:55 +01:00
Thibaud Fabre
c92d5da9fe Merge branch 'clean-boxes' into merge-clean-boxes 2016-01-06 19:53:43 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Thibaud Fabre
ea6a4fdbf0 Extract repository and factory classes for collections 2015-07-09 12:32:06 +02:00
Benoît Burnichon
28fee99fc4 Add Form for ElasticSearch Configuration.
Also changed type from array to Options object.
2015-06-29 17:10:32 +02:00
Benoît Burnichon
b1b70520bd Refactor MoveCollectionController 2015-05-15 02:05:05 +02:00
Benoît Burnichon
178247b99e Split MoveCollection controller 2015-05-15 02:05:05 +02:00