Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump bootstrap #209

Merged
merged 2 commits into from
May 6, 2016
Merged

Bump bootstrap #209

merged 2 commits into from
May 6, 2016

Conversation

gforcada
Copy link
Member

@gforcada gforcada commented May 6, 2016

@gforcada gforcada mentioned this pull request May 6, 2016
Closed
@mauritsvanrees
Copy link
Member

Does not solve the Jenkins problem. But otherwise: +1.

@gforcada
Copy link
Member Author

gforcada commented May 6, 2016

Oh now I see, the bootstraping is done before switching branches... I manually fixed the jenkins job to use setuptools 21.0.0 which seems to work

@mauritsvanrees
Copy link
Member

Cool, thanks.
I'll merge this one. Jenkins is not finished yet, but the bootstrapping is, so this one seems good.

@mauritsvanrees mauritsvanrees merged commit 24bae84 into 5.1 May 6, 2016
@gforcada
Copy link
Member Author

gforcada commented May 6, 2016

@mauritsvanrees oops, you should have wait as jenkins.plone.org jobs need some fixing

@gforcada gforcada deleted the gforcada-bump-bootstrap branch May 6, 2016 13:34
@mauritsvanrees
Copy link
Member

Oops, sorry, too fast. :(

@mauritsvanrees mauritsvanrees mentioned this pull request May 6, 2016
Closed
@gforcada
Copy link
Member Author

gforcada commented May 6, 2016

@mauritsvanrees no worries I think I fixed everything, let's see what jenkins says

mister-roboto pushed a commit that referenced this pull request Jan 3, 2017
@jensens
[fc] Repository: plone.app.multilingual
1b08bb0 
Branch: refs/heads/master
Date: 2016-12-19T17:35:27Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@16ff77e

Add tests for sitemap.xml.gz (expect to fail for now)

See plone/plone.app.layout#91 and plone/plone.app.layout#92
Also see #209

Files changed:
A src/plone/app/multilingual/tests/test_sitemap.py
M CHANGES.rst
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-19T17:42:35Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@71eb2fa

Use assertIn/assertNotIn  - easier to read (requires Python 2.7)

Files changed:
M src/plone/app/multilingual/tests/test_sitemap.py
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-21T17:50:02Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@7d157d2

Fix tests to use registry rather than portal_properties; unpin plone.app.multilingual so we are testing this source rather than a packaged egg

Files changed:
M src/plone/app/multilingual/tests/test_sitemap.py
M test-plone-5.x.cfg
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T14:29:51Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@58c7556

We shouldn't allow *everything* to fail in Travis!

Files changed:
M .travis.yml
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T14:29:51Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@389aebc

Update failing test - Catalan translations not currently available

Files changed:
M src/plone/app/multilingual/tests/robot/test_translate_content.robot
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T20:15:33Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@62336fc

Require a version of plone.app.layout which contains our sitemap fix

Basically this is:
* 2.6.3+ for Plone 5.1
* 2.5.22+ for Plone 5.0

Files changed:
M setup.py
M test-plone-5.0.x.cfg
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T20:16:55Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@205c047

Try adding plone 5.1 to Travis tests

Files changed:
A test-plone-5.1.x.cfg
M .travis.yml
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2017-01-03T17:47:20+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.multilingual@737910b

Merge pull request #255 from plone/master_issue_91-sitemap.xml.gz

Fix sitemap.xml.gz in master (issue #209)

Files changed:
A src/plone/app/multilingual/tests/test_sitemap.py
A test-plone-5.1.x.cfg
M .travis.yml
M CHANGES.rst
M setup.py
M src/plone/app/multilingual/tests/robot/test_translate_content.robot
M test-plone-5.0.x.cfg
M test-plone-5.x.cfg
mister-roboto pushed a commit that referenced this pull request Jan 3, 2017
@jensens
[fc] Repository: plone.app.multilingual
0130b67 
Branch: refs/heads/master
Date: 2016-12-19T17:35:27Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@16ff77e

Add tests for sitemap.xml.gz (expect to fail for now)

See plone/plone.app.layout#91 and plone/plone.app.layout#92
Also see #209

Files changed:
A src/plone/app/multilingual/tests/test_sitemap.py
M CHANGES.rst
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-19T17:42:35Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@71eb2fa

Use assertIn/assertNotIn  - easier to read (requires Python 2.7)

Files changed:
M src/plone/app/multilingual/tests/test_sitemap.py
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-21T17:50:02Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@7d157d2

Fix tests to use registry rather than portal_properties; unpin plone.app.multilingual so we are testing this source rather than a packaged egg

Files changed:
M src/plone/app/multilingual/tests/test_sitemap.py
M test-plone-5.x.cfg
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T14:29:51Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@58c7556

We shouldn't allow *everything* to fail in Travis!

Files changed:
M .travis.yml
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T14:29:51Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@389aebc

Update failing test - Catalan translations not currently available

Files changed:
M src/plone/app/multilingual/tests/robot/test_translate_content.robot
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T20:15:33Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@62336fc

Require a version of plone.app.layout which contains our sitemap fix

Basically this is:
* 2.6.3+ for Plone 5.1
* 2.5.22+ for Plone 5.0

Files changed:
M setup.py
M test-plone-5.0.x.cfg
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2016-12-30T20:16:55Z
Author: Daniel Jowett (djowett) <daniel@jowettenterprises.com>
Commit: plone/plone.app.multilingual@205c047

Try adding plone 5.1 to Travis tests

Files changed:
A test-plone-5.1.x.cfg
M .travis.yml
Repository: plone.app.multilingual
Branch: refs/heads/master
Date: 2017-01-03T17:47:20+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.multilingual@737910b

Merge pull request #255 from plone/master_issue_91-sitemap.xml.gz

Fix sitemap.xml.gz in master (issue #209)

Files changed:
A src/plone/app/multilingual/tests/test_sitemap.py
A test-plone-5.1.x.cfg
M .travis.yml
M CHANGES.rst
M setup.py
M src/plone/app/multilingual/tests/robot/test_translate_content.robot
M test-plone-5.0.x.cfg
M test-plone-5.x.cfg
mister-roboto pushed a commit that referenced this pull request Aug 14, 2019
@jensens
[fc] Repository: plone.app.layout
470dabf 
Branch: refs/heads/2.8.x
Date: 2019-08-09T18:18:03+03:00
Author: Alin Voinea (avoinea) <contact@avoinea.com>
Commit: plone/plone.app.layout@2469661

Refs #204 - Optimize @@HistoryView workflowHistory user info

Files changed:
M plone/app/layout/viewlets/content.py
Repository: plone.app.layout

Branch: refs/heads/2.8.x
Date: 2019-08-09T18:18:05+03:00
Author: Alin Voinea (avoinea) <contact@avoinea.com>
Commit: plone/plone.app.layout@6201703

Fixes #204 - Fix memory leak on getUserInfo

Files changed:
M plone/app/layout/viewlets/content.py
Repository: plone.app.layout

Branch: refs/heads/2.8.x
Date: 2019-08-09T18:35:15+03:00
Author: Alin Voinea (avoinea) <contact@avoinea.com>
Commit: plone/plone.app.layout@6059f75

Refs #204 - Update Changelog

Files changed:
M CHANGES.rst
Repository: plone.app.layout

Branch: refs/heads/2.8.x
Date: 2019-08-14T10:53:36+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.layout@9632192

Merge pull request #209 from avoinea/2.8.x

2.8.x - Fixes #204 - Fix memory leak on getUserInfo

Files changed:
M CHANGES.rst
M plone/app/layout/viewlets/content.py
mister-roboto pushed a commit that referenced this pull request Feb 17, 2020
@thet
[fc] Repository: plone.app.upgrade
804bbff 
Branch: refs/heads/master
Date: 2020-02-17T18:08:03+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.upgrade@9f40af9

Add Upgrade step for Plone 5.2.2. Move accidentially merged upgrade step for #209 from 5.2.1 to 5.2.2

Files changed:
A plone/app/upgrade/v52/profiles/to_521/registry.xml
A plone/app/upgrade/v52/profiles/to_522/registry/image_captioning.xml
M news/209.feature
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/final.py
M plone/app/upgrade/v52/profiles.zcml
D plone/app/upgrade/v52/profiles/to_521/registry/image_captioning.xml
D plone/app/upgrade/v52/profiles/to_521/registry/types_schema.xml
mister-roboto pushed a commit that referenced this pull request Feb 17, 2020
@thet
[fc] Repository: plone.app.upgrade
8a3a85b 
Branch: refs/heads/master
Date: 2020-02-17T18:08:03+01:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.app.upgrade@9f40af9

Add Upgrade step for Plone 5.2.2. Move accidentially merged upgrade step for #209 from 5.2.1 to 5.2.2

Files changed:
A plone/app/upgrade/v52/profiles/to_521/registry.xml
A plone/app/upgrade/v52/profiles/to_522/registry/image_captioning.xml
M news/209.feature
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/final.py
M plone/app/upgrade/v52/profiles.zcml
D plone/app/upgrade/v52/profiles/to_521/registry/image_captioning.xml
D plone/app/upgrade/v52/profiles/to_521/registry/types_schema.xml
mister-roboto pushed a commit that referenced this pull request Aug 6, 2020
@pbauer
[fc] Repository: plone.app.content
55250df 
Branch: refs/heads/3.5.x
Date: 2020-08-06T09:37:01+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.content@a3121bb

backport plone/plone.app.content#208

Files changed:
M plone/app/content/browser/contents/__init__.py
Repository: plone.app.content

Branch: refs/heads/3.5.x
Date: 2020-08-06T09:49:54+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.content@68a4ffc

add changenote

Files changed:
A news/209.bugfix
Repository: plone.app.content

Branch: refs/heads/3.5.x
Date: 2020-08-06T09:50:41+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.content@cb92221

Merge branch '3.5.x' into backport_208

Files changed:

Repository: plone.app.content

Branch: refs/heads/3.5.x
Date: 2020-08-06T13:44:49+02:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.content@feaac34

Merge pull request #209 from plone/backport_208

backport plone/plone.app.content#208

Files changed:
M news/209.bugfix
M plone/app/content/browser/contents/__init__.py
mister-roboto pushed a commit that referenced this pull request Apr 1, 2022
@thet
[fc] Repository: plone.staticresources
484acb7 
Branch: refs/heads/master
Date: 2022-04-01T09:50:27+02:00
Author: Peter Mathis (petschki) <peter.mathis@kombinat.at>
Commit: plone/plone.staticresources@192bb34

pat-structure fixes

Files changed:
M package.json
Repository: plone.staticresources

Branch: refs/heads/master
Date: 2022-04-01T09:50:36+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.staticresources@8c96fa9

yarn install.

Files changed:
M yarn.lock
Repository: plone.staticresources

Branch: refs/heads/master
Date: 2022-04-01T09:50:43+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.staticresources@bc6e932

Compiled.

Files changed:
A src/plone/staticresources/static/bundle-plone/chunks/66698.5d30787040f416f0da2a.min.js
A src/plone/staticresources/static/bundle-plone/chunks/66698.5d30787040f416f0da2a.min.js.map
A src/plone/staticresources/static/bundle-plone/chunks/72908.a60ee9d6559eb141470c.min.js
A src/plone/staticresources/static/bundle-plone/chunks/72908.a60ee9d6559eb141470c.min.js.map
A src/plone/staticresources/static/bundle-plone/chunks/78452.296b12c29d9e5c9dd07b.min.js
A src/plone/staticresources/static/bundle-plone/chunks/78452.296b12c29d9e5c9dd07b.min.js.map
M src/plone/staticresources/static/bundle-plone/bundle.min.js
M src/plone/staticresources/static/bundle-plone/bundle.min.js.map
D src/plone/staticresources/static/bundle-plone/chunks/66698.8552d6ac5245b5f8cff5.min.js
D src/plone/staticresources/static/bundle-plone/chunks/66698.8552d6ac5245b5f8cff5.min.js.map
D src/plone/staticresources/static/bundle-plone/chunks/77831.72b9bb9e6993bfb71b11.min.js
D src/plone/staticresources/static/bundle-plone/chunks/77831.72b9bb9e6993bfb71b11.min.js.map
D src/plone/staticresources/static/bundle-plone/chunks/78452.a58c8f63b2e720a4b7c6.min.js
D src/plone/staticresources/static/bundle-plone/chunks/78452.a58c8f63b2e720a4b7c6.min.js.map
Repository: plone.staticresources

Branch: refs/heads/master
Date: 2022-04-01T09:51:12+02:00
Author: Johannes Raggam (thet) <thetetet@gmail.com>
Commit: plone/plone.staticresources@35e4959

Merge pull request #209 from plone/pat-structure-fixes

pat-structure fixes

Files changed:
A src/plone/staticresources/static/bundle-plone/chunks/66698.5d30787040f416f0da2a.min.js
A src/plone/staticresources/static/bundle-plone/chunks/66698.5d30787040f416f0da2a.min.js.map
A src/plone/staticresources/static/bundle-plone/chunks/72908.a60ee9d6559eb141470c.min.js
A src/plone/staticresources/static/bundle-plone/chunks/72908.a60ee9d6559eb141470c.min.js.map
A src/plone/staticresources/static/bundle-plone/chunks/78452.296b12c29d9e5c9dd07b.min.js
A src/plone/staticresources/static/bundle-plone/chunks/78452.296b12c29d9e5c9dd07b.min.js.map
M package.json
M src/plone/staticresources/static/bundle-plone/bundle.min.js
M src/plone/staticresources/static/bundle-plone/bundle.min.js.map
M yarn.lock
D src/plone/staticresources/static/bundle-plone/chunks/66698.8552d6ac5245b5f8cff5.min.js
D src/plone/staticresources/static/bundle-plone/chunks/66698.8552d6ac5245b5f8cff5.min.js.map
D src/plone/staticresources/static/bundle-plone/chunks/77831.72b9bb9e6993bfb71b11.min.js
D src/plone/staticresources/static/bundle-plone/chunks/77831.72b9bb9e6993bfb71b11.min.js.map
D src/plone/staticresources/static/bundle-plone/chunks/78452.a58c8f63b2e720a4b7c6.min.js
D src/plone/staticresources/static/bundle-plone/chunks/78452.a58c8f63b2e720a4b7c6.min.js.map
mister-roboto pushed a commit that referenced this pull request Aug 25, 2022
@frapell
[fc] Repository: plone.app.theming
c14a3a7 
Branch: refs/heads/4.1.x
Date: 2022-07-29T14:45:14-03:00
Author: Franco Pellegrini (frapell) <frapell@gmail.com>
Commit: plone/plone.app.theming@3fbb0b3

Make sure Parameters Expressions are string when saving custom styles. fixes gh-209

Files changed:
A news/209.bugfix
M src/plone/app/theming/browser/controlpanel.pt
M src/plone/app/theming/browser/controlpanel.py
Repository: plone.app.theming

Branch: refs/heads/4.1.x
Date: 2022-08-25T09:21:48-03:00
Author: Franco Pellegrini (frapell) <frapell@gmail.com>
Commit: plone/plone.app.theming@4e7d6a1

Only call `.decode()` when on Py3

Files changed:
M src/plone/app/theming/browser/controlpanel.py
Repository: plone.app.theming

Branch: refs/heads/4.1.x
Date: 2022-08-25T10:28:17-03:00
Author: Franco Pellegrini (frapell) <frapell@gmail.com>
Commit: plone/plone.app.theming@9841ce2

Merge pull request #210 from plone/frapell-bytes-params

Make sure Parameters Expressions are string when saving custom styles

Files changed:
A news/209.bugfix
M src/plone/app/theming/browser/controlpanel.pt
M src/plone/app/theming/browser/controlpanel.py
mister-roboto pushed a commit that referenced this pull request May 2, 2023
@gforcada
[fc] Repository: plone.app.discussion
d906be5 
Branch: refs/heads/master
Date: 2023-05-01T22:47:17Z
Author: pre-commit-ci[bot] (pre-commit-ci[bot]) <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Commit: plone/plone.app.discussion@b01c3e0

[pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/asottile/pyupgrade: v3.3.1 → v3.3.2](asottile/pyupgrade@v3.3.1...v3.3.2)

Files changed:
M .pre-commit-config.yaml
Repository: plone.app.discussion

Branch: refs/heads/master
Date: 2023-05-02T16:42:24+02:00
Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com>
Commit: plone/plone.app.discussion@bdc5d27

Merge pull request #209 from plone/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Files changed:
M .pre-commit-config.yaml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Jenkins on 5.1 fails due to setuptools redirect problem
2 participants
@gforcada @mauritsvanrees