Mike Ng
|
30f49bdd35
|
resolve conflict
|
2018-01-08 15:57:13 +04:00 |
|
Xavier Rousset
|
1683191d19
|
PHRAS-1719 Add presets selection on subdef admin page
|
2017-12-13 01:58:36 +01:00 |
|
Benoît Burnichon
|
df0aee31a0
|
Bump fractal version to development one.
|
2016-05-16 18:26:17 +02:00 |
|
Benoît Burnichon
|
b80a2767fb
|
Remove groupByDataboxIds method as not safe
|
2016-05-12 16:07:09 +02:00 |
|
Benoît Burnichon
|
7da4a65a93
|
Handle non unique recordIds in Repositories
|
2016-05-12 16:07:09 +02:00 |
|
Benoît Burnichon
|
23eff5fe28
|
WIP progress on List Records
|
2016-05-12 16:07:09 +02:00 |
|
Benoît Burnichon
|
f84f625a4e
|
All media_subdef updates go to the repository
|
2016-04-22 16:15:37 +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 |
|