From 5707d33cfeff428f3e9abac834f3062bc8c0f4e6 Mon Sep 17 00:00:00 2001 From: Eduardo Ferrari Copat Date: Mon, 16 Oct 2017 17:27:34 -0200 Subject: [PATCH 01/13] Create CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..3f8f7a82f --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,46 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [Contact Email Address](https://abapgit-slackinviter.herokuapp.com/). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ From 63aa08c651fe3e517175bed7a79568bc43a8cf93 Mon Sep 17 00:00:00 2001 From: Eduardo Ferrari Copat Date: Mon, 16 Oct 2017 17:29:05 -0200 Subject: [PATCH 02/13] Create issue_template.md --- issue_template.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 issue_template.md diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 000000000..abf52ce39 --- /dev/null +++ b/issue_template.md @@ -0,0 +1,12 @@ +### Description +[Describe the issue or question here] + +### Steps to reproduce +[if it is an error] + +### System environment +- abapGit version number: [see `zif_abapgit_definitions=>gc_abap_version` or latest master] +- Installation type: + - [ ] Using the copy paste report + - [ ] As a repository +- AS ABAP version: [see `System -> Status -> SAP System data -> Component -> SAP_BASIS`] From 9c3b3056c72807079183de5e1f52ae399461406c Mon Sep 17 00:00:00 2001 From: Eduardo Ferrari Copat Date: Mon, 16 Oct 2017 17:29:44 -0200 Subject: [PATCH 03/13] Create PULL_REQUEST_TEMPLATE.md --- PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 PULL_REQUEST_TEMPLATE.md diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..5fbd04046 --- /dev/null +++ b/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1 @@ +Fixes # From a44f58013c7719653806d1246018fdd6da2de87a Mon Sep 17 00:00:00 2001 From: Eduardo Ferrari Copat Date: Mon, 16 Oct 2017 17:31:25 -0200 Subject: [PATCH 04/13] Rename issue_template.md to ISSUE_TEMPLATE.md --- issue_template.md => ISSUE_TEMPLATE.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename issue_template.md => ISSUE_TEMPLATE.md (100%) diff --git a/issue_template.md b/ISSUE_TEMPLATE.md similarity index 100% rename from issue_template.md rename to ISSUE_TEMPLATE.md From 4b914f9cef1373516102d6fd69e2926445afb7b5 Mon Sep 17 00:00:00 2001 From: Eduardo Ferrari Copat Date: Mon, 16 Oct 2017 17:31:46 -0200 Subject: [PATCH 05/13] Update CODE_OF_CONDUCT.md --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3f8f7a82f..810260d84 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [Contact Email Address](https://abapgit-slackinviter.herokuapp.com/). The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at https://abapgit-slackinviter.herokuapp.com/. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. From 6383326d9280447b99bb1d8599c1d0df606714fa Mon Sep 17 00:00:00 2001 From: Alexander Tsybulsky Date: Sat, 21 Oct 2017 18:34:26 +0200 Subject: [PATCH 06/13] #1014 stage can filter by username now --- src/zabapgit_js_common.w3mi.data.js | 70 ++++++++++++++++------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/src/zabapgit_js_common.w3mi.data.js b/src/zabapgit_js_common.w3mi.data.js index 15adca589..6424ba1da 100644 --- a/src/zabapgit_js_common.w3mi.data.js +++ b/src/zabapgit_js_common.w3mi.data.js @@ -139,7 +139,8 @@ function StageHelper(params) { }; // Table columns (autodetection) - this.col = this.detectColumns(); + this.colIndex = this.detectColumns(); + this.filterTargets = ["name", "user"]; // Constants this.HIGHLIGHT_STYLE = "highlight"; @@ -173,13 +174,13 @@ StageHelper.prototype.setHooks = function() { // Detect column index StageHelper.prototype.detectColumns = function() { var dataRow = this.dom.stageTab.tBodies[0].rows[0]; - var cols = {}; + var colIndex = {}; for (var i = dataRow.cells.length - 1; i >= 0; i--) { - if (dataRow.cells[i].className) cols[dataRow.cells[i].className] = i; + if (dataRow.cells[i].className) colIndex[dataRow.cells[i].className] = i; } - return cols; + return colIndex; } // Store table state on leaving the page @@ -195,7 +196,7 @@ StageHelper.prototype.onPageLoad = function() { var data = window.sessionStorage && JSON.parse(window.sessionStorage.getItem(this.pageSeed)); this.iterateStageTab(true, function (row) { - var status = data && data[row.cells[this.col.name].innerText]; + var status = data && data[row.cells[this.colIndex["name"]].innerText]; this.updateRow(row, status || this.STATUS.reset); }); @@ -250,22 +251,33 @@ StageHelper.prototype.onSearch = function (e) { // Apply filter to a single stage line - hide or show StageHelper.prototype.applyFilterToRow = function (row, filter) { - var td = row.cells[this.col.name]; - var origTxt = td.innerText; // without tags - var newTxt = ""; + // Collect data cells + var targets = this.filterTargets.map(function(attr) { + var elem = row.cells[this.colIndex[attr]]; + if (elem.firstChild && elem.firstChild.tagName === "A") elem = elem.firstChild; + return { + elem: elem, + plainText: elem.innerText, // without tags + curHtml: elem.innerHTML + }; + }, this); - if (filter) { - newTxt = origTxt.replace(filter, ""+filter+""); - row.style.display = (newTxt !== origTxt) ? "" : "none"; - } else { // No filter -> just reset the value - newTxt = origTxt; - row.style.display = ""; // default, visible + var isVisible = false; + + // Apply filter to cells, mark filtered text + for (var i = targets.length - 1; i >= 0; i--) { + var target = targets[i]; + target.newHtml = (filter) + ? target.plainText.replace(filter, ""+filter+"") + : target.plainText; + target.isChanged = target.newHtml !== target.curHtml; + isVisible = isVisible || !filter || target.newHtml !== target.plainText; } - if (td.firstChild.tagName === "A") { - td.firstChild.innerHTML = newTxt; - } else { - td.innerHTML = newTxt; + // Update DOM + row.style.display = isVisible ? "" : "none"; + for (var i = targets.length - 1; i >= 0; i--) { + if (targets[i].isChanged) targets[i].elem.innerHTML = targets[i].newHtml; } } @@ -282,12 +294,12 @@ StageHelper.prototype.getStatusImpact = function (status) { // Update table line StageHelper.prototype.updateRow = function (row, newStatus) { - var oldStatus = row.cells[this.col.status].innerText; + var oldStatus = row.cells[this.colIndex["status"]].innerText; if (oldStatus !== newStatus) { this.updateRowStatus(row, newStatus); this.updateRowCommand(row, newStatus); - } else if (!row.cells[this.col.cmd].children.length) { + } else if (!row.cells[this.colIndex["cmd"]].children.length) { this.updateRowCommand(row, newStatus); // For initial run } @@ -296,17 +308,17 @@ StageHelper.prototype.updateRow = function (row, newStatus) { // Update Status cell (render set of commands) StageHelper.prototype.updateRowStatus = function (row, status) { - row.cells[this.col.status].innerText = status; + row.cells[this.colIndex["status"]].innerText = status; if (status === this.STATUS.reset) { - row.cells[this.col.status].classList.remove(this.HIGHLIGHT_STYLE); + row.cells[this.colIndex["status"]].classList.remove(this.HIGHLIGHT_STYLE); } else { - row.cells[this.col.status].classList.add(this.HIGHLIGHT_STYLE); + row.cells[this.colIndex["status"]].classList.add(this.HIGHLIGHT_STYLE); } } // Update Command cell (render set of commands) StageHelper.prototype.updateRowCommand = function (row, status) { - var cell = row.cells[this.col.cmd]; + var cell = row.cells[this.colIndex["cmd"]]; if (status === this.STATUS.reset) { cell.innerHTML = (row.className == "local") ? this.TEMPLATES.cmdLocal @@ -318,7 +330,7 @@ StageHelper.prototype.updateRowCommand = function (row, status) { // Update menu items visibility StageHelper.prototype.updateMenu = function () { - this.dom.commitBtn.style.display = (this.choiseCount > 0) ? "" : "none"; + this.dom.commitBtn.style.display = (this.choiseCount > 0) ? "" : "none"; this.dom.commitAllBtn.style.display = (this.choiseCount > 0) ? "none" : ""; this.dom.fileCounter.innerHTML = this.choiseCount.toString(); } @@ -332,22 +344,19 @@ StageHelper.prototype.submit = function () { StageHelper.prototype.collectData = function () { var data = {}; this.iterateStageTab(false, function (row) { - data[row.cells[this.col.name].innerText] = row.cells[this.col.status].innerText; + data[row.cells[this.colIndex["name"]].innerText] = row.cells[this.colIndex["status"]].innerText; }); return data; } // Table iteration helper -StageHelper.prototype.iterateStageTab = function (changeMode, cb /*, ...*/) { - +StageHelper.prototype.iterateStageTab = function (changeMode, cb /*, ...*/) { var restArgs = Array.prototype.slice.call(arguments, 2); var table = this.dom.stageTab; if (changeMode) { var scrollOffset = window.pageYOffset; this.dom.stageTab.style.display = "none"; - // var stageTabParent = this.dom.stageTab.parentNode; - // table = stageTabParent.removeChild(this.dom.stageTab); } for (var b = 0, bN = table.tBodies.length; b < bN; b++) { @@ -360,7 +369,6 @@ StageHelper.prototype.iterateStageTab = function (changeMode, cb /*, ...*/) { if (changeMode) { this.dom.stageTab.style.display = ""; - // stageTabParent.appendChild(table); window.scrollTo(0, scrollOffset); } } From bdc0863d7ebbb26c63c926ed30f0bb3f22226410 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Sun, 22 Oct 2017 09:31:39 +0200 Subject: [PATCH 07/13] docs: add link to Cluj slides --- docs/other-articles-and-presentations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/other-articles-and-presentations.md b/docs/other-articles-and-presentations.md index f99c671c0..73e9a0eef 100644 --- a/docs/other-articles-and-presentations.md +++ b/docs/other-articles-and-presentations.md @@ -55,5 +55,5 @@ SAUG National Summit 2017, September 5th SAP Teched Las Vegas -Graham Robinson -abapGit, [IT Conference on SAP Technologies](http://www.itconferencesap.com/), Cluj +[abapGit](https://larshp.github.io/Presentations/itsapcluj2017/abapgit/), [IT Conference on SAP Technologies](http://www.itconferencesap.com/), Cluj -Lars Hvam From 169c3478740d3bdc7a85dab22df42331e14ae7e5 Mon Sep 17 00:00:00 2001 From: larshp Date: Sun, 22 Oct 2017 09:15:38 +0000 Subject: [PATCH 08/13] v1.47.0 --- src/zif_abapgit_definitions.intf.abap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index 13d40779b..58df0074a 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -2,7 +2,7 @@ INTERFACE zif_abapgit_definitions PUBLIC . CONSTANTS gc_xml_version TYPE string VALUE 'v1.0.0' ##NO_TEXT. - CONSTANTS gc_abap_version TYPE string VALUE 'v1.46.0' ##NO_TEXT. + CONSTANTS gc_abap_version TYPE string VALUE 'v1.47.0' ##NO_TEXT. TYPES: ty_type TYPE c LENGTH 6 . From d52068eda9cc1fc76e0fe31679db6c6438944e45 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Sun, 22 Oct 2017 11:16:39 +0200 Subject: [PATCH 09/13] v1.47.0 --- changelog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changelog.txt b/changelog.txt index fc443307e..199f972e6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -8,6 +8,11 @@ Legend + : added - : removed +2017-10-22 v1.47.0 +------------------ +* fix FUGR include diffs ++ filter by username on staging page + 2017-10-15 v1.46.0 ------------------ + IAMU supported From a16d35fbc054a81077482aa85e908a05b8f1d4df Mon Sep 17 00:00:00 2001 From: Alexander Tsybulsky Date: Sun, 22 Oct 2017 13:08:32 +0300 Subject: [PATCH 10/13] #1018 docs: remove repeating abapGit, add meta tags --- docs/_config.yml | 2 +- docs/_includes/head.html | 2 ++ docs/_includes/header.html | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/_config.yml b/docs/_config.yml index 6bb065971..b524190eb 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -1,4 +1,4 @@ -title: abapGit Docs +title: abapGit documentation keep_files: [explore.html, repos.json] highlighter: rouge defaults: diff --git a/docs/_includes/head.html b/docs/_includes/head.html index 806c0e18a..c5626f72f 100644 --- a/docs/_includes/head.html +++ b/docs/_includes/head.html @@ -4,4 +4,6 @@ {% if page.title %}{{ site.title }} - {{ page.title }}{% else %}{{ site.title }}{% endif %} + + diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 94151d45d..1bda0a317 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -1,5 +1,6 @@
- abapGit documentation + + ► documentation
From ae5269e91d5a066cfc4ece5bb065fe9d9d516808 Mon Sep 17 00:00:00 2001 From: Eduardo Ferrari Copat Date: Mon, 23 Oct 2017 08:21:10 -0200 Subject: [PATCH 11/13] Delete PULL_REQUEST_TEMPLATE.md --- PULL_REQUEST_TEMPLATE.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 PULL_REQUEST_TEMPLATE.md diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 5fbd04046..000000000 --- a/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ -Fixes # From 190ac727dd59434ff33c46bed4a170ee6c04109b Mon Sep 17 00:00:00 2001 From: Eduardo Ferrari Copat Date: Mon, 23 Oct 2017 08:21:15 -0200 Subject: [PATCH 12/13] Delete ISSUE_TEMPLATE.md --- ISSUE_TEMPLATE.md | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 ISSUE_TEMPLATE.md diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index abf52ce39..000000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,12 +0,0 @@ -### Description -[Describe the issue or question here] - -### Steps to reproduce -[if it is an error] - -### System environment -- abapGit version number: [see `zif_abapgit_definitions=>gc_abap_version` or latest master] -- Installation type: - - [ ] Using the copy paste report - - [ ] As a repository -- AS ABAP version: [see `System -> Status -> SAP System data -> Component -> SAP_BASIS`] From 369f86aef036a33e31230da72021701b02787934 Mon Sep 17 00:00:00 2001 From: larshp Date: Wed, 25 Oct 2017 04:52:53 +0000 Subject: [PATCH 13/13] ignore code of conduct --- .abapgit.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.abapgit.xml b/.abapgit.xml index fd77f77a1..9c8a72eb8 100644 --- a/.abapgit.xml +++ b/.abapgit.xml @@ -13,6 +13,7 @@ /package.json /changelog.txt /.gitignore + /CODE_OF_CONDUCT.md