This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The Saros Eclipse Plugin". Pusher was dpp-gerrit.
The branch, master has been updated via c1e277036b095dbe7694668834bfaf1fc2e38a4e (commit) via 569c24a27b46a75054b8bf53c455d3c1dff81ff7 (commit) via a26a5230123e971816ab279d834b987edb4f6d36 (commit) via 8bb8bf0b3ec84fb07eb79bcc7c6f6abd3231f292 (commit) via 20684b51bc751b6deb9ea50d40595f74f85fb949 (commit) via 862c06c257cc15d205242b08403937dfe7aa2cf2 (commit) via cb6a0049020ba4c7de688dab5c98294104e5da50 (commit) from 749242c22c9b7a38c9e04d89ffc78b5bddd0379f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c1e277036b095dbe7694668834bfaf1fc2e38a4e Author: Denis Washington <de...@denisw.de> Date: Tue Jul 28 11:00:03 2015 +0200 [INTERNAL] Implement internalWorked() in CoreToEclipseMonitorAdapter The former no-op implementation is replaced with one that accumulates progress until full work units are reached and forwards those to worked(). This makes the adapter work well with clients that call internalWorked() directly instead of worked() (which seems to be the case with some parts of Subclipse, for instance). Change-Id: Ib42cddab9fbf77fcad2f213b1b47827ae0515f65 Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2785 Tested-by: Jenkins CI Reviewed-by: Stefan Rossbach <srossb...@arcor.de> commit 569c24a27b46a75054b8bf53c455d3c1dff81ff7 Author: Holger Schmeisky <goo...@schmeisky.com> Date: Fri Jul 3 09:01:25 2015 +0200 [FIX][I] Add Icons Change-Id: I33307c66ee7fd0f580a1a36d4d40d128d2ffdd3e Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2753 Tested-by: Jenkins CI Reviewed-by: Holger Schmeisky <holger.schmei...@gmail.com> commit a26a5230123e971816ab279d834b987edb4f6d36 Author: Bastian Sieker <bsie...@mail.uni-paderborn.de> Date: Fri Jul 17 07:36:30 2015 +0200 [HTML] Contact contextmenu for rename and delete An external small library is added to enable a contextmenu on left-click. It is present in the file `bootstrap-contextmenu.js` so you dont need to review this. The contact view is extended by the contextmenu and buttons for renaming and deleting a contact. For each of both functionalities a dialog view is introduced. The SarosApi is extended, accordingly. Change-Id: I92a68f24eeb3078986b30590dbf784062f0ec815 Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2773 Tested-by: Jenkins CI Reviewed-by: Matthias Bohnstedt <matthias.bohnst...@gmail.com> Reviewed-by: Stefan Rossbach <srossb...@arcor.de> commit 8bb8bf0b3ec84fb07eb79bcc7c6f6abd3231f292 Author: Bastian Sieker <bsie...@mail.uni-paderborn.de> Date: Sat Jul 18 17:30:12 2015 +0200 [HTML][FIX] Disable buttons when not connected With this fix the buttons "Add Contact" and "Start Session" are disabled when no account is connected. Change-Id: I5ca6823502c48dfae8bba363b4e6a0ac820f1f32 Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2778 Tested-by: Jenkins CI Reviewed-by: Matthias Bohnstedt <matthias.bohnst...@gmail.com> Reviewed-by: Stefan Rossbach <srossb...@arcor.de> commit 20684b51bc751b6deb9ea50d40595f74f85fb949 Author: Bastian Sieker <bsie...@mail.uni-paderborn.de> Date: Tue Jul 14 13:55:48 2015 +0200 [HTML][FIX] Fix scroll issue in StartSessionWizard Adapted CSS and HTML to fix header and footer. Change-Id: I00452c9777aa5e2650d0ba698f5c7dcb168a0886 Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2772 Tested-by: Jenkins CI Reviewed-by: Matthias Bohnstedt <matthias.bohnst...@gmail.com> Reviewed-by: Stefan Rossbach <srossb...@arcor.de> commit 862c06c257cc15d205242b08403937dfe7aa2cf2 Author: Matthias Bohnstedt <matthias.bohnst...@gmail.com> Date: Sun Jul 12 18:09:34 2015 +0200 [INTERNAL][HTML] Adds session Invitation BrowserFunctions This commit adds a JS browser function that allow it to start a session with the HTML UI. The JS needs to be called with a GSON containing ProjectTree models as first argument and a GSON containing a ContactList model as second argument. The actual resources are received thought the ProjcetListManager. The session itself is started by a ICollaborationUtils In order to use the collaboration utilities this adds 2 new methods to the ProjectListManger. These are used to extract only the resource for sharing without returning a mapping between a project and his resources. Change-Id: Ifaf16cda8df6f4e8de734556e00dbb7075202b6b Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2297 Reviewed-by: Bastian Sieker <bsie...@mail.uni-paderborn.de> Tested-by: Jenkins CI Reviewed-by: Matthias Bohnstedt <matthias.bohnst...@gmail.com> commit cb6a0049020ba4c7de688dab5c98294104e5da50 Author: Bastian Sieker <bsie...@mail.uni-paderborn.de> Date: Fri Jul 10 17:33:00 2015 +0200 [HTML] Add validation to "Add Contact" dialog A synchronous browser function is introduced in `ContactSpecificBrowserFunctions` to validate a given JID. The frontend view of the "Add Contact" dialog is adapted, accordingly. Change-Id: Ib7a57d66e7009565706bf860ef4a5ab15d6616d4 Reviewed-on: http://saros-build.imp.fu-berlin.de/gerrit/2770 Reviewed-by: Stefan Rossbach <srossb...@arcor.de> Tested-by: Jenkins CI Reviewed-by: Bastian Sieker <bsie...@mail.uni-paderborn.de> ----------------------------------------------------------------------- Summary of changes: .../.idea/codeStyleSettings.xml | 4 +- de.fu_berlin.inf.dpp.intellij/META-INF/plugin.xml | 6 +- .../de.fu_berlin.inf.dpp.intellij.iml | 2 +- .../resources/icons/famfamfam/buddy_add_tsk.png | Bin 0 -> 746 bytes .../icons/famfamfam/buddy_offline_obj.png | Bin 0 -> 422 bytes .../resources/icons/famfamfam/buddy_saros_obj.png | Bin 0 -> 722 bytes .../resources/icons/famfamfam}/connect.png | Bin 748 -> 748 bytes .../resources/icons/famfamfam/followmode.png | Bin 0 -> 750 bytes .../resources/icons/famfamfam}/group.png | Bin 753 -> 753 bytes .../resources/icons/famfamfam/in_sync.png | Bin 0 -> 685 bytes .../resources/icons/famfamfam/out_sync.png | Bin 0 -> 15369 bytes .../icons/famfamfam}/project_share_leave_tsk.png | Bin 508 -> 508 bytes .../icons/famfamfam/project_share_tsk.png | Bin 0 -> 581 bytes .../resources/icons/famfamfam}/test_con.gif | Bin 214 -> 214 bytes .../resources/icons/famfamfam/test_con.png | Bin 0 -> 755 bytes .../resources/icons/saros}/invitation.png | Bin 7506 -> 7506 bytes .../icons/{view16 => saros}/saros_misc.png | Bin 547 -> 547 bytes .../inf/dpp/intellij/ui/util/IconManager.java | 20 +- .../inf/dpp/intellij/ui/views/SarosToolbar.java | 4 +- .../intellij/ui/views/buttons/ConnectButton.java | 4 +- .../ui/views/buttons/ConsistencyButton.java | 4 +- .../intellij/ui/views/buttons/FollowButton.java | 2 +- .../ui/views/buttons/LeaveSessionButton.java | 2 +- .../dpp/intellij/ui/wizards/pages/HeaderPanel.java | 2 +- .../html/css/saros.css | 30 ++- de.fu_berlin.inf.dpp.ui.frontend/html/js/app.js | 1 + .../html/js/dictionary.js | 8 +- .../html/js/models/contact.js | 24 ++- .../html/js/models/saros-state.js | 4 +- .../html/js/pages/main-page.js | 30 ++- .../html/js/saros-api.js | 14 +- .../html/js/vendor/bootstrap-contextmenu.js | 211 ++++++++++++++++++++ .../{add-contact.js => add-contact-dialog.js} | 6 +- .../html/js/views/contact.js | 41 +++- .../html/js/views/delete-contact-dialog.js | 39 ++++ .../html/js/views/rename-contact-dialog.js | 60 ++++++ de.fu_berlin.inf.dpp.ui.frontend/html/package.json | 1 - .../html/templates/addContactDialog.jade | 1 + .../html/templates/contact.jade | 11 +- .../html/templates/contacts.jade | 4 +- .../html/templates/deleteContactDialog.jade | 11 + .../html/templates/mainPage.jade | 2 +- ...ContactDialog.jade => renameContactDialog.jade} | 7 +- .../html/templates/selectableContacts.jade | 5 +- .../html/templates/selectableProjectTrees.jade | 5 +- .../src/de/fu_berlin/inf/dpp/HTMLUIStrings.java | 13 +- .../ContactSpecificBrowserFunctions.java | 21 ++ .../SessionWizardPageBrowserFunctions.java | 130 ++++++++++--- .../inf/dpp/ui/manager/ProjectListManager.java | 97 ++++++++- .../src/de/fu_berlin/inf/dpp/ui/model/State.java | 28 ++- .../monitoring/CoreToEclipseMonitorAdapter.java | 35 +++- 51 files changed, 763 insertions(+), 126 deletions(-) create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/buddy_add_tsk.png create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/buddy_offline_obj.png create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/buddy_saros_obj.png copy {de.fu_berlin.inf.dpp/icons/elcl16 => de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam}/connect.png (100%) create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/followmode.png copy {de.fu_berlin.inf.dpp/icons/obj16 => de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam}/group.png (100%) create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/in_sync.png create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/out_sync.png copy {de.fu_berlin.inf.dpp/icons/elcl16 => de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam}/project_share_leave_tsk.png (100%) create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/project_share_tsk.png copy {de.fu_berlin.inf.dpp/icons/etool16 => de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam}/test_con.gif (100%) create mode 100644 de.fu_berlin.inf.dpp.intellij/resources/icons/famfamfam/test_con.png copy {de.fu_berlin.inf.dpp/icons/wizban => de.fu_berlin.inf.dpp.intellij/resources/icons/saros}/invitation.png (100%) copy de.fu_berlin.inf.dpp.intellij/resources/icons/{view16 => saros}/saros_misc.png (100%) create mode 100644 de.fu_berlin.inf.dpp.ui.frontend/html/js/vendor/bootstrap-contextmenu.js rename de.fu_berlin.inf.dpp.ui.frontend/html/js/views/{add-contact.js => add-contact-dialog.js} (95%) create mode 100644 de.fu_berlin.inf.dpp.ui.frontend/html/js/views/delete-contact-dialog.js create mode 100644 de.fu_berlin.inf.dpp.ui.frontend/html/js/views/rename-contact-dialog.js create mode 100644 de.fu_berlin.inf.dpp.ui.frontend/html/templates/deleteContactDialog.jade copy de.fu_berlin.inf.dpp.ui.frontend/html/templates/{addContactDialog.jade => renameContactDialog.jade} (68%) hooks/post-receive -- The Saros Eclipse Plugin ------------------------------------------------------------------------------ _______________________________________________ Dpp-robot mailing list Dpp-robot@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dpp-robot