[zanata/zanata-server] b8b4aa: disable google merge account

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: b8b4aaf27f830e811c379ed2b8d88f0bb7070f7c
      https://github.com/zanata/zanata-server/commit/b8b4aaf27f830e811c379ed2b8d88f0bb7070f7c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  disable google merge account


  Commit: 403c454079c3ac3c2b2944aab80984388e56b3e2
      https://github.com/zanata/zanata-server/commit/403c454079c3ac3c2b2944aab80984388e56b3e2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/reuse-surefire-forks' into release


  Commit: 92d1d9fbb0dcc59e360321fbdc59b1e884cccfc1
      https://github.com/zanata/zanata-server/commit/92d1d9fbb0dcc59e360321fbdc59b1e884cccfc1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/webpack.prod.config.js
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge branch 'release' into disable-google-merge-account


  Commit: a9eefcc21b54f6315482b16f7befea7267e63fd9
      https://github.com/zanata/zanata-server/commit/a9eefcc21b54f6315482b16f7befea7267e63fd9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update to wildfly 
9.0.0.CR2


  Commit: 70d9ef2ba04c305488e83edbaa6af4ee410e1347
      https://github.com/zanata/zanata-server/commit/70d9ef2ba04c305488e83edbaa6af4ee410e1347
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Merge pull request #870 from zanata/disable-google-merge-account

disable google merge account


  Commit: 64a34a0951c8aa76a18395ebc3eb1827a2f8f8a3
      https://github.com/zanata/zanata-server/commit/64a34a0951c8aa76a18395ebc3eb1827a2f8f8a3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #873 from zanata/wildfly-9.0.0.CR2

Update to wildfly 9.0.0.CR2


  Commit: 8a50c5785f901823e28f62ab1a287ab5d5ceb0ca
      https://github.com/zanata/zanata-server/commit/8a50c5785f901823e28f62ab1a287ab5d5ceb0ca
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map

  Log Message:
  -----------
  Update zanata-spa to commit c6095814a088c87442347b0b5a1f64cca7e4e53d

Squashed commit of the following:

commit 6745942d4ba14b7f82bbf2397355eeb30048a97e
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 15 10:38:37 2015 +1000

    Update zanata-spa to commit c6095814a088c87442347b0b5a1f64cca7e4e53d

commit 3d7cd4f99ef66a829926eef815b12b76b20e3a59
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 12 12:13:29 2015 +1000

    Update zanata-spa to commit 7d6c54600db4d8b747f8a919b1aa2fd89b1f6824

    Changes:

     - Add 100% height to editor wrapper so background is 100% in firefox
     - Fix dropdown/transunit overflow problems
     - Applying difference properties to the right elements… again.


  Commit: fd7018b6d8e2630c6b7f47b07861ebf3ed02d61e
      https://github.com/zanata/zanata-server/commit/fd7018b6d8e2630c6b7f47b07861ebf3ed02d61e
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Bring across some fixes from release branch that should also be applied
to master branch.


Compare: https://github.com/zanata/zanata-server/compare/ae25e84ce65c...fd7018b6d8e2