Merge branch 'integration/master' into resteasy3

Conflicts:
	zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
	zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
	zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java

docs/index.md

@@ -1,6 +1,9 @@
 Zanata Server
 =============
-Please visit [About|Zanata](http://zanata.org/about/)
+
+![Zanata](http://assets-zanata.rhcloud.com/master/assets/img/logo/logo-128.png)
+
+[Zanata.org](http://zanata.org) | [Twitter](http://www.twitter.com/#!/zanatatm) | [Blog](http://blog-zanatatm.rhcloud.com/) | [IRC@Freenode](http://webchat.freenode.net/?channels=zanata)
 
 Getting started
 ------------
@@ -28,22 +31,16 @@ Contact us
         <a href="mailto:zanata-users@redhat.com" target="_top">Email</a>
     </li>
     <li>
-        <a href="http://webchat.freenode.net/?channels=zanata">IRC</a>
+        <a href="http://webchat.freenode.net/?channels=zanata">IRC@Freenode</a>
     </li>
     <li>
         <a href="http://zanata.org/mailing-lists/">Mailing lists</a>
     </li>
-    <li>
-        <iframe src="http://ghbtns.com/github-btn.html?user=zanata&repo=zanata-server&type=watch&count=true"
-            allowtransparency="true" frameborder="0" scrolling="0" width="80" height="20"></iframe>
-    </li>
-    <li>
-        <a href="https://twitter.com/zanataTM" class="twitter-follow-button" data-show-count="false">Follow @zanataTM</a>
-        <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
-    </li>
 </ul>
 
 
 License
 -------
-Zanata is Free software, licensed under the [LGPL](http://www.gnu.org/licenses/lgpl-2.1.html).
+Zanata is Free software, licensed under the [LGPL](http://www.gnu.org/licenses/lgpl-2.1.html).
+
+Copyright &copy; 2015, <a href="http//www.redhat.com">Red Hat, Inc</a>.

docs/release-notes.md

@@ -1,19 +1,22 @@
 ## 3.7
 
-<h5>Infrastructure Changes</h5>
-
-* Zanata now uses Infinispan as its cache provider, and the cache needs to be configured in Jboss' `standalone.xml` file. Please see the [Infinispan](user-guide/system-admin/configuration/infinispan) section for more information.
+<h5>Deployment</h5>
 
-* This release adds a one-time migration of some data, which can cause a timeout during server startup. This applies to
-all plain text and libreoffice formats, so is only a concern for servers that are upgrading from an earlier version and
-already have several hundred such documents. To avoid the timeout, add or change the following property in
-`standalone.xml`. A value of 1000 seconds is sufficient in our tests. Since the migration is performed only once, the
-property can safely be reverted or removed before subsequent startups.
+* Deployment for this release may require a longer timeout due to underlying database schema changes and data migration. This is dependent on database size and system performance, and the system administrator should consider increasing the JBoss timeout value in standalone.xml.  This example sets a timeout of two hours, which should be more than enough:
 
         <system-properties>
             ...
-            <property name="jboss.as.management.blocking.timeout" value="1000"/>
+            <property name="jboss.as.management.blocking.timeout" value="7200"/>
+            ...
         </system-properties>
+      
+        
+* The Zanata administrator will also need to reindex HProject table via the Administration menu. See [Manage search](user-guide/admin/manage-search) for more information.
+
+
+<h5>Infrastructure Changes</h5>
+
+* Zanata now uses Infinispan as its cache provider, and the cache needs to be configured in Jboss' `standalone.xml` file. Please see the [Infinispan](user-guide/system-admin/configuration/infinispan) section for more information.
 
 * [1207423](https://bugzilla.redhat.com/show_bug.cgi?id=1207423) - zanata-assets(javascipts and css style) now are packaged as jar and is part of zanata-server dependency.
 [Release](http://repository-zanata.forge.cloudbees.com/release/org/zanata/zanata-assets/) and [snapshot](http://repository-zanata.forge.cloudbees.com/snapshot/org/zanata/zanata-assets/)
@@ -37,7 +40,22 @@ Example usage in html file: `<link rel="shortcut icon" href="#{assets['img/logo/
 * [1218002](https://bugzilla.redhat.com/show_bug.cgi?id=1218002) - Disable Google Open Id option
 * [1222710](https://bugzilla.redhat.com/show_bug.cgi?id=1222710) - Editor option save fails due to ClassCastException
 * [1222358](https://bugzilla.redhat.com/show_bug.cgi?id=1222358) - User profile page dropdown will not work in firefox
+* [1207980](https://bugzilla.redhat.com/show_bug.cgi?id=1207980) - Split up large Liquibase changesets to avoid partial updates
 * [1165930](https://bugzilla.redhat.com/show_bug.cgi?id=1165930) - 'Copy from previous version' shows if an obsolete version exists
+* [1098362](https://bugzilla.redhat.com/show_bug.cgi?id=1098362) - download link in editor doesn't encode properly and result in 404
+* [1225689](https://bugzilla.redhat.com/show_bug.cgi?id=1225689) - [Project Version View] Failed to load entries when the doc id contains characters that should be URL encoded
+* [1098878](https://bugzilla.redhat.com/show_bug.cgi?id=1098878) - OpenID login with FAS does not direct to user dashboard
+* [981498](https://bugzilla.redhat.com/show_bug.cgi?id=981498) - No underscore sanity checking on creating usernames
+* [1147304](https://bugzilla.redhat.com/show_bug.cgi?id=1147304) - Project search fails on special characters
+* [1123186](https://bugzilla.redhat.com/show_bug.cgi?id=1123186) - Project search fails for multiple word project names
+* [1112498](https://bugzilla.redhat.com/show_bug.cgi?id=1112498) - Unable to remove self as maintainer
+* [1227575](https://bugzilla.redhat.com/show_bug.cgi?id=1227575) - Exception on emptying the search field when many users were reported
+* [1224030](https://bugzilla.redhat.com/show_bug.cgi?id=1224030) - Search form does not trigger search if paste text
+* [1198898](https://bugzilla.redhat.com/show_bug.cgi?id=1198898) - Exception on using the URL to view a language not yet added to Zanata
+* [1116172](https://bugzilla.redhat.com/show_bug.cgi?id=1116172) - Captcha no longer used, dead code still exists
+* [1230419](https://bugzilla.redhat.com/show_bug.cgi?id=1230419) - Only show "approved" figure in version page if "Review required" is enable or value more than 0
+* [1229940](https://bugzilla.redhat.com/show_bug.cgi?id=1229940) - When deleting a version or project remove links and replace icon from the activity feed
+* [1230424](https://bugzilla.redhat.com/show_bug.cgi?id=1230424) - Update message "Archived" to "Deleted" in activity table
 
 -----------------------
 
@@ -51,6 +69,11 @@ Example usage in html file: `<link rel="shortcut icon" href="#{assets['img/logo/
 * [1198433](https://bugzilla.redhat.com/show_bug.cgi?id=1198433) - Replace Seam Text with CommonMark Markdown
     * User text on the home page and project "about" pages will now be rendered as CommonMark.
     * Existing Seam Text will be migrated to CommonMark where possible.
+* [1204982](https://bugzilla.redhat.com/show_bug.cgi?id=1204982) - Documentation update for zanata.org/help + readthedocs
+* [1211849](https://bugzilla.redhat.com/show_bug.cgi?id=1211849) - Project maintainer can change project/version slug
+* [1082840](https://bugzilla.redhat.com/show_bug.cgi?id=1082840) - Project maintainer can delete a project or project version
+* [1209669](https://bugzilla.redhat.com/show_bug.cgi?id=1209669) - New REST endpoint for editor suggestions.
+*
 
 ## 3.6.3
 
@@ -112,6 +135,7 @@ The Zanata installer's configuration now enables "connection debugging" to preve
 The editor prototype can be accessed via the **(Try the new alpha editor)** button at the top of the regular editor.  It showcases the look and feel, workflow and intended direction of Zanata.
 
 As it is a _prototype_, there are bound to be some bugs and sub-optimal behaviours - any suggestions or reports can be forwarded to our [bug tracker](https://bugzilla.redhat.com/enter_bug.cgi?product=Zanata).
+
 * [1150373](https://bugzilla.redhat.com/show_bug.cgi?id=1150373) - Keyboard shortcuts
 * [1172437](https://bugzilla.redhat.com/show_bug.cgi?id=1172437) - Add plurals to the new editor
 * [1174071](https://bugzilla.redhat.com/show_bug.cgi?id=1174071) - [SPA editor] Save on Invalid entry should not cause NullPointerException

docs/user-guide/account/account-activate.md

@@ -5,10 +5,11 @@ After signing up with Zanata, you will need to activate the account before being
 To activate your account:
 
  1. Check your email used for signup in Zanata. You should have received an email with subject `Zanata account activation`.
- 1. If you didn't receive an email from Zanata, see [Resend activation email](user-guide/account/account-resend-activation).
+ 1. If you didn't receive an email from Zanata, see [Resend activation email](/user-guide/account/account-resend-activation).
  1. Click the `Account activation link` in your email or copy and paste the URL provided into your browser.
  1. You will be redirected to Zanata with your account activated. You can now log in with your details.
-
-<img alt="Account activated" src="images/account-activated.png" />
+ <figure>
+ ![Account activated](/images/account-activated.png)
+ </figure>
 
 *Note: The activation URL will expire after 24 hours.*

docs/user-guide/account/account-resend-activation.md

@@ -6,5 +6,6 @@ If you didn't receive an email after signing up, or entered wrong email address
  1. You will be redirected to `account inactive` page.
  1. To resend activation email to the same email address, click on `Resend activation email` button.
  1. To update email address and send activation email, enter the new email address in the input field and click `Update email`.
-
-<img alt="Resend activation or update email address" src="images/account-resend-activation.png" />
+ <figure>
+ ![Resend activation or update email address](/images/account-resend-activation.png)
+ </figure>

docs/user-guide/account/account-settings.md

@@ -1,27 +1,27 @@
-# Account Settings
-
 To access your user settings:
 
  1. Login to Zanata
  1. Click on `User menu` on top right corner, click on `Settings` on the drop down menu.
  1. Alternatively, you can click on the `Settings` tab on your dashboard page.
 
-## Account Settings
+## Settings
 
 ### Update email
 
  1. Enter the new email address in input field and click `Update email`.
-
- <img alt="Email input field" src="images/account-settings-email.png" />
+  <figure>
+  ![Email input field](/images/account-settings-email.png)
+  </figure>
 
  1. A confirmation email will be sent to the new email address. Click on the link or the URL to confirm email address change.
 
 ### Change password
 
  1. Fill in the `Old Password` and `New Password` fields.
+  <figure>
+   ![Password input field](/images/account-settings-password.png)
+  </figure>
 
- <img alt="Password input field" src="images/account-settings-password.png" />
-
  1. Click `Update password` to change your password.
 
 ### Merge with other account
@@ -38,13 +38,14 @@ Use this to merge additional Zanata accounts you may have created when signing u
 ## Languages
 
 This page shows all the language teams you have joined in Zanata.
-
-<img alt="Languages" src="images/account-settings-languages.png" />
+ <figure>
+   ![Languages](/images/account-settings-languages.png)
+ </figure>
 
 To join more language teams,
 
  1. Click on `Join a language team`.
- 1. See [Joining language team](user-guide/languages/language-team#joining-a-language-team).
+ 1. See [Joining language team](/user-guide/languages/language-team#joining-a-language-team).
 
 ## Client
 

docs/user-guide/account/account-sign-up.md

@@ -16,8 +16,9 @@ To create an account using OpenID:
  1. Complete the `Name`, `Username`, and `Email` fields. Ensure your email address is entered correctly.
  1. Click `Save`. This sends a validation email to the address you entered in the previous step.
  1. Open the validation email and click the validation link.
-
-<img alt="Account signup openid" src="images/account-signup-openid-details.png" />
+<figure>
+   ![Account signup openid](/images/account-signup-openid-details.png)
+ </figure>
 
 You can now sign in to Zanata using your OpenID credentials.
 

docs/user-guide/account/user-dashboard.md

@@ -7,8 +7,9 @@ The dashboard aims to help you quickly see and navigate to content that is relev
 ## Opening the Dashboard
 
 If you sign in from the Zanata homepage, the first screen you see will be the user dashboard. To get to the dashboard from another page, expand the user menu on the right and click `Dashboard`.
-
-<img alt="User dashboard menu" src="images/user-dashboard.png" />
+ <figure>
+   ![User dashboard menu](/images/user-dashboard.png)
+ </figure>
 
 ## Dashboard Information
 
@@ -19,9 +20,10 @@ Dashboard has
 - translation statistics
 - an activity stream 
 - list of maintained projects
-- [Profile settings](user-guide/account/account-settings)
-
-<img alt="User dashboard" src="images/user-dashboard-view.png" />
+- [Profile settings](/user-guide/account/account-settings)
+ <figure>
+   ![User dashboard](/images/user-dashboard-view.png)
+ </figure>
 
 ### User Information
 
@@ -44,5 +46,6 @@ If you have more recent activity than is shown in the activity stream, you can s
 ### Projects
 
 In the Project tab, a list of your maintained projects is shown. The down arrow to the left of the version can be clicked to show all the versions for the project. The project name, version name link directly to the project page, version page respectively.
-
-<img alt="User dashboard" src="images/user-dashboard-versions.png" />
+<figure>
+   ![User dashboard version](/images/user-dashboard-versions.png)
+</figure>

docs/user-guide/account/user-profile.md

@@ -1,8 +1,10 @@
 You can view a user's profile page by typing the username in the top search field and click on the search result.
-
-<img alt="Project user search" src="images/project-user-search.png" />
+<figure>
+   ![Project user search](/images/project-user-search.png)
+</figure>
 
 On the user profile page, you can view this user's recent contribution statistics according to the selected date range option.
 By default it will show this week's contribution categorized by language and project.
-
-<img alt="User profile" src="images/user-profile.png" />
+<figure>
+   ![User profile](/images/user-profile.png)
+</figure>

docs/user-guide/admin/admin-overview.md

@@ -2,22 +2,21 @@ Zanata admin has full access to all functionality in Zanata.
 
 To access to admin menu, login to Zanata with admin role user, select `Administrator`.
 <figure>
-<img alt="admin menu access" src="images/admin-menu-access.png" />
+![admin menu access](/images/admin-menu-access.png)
 </figure>
 <br/>
 
 ## Admin sections
-
 <figure>
-<img alt="admin sections" src="images/admin-sections.png" />
+![admin sections](/images/admin-sections.png)
 </figure>
 <br/>
 
 ### Server configuration
 
 Configuration and settings for Zanata server.
 
-See [server configuration](user-guide/admin/server-config) for more information.
+See [server configuration](/user-guide/admin/server-config) for more information.
 
 ### Manage users
 
@@ -34,11 +33,11 @@ See [server configuration](user-guide/admin/server-config) for more information.
 
 Reindexing Zanata database used for searching. 
 
-See [Manage search](user-guide/admin/manage-search) for more information.
+See [Manage search](/user-guide/admin/manage-search) for more information.
 
 ### Role assignment rules
 
-See [Role assignment rules](user-guide/admin/role-assignment-rules) for more information.
+See [Role assignment rules](/user-guide/admin/role-assignment-rules) for more information.
 
 ### Translation memory
 
@@ -48,16 +47,16 @@ See [Role assignment rules](user-guide/admin/role-assignment-rules) for more inf
 
 All background asynchronous tasks running in Zanata.
 
-See [Process manager](user-guide/admin/process-manager) for more information.
+See [Process manager](/user-guide/admin/process-manager) for more information.
 
 ### Overall statistic
 
 Overall general statistics of Zanata.
 
-See [Statistic](user-guide/admin/statistic) for more information.
+See [Statistic](/user-guide/admin/statistic) for more information.
 
 ### Server monitoring
 
 Server performance and statistics.
 
-See [Monitoring](user-guide/admin/monitoring) for more information.
+See [Monitoring](/user-guide/admin/monitoring) for more information.

docs/user-guide/admin/contact-admin.md

@@ -1,11 +1,11 @@
 1. Login to Zanata.
 1. At the bottom of the page, click on `Contact admin`.
 <figure>
-<img alt="Contact admin link" src="images/admin-contact-link.png" />
+![Contact admin link](/images/admin-contact-link.png)
 </figure>
 <br/>
 1. In the dialog, fill in the message in the input file and click `Send`.
 <figure>
-<img alt="Contact admin" src="images/admin-contact.png" />
+![Contact admin](/images/admin-contact.png)
 </figure>
 <br/>

docs/user-guide/admin/manage-search.md

@@ -1,6 +1,4 @@
-<figure>
-<img alt="Process manager" src="images/admin-manage-search.png" />
-</figure>
+![Manage search](/images/admin-manage-search.png)
 <br/>
 
 Zanata uses lucene index for fast searching and perform various tasks such as translation memory search.

docs/user-guide/admin/monitoring.md

@@ -1,6 +1,4 @@
-<figure>
-<img alt="Monitoring" src="images/admin-monitoring.png" />
-</figure>
+![Monitoring](/images/admin-monitoring.png)
 <br/>
 
 * Zanata uses [Java Melody](https://code.google.com/p/javamelody/) for performance and statistic monitoring.

docs/user-guide/admin/process-manager.md

@@ -1,7 +1,6 @@
 All asynchronous tasks that are running in the background are shown in this page.
-
 <figure>
-<img alt="Process manager" src="images/admin-process-manager.png" />
+![Process manager](/images/admin-process-manager.png)
 </figure>
 <br/>