You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/09/19 07:18:36 UTC

[2/3] cayenne git commit: Merge PR #318

Merge PR #318


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/200691d1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/200691d1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/200691d1

Branch: refs/heads/master
Commit: 200691d1cadaadd24655b464d4bad358456b9aa8
Parents: 417f176 3b90c68
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Sep 19 10:14:05 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Sep 19 10:14:05 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               |  1 +
 .../modeler/editor/ObjAttributeTableModel.java  | 25 +++----
 .../modeler/editor/ObjEntityAttributePanel.java | 70 +++++++++++---------
 .../editor/ObjEntityRelationshipPanel.java      | 44 +++++++++++-
 4 files changed, 92 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/200691d1/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index e3b3898,5e6c4c7..0a9ab1e
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -17,7 -17,7 +17,8 @@@ CAY-2446 Run Disjoint By Id queries out
  CAY-2447 Crypto support for LocalDateTime
  CAY-2471 Support multiple XML project versions
  CAY-2473 Modeler: cleanup attributes and relationship editors
 +CAY-2474 Modeler: swap buttons in dialog toolbar
+ CAY-2475 Modeler: move inheritance icon to name column in objAttr table and objRel table
  
  Bug Fixes: