This is an automated email from the ASF dual-hosted git repository. smarru pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git
commit b73cf69fededb98cf7d17cf5ed86f19fa97d7f39 Merge: cb0b5ef 4d51329 Author: Suresh Marru <[email protected]> AuthorDate: Fri Nov 3 20:36:18 2017 -0400 Merge pull request #130 from sachinkariyattin/develop [AIRAVATA-2554] Admin dashboard customization - thanks @sachinkariyattin for your contribution, this is good to be merged. .../resources/lib/Airavata/Model/User/Types.php | 1042 +++++-- .../Profile/User/CPI/UserProfileService.php | 477 ++-- .../airavata/model/user/CustomDashboard.java | 2912 ++++++++++++++++++++ .../apache/airavata/model/user/UserProfile.java | 118 +- .../user/entities/CustomizedDashboardEntity.java | 325 +++ .../commons/user/entities/UserProfileEntity.java | 11 + .../src/main/resources/META-INF/persistence.xml | 1 + .../handlers/UserProfileServiceHandler.java | 1 + .../src/main/resources/user_profile_catalog.sql | 30 + .../user_profile_model.thrift | 36 +- 10 files changed, 4557 insertions(+), 396 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
