Skip to content
This repository has been archived by the owner on May 27, 2020. It is now read-only.

merge inn platform changes #7

Merged
merged 36 commits into from
Feb 9, 2016
Merged

merge inn platform changes #7

merged 36 commits into from
Feb 9, 2016

Conversation

andrerom
Copy link
Contributor

@andrerom andrerom commented Feb 3, 2016

merge in changes from platform as a first step towards doing a 1.1 release.

update: as agreed below this repo is as part of the merge adjusted to be closer to upstream.

andrerom and others added 28 commits January 12, 2016 12:18
@andrerom
Improve EZP-25369: Remove configuration from installers
59ad459 
https://jira.ez.no/browse/EZP-25369
added behatbundle behat.yml to ezplatform behat.yml.dist
f5b12dc
changed behat.yml to behat_suites.yml
ba32d91
@andrerom
Updated directory permissions inscructions to align more with Symfony…
22fdd56 
…, and mention www/var
@bdunogier
Merge pull request #82 from miguelcleverti/updateBehatyml
4c16481 
Added missing behatbundle behat.yml to behat.yml.dist
[composer] bumped ez requirements to next (dev) version
7a2e3dc
@andrerom
[Doc] Update in inline var_dir doc
fa01396
Fixed internal server / ezrouter.php
365d863 
Applies the ezpublish -> app rename to ezrouter.
Removed REST v1 routes from internal server router
30cc547
@bdunogier
Merge pull request #86 from ezsystems/fix_internal_server
021ed13 
Fixed internal server / ezrouter.php
@andrerom
Merge pull request #80 from ezsystems/remove_installer_config
7296adf 
Improve EZP-25369: Remove configuration from installers
@andrerom
EZP-25383: Change web server conf to be able to generate from bash
43836a8 
https://jira.ez.no/browse/EZP-25383

This commit covers:
- Apache conf
- script

Todo: Nginx, Clustering, doc update
@vidarl @andrerom
Change nginx conf to be able to be genared from vhost.sh and allow en…
827cbeb 
…v variables
@vidarl @andrerom
Prefixed applicable template variables with SYMFONY_ and reorder
ba54d8b
@andrerom
[Doc] Update Apache/Nginx doc
bf5070e
@krzyraj @andrerom
Updated README.md for NGINX and Apache
01c5577
@andrerom
Merge pull request #81 from ezsystems/bash_vhost_script
66dd191 
EZP-25383: Change web server conf to be able to generate from bash
@andrerom
Merge pull request #35 from ezsystems/dir_permissions
f641835 
Small update to directory permissions to align with Sf 2.8
[composer] set 1.1.0 release dependencies
9d8288b
[dependencies] updated to 1.2.x-dev
83ec512
[dependencies] Set ~x.y.z requirements for ezsystems packages
295bfab
Merge branch 'release-1.1.0'
df30fbe 
Conflicts:
	composer.json
[dependencies] platform-ui-bundle ~1.2.0@dev
1f9c503
@dpobel
Bumped PlatformUIAssetsBundle requirement to 2.0.0@alpha
29de50c
EZP-25100: added repository-forms routes
9e4dbab
EZP-25100: added repository-forms behat import
a588df2
@bdunogier
Merge pull request #85 from ezsystems/ugc_base
417f762 
UGC routes + BDD
[dependencies] ezsystems/repository-forms ~1.1.0
d68de31 
Bumped repository-forms requirements due to UGC (routing) addition.
@andrerom
Copy link
Contributor Author

andrerom commented Feb 4, 2016

@SylvainGuittard / @bdunogier POV on if this repo should be in close sync with ezplatform, or use stable packages as is the case?

@bdunogier
Copy link
Member

Both are valid. The merge of what happens in ezsystems/ezplatform@master will have to be manual anyway.

TL;DR:

  • demo must be tagged when master is tagged, within a small enough time (1 week ?)
  • demo master should follow ezplatform@master. Doing so will make point above easier.

In terms of actual demo of the product, it would be better if ezplatform-demo@master gave at all times a good view of where ezplatform is on the bleeding edge. If there are tags, they are what people will get anyway when installing. If you install ezplatform-demo@master, you will get the latest versions of the packages. Unless we have updated requirements in ezplatform@master, the latest version of ezsystems packages will be downloaded anyway.

@SylvainGuittard
Copy link
Contributor

Thanks @andrerom for the PR!
I think ezplatform-demo should be as close as possible to ezplatform.

+1

@andrerom
Copy link
Contributor Author

andrerom commented Feb 5, 2016

ok, will update this next week when 1.1.0 is out.

Bertrand Dunogier added 2 commits February 5, 2016 17:34
@bdunogier
Copy link
Member

It is out, you can go ahead. Note that there is a commit in the unstable
version that must be reverted (the one that sets the aliases).

Le ven. 5 févr. 2016 17:08, André R. notifications@github.com a écrit :

ok, will update this next week when 1.1.0 is out.

—
Reply to this email directly or view it on GitHub
#7 (comment)
.

@andrerom andrerom changed the title 1.1 update merge inn platform changes Feb 8, 2016
@andrerom
Copy link
Contributor Author

andrerom commented Feb 8, 2016

PR updated, as agreed I instead merge in changes from master, and then releases can be done as second step. (so yes, branch name is miss leading)

@bdunogier
Copy link
Member

branch name is miss leading

I knew about miss france or miss norway, not miss leading 👼

+1

@andrerom
Copy link
Contributor Author

andrerom commented Feb 9, 2016

I knew about miss france or miss norway, not miss leading 👼

she won over miss losing 🙆‍♀️

andrerom added a commit that referenced this pull request Feb 9, 2016
@andrerom
Merge pull request #7 from ezsystems/1.1_update
724f586 
merge inn platform changes
@andrerom andrerom merged commit 724f586 into master Feb 9, 2016
@andrerom andrerom deleted the 1.1_update branch February 9, 2016 14:04
@SylvainGuittard
Copy link
Contributor

Thanks @andrerom

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@andrerom @bdunogier @SylvainGuittard @vidarl @krzyraj @dpobel