Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eea/eea.jquery
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 11.2
Choose a base ref
...
head repository: eea/eea.jquery
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 14 commits
  • 5 files changed
  • 8 contributors

Commits on Mar 3, 2020

  1. Back to devel

    EEA Jenkins committed Mar 3, 2020
    Copy the full SHA
    8d03f5d View commit details

Commits on May 13, 2020

  1. Refs #117294 cleaned keyfacts list sizes and header colors

    @ichim-david
    ichim-david committed May 13, 2020
    Copy the full SHA
    44b6e91 View commit details

Commits on May 26, 2020

  1. Refs #117294 undo committed files by accident reverting previous commit

    @ichim-david
    ichim-david committed May 26, 2020
    Copy the full SHA
    7899612 View commit details

Commits on May 6, 2021

  1. Fix deprecated sonarqube command parameter

    valentinab25 committed May 6, 2021
    Copy the full SHA
    4494d0b View commit details

Commits on Nov 1, 2021

  1. Explicitly load zcml of dependencies, instead of using includeDepende… 

    …ncies
    @avoinea
    avoinea committed Nov 1, 2021
    Copy the full SHA
    fa71888 View commit details

  2. Updated version to 11.3

    @eea-jenkins
    eea-jenkins committed Nov 1, 2021
    Copy the full SHA
    1724db1 View commit details

  3. Updated changelog - removed develop information

    @eea-jenkins
    eea-jenkins committed Nov 1, 2021
    Copy the full SHA
    7ffbd09 View commit details

  4. Merge pull request #20 from eea/develop 

    Release
    @avoinea
    avoinea authored Nov 1, 2021
    Copy the full SHA
    e399de6 View commit details

  5. Back to devel

    @eea-jenkins
    eea-jenkins committed Nov 1, 2021
    Copy the full SHA
    da8cce9 View commit details

Commits on Oct 11, 2022

  1. fix pypi homepage

    @valentinab25
    valentinab25 authored Oct 11, 2022
    Copy the full SHA
    7ffebaf View commit details

  2. Updated version to 11.4

    @eea-jenkins
    eea-jenkins committed Oct 11, 2022
    Copy the full SHA
    149d243 View commit details

  3. Updated changelog - removed develop information

    @eea-jenkins
    eea-jenkins committed Oct 11, 2022
    Copy the full SHA
    3ed9ec6 View commit details

  4. Merge branch 'master' into develop

    @valentinab25
    valentinab25 authored Oct 11, 2022
    Copy the full SHA
    ac1db38 View commit details

Commits on Oct 28, 2022

  1. Merge pull request #21 from eea/develop 

    Fix pypi homepage
    @avoinea
    avoinea authored Oct 28, 2022
    Copy the full SHA
    58d6ab8 View commit details
Showing with 14 additions and 4 deletions.
  1. +1 −1 Jenkinsfile
  2. +10 −0 docs/HISTORY.txt
  3. +1 −1 eea/jquery/plone.zcml
  4. +1 −1 eea/jquery/version.txt
  5. +1 −1 setup.py
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Original file line number Diff line number Diff line change
@@ -155,7 +155,7 @@ pipeline {
def nodeJS = tool 'NodeJS11';
withSonarQubeEnv('Sonarqube') {
sh '''sed -i "s|/plone/instance/src/$GIT_NAME|$(pwd)|g" coverage.xml'''
sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPath=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
}
}
10 changes: 10 additions & 0 deletions docs/HISTORY.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
Changelog
=========

11.4 - (2022-10-11)
---------------------------
* Change: Fix pypi homepage
[valentinab25]

11.3 - (2021-11-01)
---------------------------
* Change: Explicitly load zcml of dependencies, instead of using includeDependencies
[avoinea]

11.2 - (2020-02-28)
--------------------------
* Change: patch slick.grid.js to use dispatch.call instead of handle.call
2 changes: 1 addition & 1 deletion eea/jquery/plone.zcml
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="eea">

<includeDependencies package="." />
<include package="collective.js.jqueryui" />
<include zcml:condition="have plone-5"
file="profiles.zcml" />
<include zcml:condition="not-have plone-5"
2 changes: 1 addition & 1 deletion eea/jquery/version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
11.2
11.4
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
author='European Environment Agency: IDM2 A-Team',
author_email='eea-edw-a-team-alerts@googlegroups.com',
download_url="https://pypi.python.org/pypi/eea.jquery",
url='https://github.com/collective/eea.jquery',
url='https://github.com/eea/eea.jquery',
license='GPL',
packages=find_packages(exclude=['ez_setup']),
namespace_packages=['eea'],