updated dependecies and bumped version number

CHANGELOG.md

@@ -1,6 +1,34 @@
 CHANGELOG for Sulu CMF
 ======================
 
+* 1.0.0-RC2 (2015-06-17)
+    * BUGFIX      #1264 [ContentBundle]  fixed save of changed block type
+    * BUGFIX      #1259 [ContentBundle]  Fixed internal link assignment delete
+    * BUGFIX      #1244 [WebsiteBundle]  Updated LiipThemeBundle to get assetic bugfix
+    * BUGFIX      #1254 [SnippetBundle]  Fixed snippet assigment delete
+    * BUGFIX      #1250 [ContactBundle]  Fixed document assigment delete in contact area
+    * ENHANCEMENT #1251 [SecurityBundle] Refactored PasswordResetting controller for better reusability
+    * BUGFIX      #1253 [MediaBundle]    Improved speed for media list query
+    * BUGFIX      #1245 [ContentBundle]  Ensure that concrete languages will be serialized as array not as object
+    * FEATURE     #1248 [ContentBundle]  Added cleanup resource-locator history command
+    * BUGFIX      #1243 [ContentBundle]  Added ignore of ghost pages when content copy locale
+    * ENHANCEMENT #1234 [All]            Prefix twig extension functions with "sulu_"
+    * ENHANCEMENT #1237 [AdminBundle]    Fixed typos in behat tests
+    * BUGFIX      #1235 [ContentBundle]  Fixed delete page which has children with history url
+    * BUGFIX      #1231 [ContentBundle]  Fixed wrong behaviour if you edit a shadow page
+    * BUGFIX      #1216 [SecurityBundle] Moved settings action to non-secured ProfileController
+    * BUGFIX      #1213 [ContentBundle]  Fixed redirect of external links
+    * FEATURE     #1214 [MediaBundle]    Added language chooser in "all media" view and in edit-media overlay
+    * BUGFIX      #1211 [WebsiteBundle]  Fixed merge of test-page childs into upper layer in website navigation
+    * ENHANCMENT  #1206 [SecurityBundle] Corrected translation for roles entry in navigation
+    * BUGFIX      #1203 [AdminBundle]    Fixed routes for tabs
+    * BUGFIX      #1199 [ContentBundle]  URL of shadow pages are not delivered in the urls array
+    * BUGFIX      #1207 [ContentBundle]  Added additional query before generate new url
+    * BUGFIX      #1169 [AdminBundle]    Fixed sidebar issue (prepending div instead of appending)
+    * ENHANCEMENT #1159 [SecurityBundle] Change role naming to keep symfony2 conventions.
+    * BUGFIX      #1156 [MediaBundle]    Fix mimetype check for ghostscript
+    * BUGFIX      #1163 [ContentBundle]  Set existing default for content language
+
 * 1.0.0-RC1 (2015-05-29)
     * ENHANCEMENT #1148 [SecurityBundle] Moved user specific code from UserController to UserManager
     * BUGFIX      #1147 [MediaBUndle]    Fixes fileVersion created date

UPGRADE.md

@@ -1,5 +1,82 @@
 # Upgrade
 
+# Upgrade
+
+## 1.0.0-RC2
+
+### Twig-Extensions
+
+Following Twig-Functions has changed the name (new prefix for sulu functions):
+
+| Before                    | Now                           |
+|---------------------------|-------------------------------|
+| `resolve_user`            | `sulu_resolve_user`           |
+| `content_path`            | `sulu_content_path`           |
+| `content_root_path`       | `sulu_content_root_path`      |
+| `get_type`                | `sulu_get_type`               |
+| `needs_add_button`        | `sulu_needs_add_button`       |
+| `get_params`              | `sulu_get_params`             |
+| `parameter_to_select`     | `sulu_parameter_to_select`    |
+| `parameter_to_key_value`  | `sulu_parameter_to_key_value` |
+| `content_load`            | `sulu_content_load`           |
+| `content_load_parent`     | `sulu_content_load_parent`    |
+| `get_media_url`           | `sulu_get_media_url`          |
+| `meta_alternate`          | `sulu_meta_alternate`         |
+| `meta_seo`                | `sulu_meta_seo`               |
+| `navigation_root_flat`    | `sulu_navigation_root_flat`   |
+| `navigation_root_tree`    | `sulu_navigation_root_tree`   |
+| `navigation_flat`         | `sulu_navigation_flat`        |
+| `navigation_tree`         | `sulu_navigation_tree`        |
+| `breadcrumb`              | `sulu_breadcrumb`             |
+| `sitemap_url`             | `sulu_sitemap_url`            |
+| `sitemap`                 | `sulu_sitemap`                |
+| `snippet_load`            | `sulu_snippet_load`           |
+
+To automatically update this name you can run the following script. If your themes are not in the ClientWebsiteBundle
+you have to change the folder in the second line.
+
+```
+#!/usr/bin/env bash
+TWIGS=($(find ./src/Client/Bundle/WebsiteBundle/Resources/themes -type f -iname "*.twig"))
+
+NAMES[0]="resolve_user"
+NAMES[1]="content_path"
+NAMES[2]="content_root_path"
+NAMES[3]="get_type"
+NAMES[4]="needs_add_button"
+NAMES[5]="get_params"
+NAMES[6]="parameter_to_select"
+NAMES[7]="parameter_to_key_value"
+NAMES[8]="content_load"
+NAMES[9]="content_load_parent"
+NAMES[10]="get_media_url"
+NAMES[11]="meta_alternate"
+NAMES[12]="meta_seo"
+NAMES[13]="navigation_root_flat"
+NAMES[14]="navigation_root_tree"
+NAMES[15]="navigation_flat"
+NAMES[16]="navigation_tree"
+NAMES[17]="breadcrumb"
+NAMES[18]="sitemap_url"
+NAMES[19]="sitemap"
+NAMES[20]="snippet_load"
+
+for twig in ${TWIGS[*]}
+do
+    for name in ${NAMES[*]}
+    do
+        sed -i '' -e "s/$name/sulu_$name/g" $twig
+    done
+done
+```
+
+After running this script please check the changed files for conflicts and wrong replaces! 
+
+### Website Navigation
+
+Children of pages with the state "test" or pages which have the desired navigaiton context not assigned won't be moved
+up in the hierarchy, instead they won't show up in the navigation at all.
+
 ## 1.0.0-RC1
 
 ### Texteditor

composer.json

@@ -3,7 +3,7 @@
     "license": "MIT",
     "type": "project",
     "description": "The sulu content management framework",
-    "version": "dev-develop",
+    "version": "1.0.0-RC2",
     "autoload": {
         "psr-0": {
             "": "src/"
@@ -19,7 +19,7 @@
         "sensio/distribution-bundle": "~3.0",
         "sensio/framework-extra-bundle": "~3.0",
         "incenteev/composer-parameter-handler": "~2.0",
-        "sulu/sulu": "dev-develop",
+        "sulu/sulu": "1.0.0-RC2",
         "symfony-cmf/core-bundle": "1.1.*",
 
         "nelmio/alice": "~1.7",