Mike Ng
|
30f49bdd35
|
resolve conflict
|
2018-01-08 15:57:13 +04:00 |
|
Mike Ng
|
e9e9a737c3
|
PORT PHRAS-1559 and PHRAS-1560 to 4.1
|
2017-12-13 10:26:24 +04: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 |
|
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
|
4eea27d9be
|
Refactor UploadController
|
2015-06-02 13:59:16 +02:00 |
|
Benoît Burnichon
|
9ce56ae9ef
|
Split Upload into provider/controller
|
2015-06-02 13:11:26 +02:00 |
|