Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
rgrebenchuk committed Feb 25, 2014
1 parent d4f9975 commit 6b7fc92
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
CHANGELOG for 1.0.0-rc3
===================
This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-rc3 versions.

* 1.0.0-rc3 (2014-02-25)
* Embedded forms
* CSV export

CHANGELOG for 1.0.0-rc2
===================
This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-rc2 versions.
Expand Down
42 changes: 42 additions & 0 deletions UPGRADE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
UPGRADE to 1.0.0-RC3 from 1.0.0-RC2
=======================

### General

* Pull changes from repository
```bash
git pull
```
* Upgrade composer dependency
```bash
php composer.phar update --prefer-dist
```
* Remove old caches
```bash
rm -rf app/cache/*
```
* Fix extended entities configuration by executing below queries in mysql console.

delete FROM oro_entity_config_value where code = 'schema' and field_id is not null;
delete FROM oro_entity_config_value where field_id in (select id FROM oro_entity_config_field where field_name like 'field_%');
delete FROM oro_entity_config_field where field_name like 'field_%';
delete FROM oro_entity_config_value where code = 'set_options' and value = 'Array';

* Update extend entities configuration
```bash
php app/console oro:entity-extend:update-config --env=prod
php app/console oro:entity-extend:dump --env=prod
```
* Upgrade platform
```bash
php app/console oro:platform:update --env=prod
```
* Load new fixtures
```bash
php app/console oro:installer:fixtures:load --env=prod
```
* Load new workflows definitions
```bash
php app/console oro:workflow:definitions:load --env=prod
```

UPGRADE to any 1.0.0-alpha and beta version
=======================

Expand Down
13 changes: 1 addition & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,14 @@
"description": "Oro Platform Empty Application",
"homepage": "https://github.com/orocrm/platform-application.git",
"license": "MIT",
"config": {
"github-oauth": {
"github.com": "bb8f791840e2b4fed940f4c57ed621b03d5fb2b8"
}
},
"autoload": {
"psr-0": {
"": "src/"
}
},
"require": {
"oro/platform": "dev-release"
"oro/platform": "1.0.0-rc3"
},
"repositories": [
{
"type": "composer",
"url": "http://lab:[email protected]"
}
],
"scripts": {
"post-install-cmd": [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
Expand Down

0 comments on commit 6b7fc92

Please sign in to comment.