Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: ff42d7d5bf2eee119ae470749d3a5b47c6d394da
      
https://github.com/zanata/zanata-server/commit/ff42d7d5bf2eee119ae470749d3a5b47c6d394da
  Author: Alex Eng <a...@redhat.com>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M 
functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M 
functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/resources/zanata/confirm-modal.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Migrate js alert and js confirm for admin pages (#1259)

* refactor(tm): migrate alert/confirm to modal

https://zanata.atlassian.net/browse/ZNTA-1278

* refactor(admin: confirm): migrate js confirm to modal

https://zanata.atlassian.net/browse/ZNTA-1283

https://zanata.atlassian.net/browse/ZNTA-1278

* fix(admin role): fix removing role exception


  Commit: f1a6b7f9874b0a71e4bba8d847df98ab93e196af
      
https://github.com/zanata/zanata-server/commit/f1a6b7f9874b0a71e4bba8d847df98ab93e196af
  Author: Zanata Build Server <jenk...@zanata.org>
  Date:   2016-07-29 (Fri, 29 Jul 2016)

  Changed paths:
    M 
functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M 
functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/resources/zanata/confirm-modal.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Merge commit 'ff42d7d5bf2eee119ae470749d3a5b47c6d394da' into HEAD


Compare: 
https://github.com/zanata/zanata-server/compare/ba0507121d56...f1a6b7f9874b
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to