[zanata/zanata-platform] 40c10c: WIP: concurrent editing stories (alert complete)
GitHub
noreply at github.com
Wed Dec 6 06:27:48 UTC 2017
Branch: refs/heads/master
Home: https://github.com/zanata/zanata-platform
Commit: 40c10c722d740219951dac577d60148b8762d989
https://github.com/zanata/zanata-platform/commit/40c10c722d740219951dac577d60148b8762d989
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-04 (Mon, 04 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/editor/app.css
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.less
M server/zanata-frontend/src/frontend/app/editor/components/components.story.js
Log Message:
-----------
WIP: concurrent editing stories (alert complete)
Commit: ff8ea75a19f63bc23291ab2c6f60a4a853ebdb43
https://github.com/zanata/zanata-platform/commit/ff8ea75a19f63bc23291ab2c6f60a4a853ebdb43
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-04 (Mon, 04 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
Log Message:
-----------
WIP: concurrent editing stories (transunit items)
Commit: 0f1c3ad2fb56b62d1e310ce4b4b59e5048dfe374
https://github.com/zanata/zanata-platform/commit/0f1c3ad2fb56b62d1e310ce4b4b59e5048dfe374
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-04 (Mon, 04 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.less
Log Message:
-----------
WIP: add modal for concurrent editing
Commit: f29255a13200ea43088aec11a2abd6f0c6eaae48
https://github.com/zanata/zanata-platform/commit/f29255a13200ea43088aec11a2abd6f0c6eaae48
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-04 (Mon, 04 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/editor/app.css
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.css
R server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.less
Log Message:
-----------
WIP: merge conflict modal inputs
Commit: 885c65d1645c74099056a22c264070a5fd0d50e8
https://github.com/zanata/zanata-platform/commit/885c65d1645c74099056a22c264070a5fd0d50e8
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-06 (Wed, 06 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/editor/app.css
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.css
Log Message:
-----------
WIP: concurrent editing modal story - added components, minor styling left to do
Commit: 744fb860339bc242bc93a431a89f66979a36b4dd
https://github.com/zanata/zanata-platform/commit/744fb860339bc242bc93a431a89f66979a36b4dd
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-06 (Wed, 06 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/frontend/app/editor/app.css
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.css
Log Message:
-----------
feat(ZNTA-38) Concurrent Editing modal story complete
Commit: 13b28029102f05ffff179c90029b7ba17f25e799
https://github.com/zanata/zanata-platform/commit/13b28029102f05ffff179c90029b7ba17f25e799
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-06 (Wed, 06 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/editor/app.css
R server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/Concurrent.story.js
R server/zanata-frontend/src/frontend/app/editor/components/ConcurrentEditing/index.css
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentModal/Concurrent.story.js
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentModal/index.css
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentModal/index.js
M server/zanata-frontend/src/frontend/app/editor/components/components.story.js
Log Message:
-----------
feat(ZNTA-38) reworking on Concurrent Editing modal
Commit: 43c4cd5aa130c03d11de42aa9736b55e68d1e318
https://github.com/zanata/zanata-platform/commit/43c4cd5aa130c03d11de42aa9736b55e68d1e318
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-06 (Wed, 06 Dec 2017)
Changed paths:
M Jenkinsfile
M server/functional-test/src/main/java/org/zanata/page/AbstractPage.kt
M server/functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
M server/functional-test/src/main/java/org/zanata/page/account/EnterNewPasswordPage.java
M server/functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
M server/functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
M server/functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
M server/functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
M server/functional-test/src/main/java/org/zanata/page/account/SignInPage.java
M server/functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
R server/functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
R server/functional-test/src/main/java/org/zanata/page/googleaccount/GoogleManagePermissionsPage.java
R server/functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
R server/functional-test/src/main/java/org/zanata/workflow/GoogleWorkFlow.java
M server/functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
M server/functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
M server/functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
M server/functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
M server/functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
R server/functional-test/src/test/java/org/zanata/util/GoogleSignIn.java
M server/pom.xml
M server/zanata-model/src/main/java/org/zanata/model/HLocale.kt
M server/zanata-war/src/main/webapp/account/register.xhtml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into ZNTA-38
Commit: 78661660a7ed09f097ac7a5670efb601db1e3b8b
https://github.com/zanata/zanata-platform/commit/78661660a7ed09f097ac7a5670efb601db1e3b8b
Author: Kathryn Gough <kgough at redhat.com>
Date: 2017-12-06 (Wed, 06 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/app/editor/components/ConcurrentModal/index.css
M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
Log Message:
-----------
feat(ZNTA-38) move css to root Editor css file
Commit: e298b57ba52903471cabd9001902aa825fccc5e6
https://github.com/zanata/zanata-platform/commit/e298b57ba52903471cabd9001902aa825fccc5e6
Author: kathryngo <kgough at redhat.com>
Date: 2017-12-06 (Wed, 06 Dec 2017)
Changed paths:
M server/zanata-frontend/src/frontend/.storybook-editor/__snapshots__/storyshots-editor.test.js.snap
M server/zanata-frontend/src/frontend/app/editor/app.css
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentModal/Concurrent.story.js
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentModal/index.css
A server/zanata-frontend/src/frontend/app/editor/components/ConcurrentModal/index.js
M server/zanata-frontend/src/frontend/app/editor/components/components.story.js
M server/zanata-frontend/src/frontend/app/editor/containers/Root/index.css
Log Message:
-----------
Merge pull request #624 from zanata/ZNTA-38
feat(ZNTA-38): concurrent editing storybook
Compare: https://github.com/zanata/zanata-platform/compare/63801a63fefb...e298b57ba529
More information about the zanata-commits
mailing list