Closed kevinpapst closed 6 years ago
@kevinpapst the feature/2.0 is the old branch, the project is using branch "master" for 2.x releases
As you can see here, this change was already applied https://github.com/avanzu/AdminThemeBundle/blob/master/composer.json#L28
I am just merging your change in case that you were using that branch, but you should switch to master
Oh, I totally missed that. I thought this branch will be merged back to master once 2.0 was released. Then I am going to check which nice changes wait for me in master!
One question @shakaran - when is develop used, when master? Do you keep the hotfix-1.3.5 and feature/2.0 branches for BC only? From the README its not clear which branch is to be prefered in which case.
@kevinpapst develop is not in use anymore, not following exactly (at this moment only) the model described here http://nvie.com/posts/a-successful-git-branching-model/
At this moment hotfix-1.3.5 and following (until 1.3.8) is the "stable" version for 1.3.x users. That I plan to deprecate as soon 2.x branch will be stable.
The branch master keeps right now all the progress for 2.x versions. I tag every release of 2.x (betas) based in master. In README is specified that you should use master or 1.x version branch. Anyways composer is based in tags, so the tags are being used and not the branch.
The current composer setup would install https://github.com/almasaeed2010/AdminLTE/tree/v2.4.2/ which is incompatible due to its changed directory structure.
For example:
This PR will pin the AdminLTE version to 2.3.x
@shakaran Can you have a look, I assume that this fix is required for the 2.0 release.