Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cubicweb
cubicweb
Commits
cc18c06fe5e4
Commit
5f6bd274
authored
Jun 16, 2021
by
Nicolas Chauvat
Browse files
merge 3.29.3 into 3.30
--HG-- branch : 3.30
parents
ca512a365de7
38dd737a1bcd
Pipeline
#62461
passed with stages
in 35 minutes and 48 seconds
Changes
6
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
.hgtags
View file @
cc18c06f
...
...
@@ -614,6 +614,8 @@ d238badfc268ad4440b3238a24690858bad3fbdd debian/3.25.3-1
b8567725c473b701fe9352e578ad6e05c523c1f2 3.25.4
b8567725c473b701fe9352e578ad6e05c523c1f2 centos/3.25.4-1
b8567725c473b701fe9352e578ad6e05c523c1f2 debian/3.25.4-1
2b12cb5f470a14bb313830353bcffd49ac1534a8 3.25.5
2b12cb5f470a14bb313830353bcffd49ac1534a8 debian/3.25.5
199851fcddd4b45e3d7f40efcd1739134c33db2a 3.26.0
199851fcddd4b45e3d7f40efcd1739134c33db2a debian/3.26.0-1
199851fcddd4b45e3d7f40efcd1739134c33db2a centos/3.26.0-1
...
...
@@ -645,17 +647,40 @@ e7eb914df71dc35c81515e8f04912678aa13c2b1 debian/3.26.11-2
1fc684253207b7989ab25ed68468420185f28e59 3.26.13
172f683a84f6dbc069298bba811f590afb5e5a43 debian/3.26.14-1
172f683a84f6dbc069298bba811f590afb5e5a43 3.26.14
fe9bd0e937e4614de7ae418e60a24909a6e63bc8 3.26.15
fe9bd0e937e4614de7ae418e60a24909a6e63bc8 debian/3.26.15-1
fb6aecd654a34b68b81a444340d5c6c8a7c80664 3.26.16
fb6aecd654a34b68b81a444340d5c6c8a7c80664 debian/3.26.16-1
5c6d242069b6362d2cd2e651bdbf42c384c93da1 3.26.17
5c6d242069b6362d2cd2e651bdbf42c384c93da1 debian/3.26.17-1
2d1d6c5ab3c3b8f8a348d79fe92d2e897eccc698 3.26.18
2d1d6c5ab3c3b8f8a348d79fe92d2e897eccc698 debian/3.26.18-1
d5fb8ecdd5c0cdc6c3df757f2bb8826ec99aa866 3.26.19
d5fb8ecdd5c0cdc6c3df757f2bb8826ec99aa866 debian/3.26.19-1
09a1f898e5eb170e4c9b5cfa6dca59f6419af5a3 3.26.20
439cb73f58abcc86b16d344686940b73a7a471d6 3.26.21
439cb73f58abcc86b16d344686940b73a7a471d6 debian/3.26.21
d40fb37abd55ea1eb2d06a3c404fbf6060bd5d64 3.26.22
d40fb37abd55ea1eb2d06a3c404fbf6060bd5d64 debian/3.26.22
e77900f19390fdf38515afdd212d21ac2592693d 3.27.0
e77900f19390fdf38515afdd212d21ac2592693d debian/3.27.0-1
917601bb5b1ba13eb92296f5bd82eaa89e99bdad 3.27.1
917601bb5b1ba13eb92296f5bd82eaa89e99bdad debian/3.27.1-1
e731c31eaed06ac0a781db4d9a36d8b3732a4852 3.27.2
e731c31eaed06ac0a781db4d9a36d8b3732a4852 debian/3.27.2-1
85284f0282667f577c1422725605565b95b5a9c7 3.27.3
85284f0282667f577c1422725605565b95b5a9c7 debian/3.27.3-1
f2e07e9cc36753c9bb21030a05a6d715aa33a289 3.27.4
7e69862f2332df296950afa7d4943471dec01986 3.27.5
7b332e2e0287182c6e9283b7debf4eb7233d3bad 3.27.6
695832965852f2a8d6c767dab0f74903c962feb8 3.28.0rc1
2c0ecdfda9c46f95ef514efa0c9c06c96c98b4bd 3.28.0
4b2725c4066a0015afa66267dea3bd392235194d 3.28.1
152838b95709e95297996583a7f1a20262453970 3.28.2
0b6a5ea3950bcb3bc50b38e7d7288e3b59a7cb1a 3.28.3
f9d1400d311fb123aa5ce69a3d36742550441646 3.28.4
08e8654133c1f0c44d96da36e054347c22d30c9d 3.29.0
54ddcc997e1cfb7f8701e226fb88128737898c0b 3.29.1
7ddad2aa6426aa73c09cc8232ecbe0f11bfd5d9c 3.29.2
f5768f140cde2e522be7c14ec180e87865890743 3.29.3
bedf6cb540ca4dd0b099ce3c6b00e1202d48168a 3.30.0
MANIFEST.in
View file @
cc18c06f
...
...
@@ -89,4 +89,5 @@ recursive-include cubicweb/skeleton *.py *.css *.js *.po compat *.tmpl format op
prune cubicweb/misc/cwfs
prune debian
prune cubicweb.spec
exclude cubicweb.spec
exclude .gitlab-ci.yml
cubicweb/test/unittest_cwctl.py
View file @
cc18c06f
# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
# contact http
s
://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of CubicWeb.
#
...
...
@@ -14,7 +14,7 @@
# details.
#
# You should have received a copy of the GNU Lesser General Public License along
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
# with CubicWeb. If not, see <http
s
://www.gnu.org/licenses/>.
import
sys
import
os
from
os.path
import
join
...
...
@@ -54,7 +54,8 @@ class CubicWebCtlTC(unittest.TestCase):
def
test_list_configurations
(
self
):
ListCommand
(
None
).
run
([
'configurations'
])
configs
=
[
line
[
2
:].
strip
()
for
line
in
self
.
stream
.
getvalue
().
splitlines
()
configs
=
[
line
[
2
:].
strip
()
for
line
in
self
.
stream
.
getvalue
().
splitlines
()
if
line
.
startswith
(
'* '
)]
self
.
assertIn
(
'all-in-one'
,
configs
)
self
.
assertIn
(
'pyramid'
,
configs
)
...
...
cubicweb/web/views/basecontrollers.py
View file @
cc18c06f
# copyright 2003-201
3
LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
# copyright 2003-20
2
1 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http
s
://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of CubicWeb.
#
...
...
@@ -14,7 +14,7 @@
# details.
#
# You should have received a copy of the GNU Lesser General Public License along
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
# with CubicWeb. If not, see <http
s
://www.gnu.org/licenses/>.
"""Set of base controllers, which are directly plugged into the application
object to handle publication.
"""
...
...
debian/changelog
View file @
cc18c06f
...
...
@@ -4,6 +4,12 @@ cubicweb (3.30.0-1) unstable; urgency=medium
-- Simon Chabot <simon.chabot@logilab.fr> Tue, 16 Mar 2021 16:28:48 +0100
cubicweb (3.29.3-1) unstable; urgency=medium
* New upstream release
-- Nicolas Chauvat <nicolas.chauvat@logilab.fr> Wed, 16 Jun 2021 22:38:10 +0200
cubicweb (3.29.2-1) unstable; urgency=medium
* New bugfix release
...
...
@@ -22,6 +28,18 @@ cubicweb (3.29.0-1) unstable; urgency=medium
-- Laurent Peuch <cortex@worlddomination.be> Tue, 08 Dec 2020 14:51:17 +0200
cubicweb (3.28.4-1) unstable; urgency=medium
* New upstream release
-- Nicolas Chauvat <nicolas.chauvat@logilab.fr> Wed, 16 Jun 2021 22:28:32 +0200
cubicweb (3.28.3-1) unstable; urgency=medium
* New patch release
-- Laurent Peuch <cortex@worlddomination.be> Fri, 05 Mar 2021 11:35:47 +0100
cubicweb (3.28.2-1) unstable; urgency=medium
* New bugfix release
...
...
@@ -40,6 +58,30 @@ cubicweb (3.28.0-1) unstable; urgency=medium
-- Chabot Simon <schabot@logilab.fr> Wed, 24 Jun 2020 10:17:13 +0200
cubicweb (3.27.6-1) unstable; urgency=medium
* New upstream release
-- Nicolas Chauvat <nicolas.chauvat@logilab.fr> Wed, 16 Jun 2021 15:46:29 +0200
cubicweb (3.27.5-1) unstable; urgency=medium
* New patch release
-- Laurent Peuch <cortex@worlddomination.be> Fri, 05 Mar 2021 11:36:40 +0100
cubicweb (3.27.4-1) unstable; urgency=medium
* New upstream release
-- Nicola Spanti <nspanti@logilab.fr> Tue, 05 Jan 2021 16:49:13 +0100
cubicweb (3.27.3-1) unstable; urgency=medium
* New upstream release
-- Philippe Pepiot <philippe.pepiot@logilab.fr> Wed, 18 Mar 2020 13:17:42 +0100
cubicweb (3.27.2-1) unstable; urgency=medium
* New upstream release
...
...
@@ -113,6 +155,54 @@ cubicweb (3.27.0~a0-1) unstable; urgency=medium
-- Denis Laxalde <denis.laxalde@logilab.fr> Wed, 24 Jul 2019 16:08:43 +0200
cubicweb (3.26.22-1) unstable; urgency=medium
* New upstream release
-- Nicola Spanti <nspanti@logilab.fr> Fri, 30 Apr 2021 16:48:52 +0200
cubicweb (3.26.21-1) unstable; urgency=medium
* New upstream release
-- Nicola Spanti <nspanti@logilab.fr> Tue, 27 Apr 2021 15:52:47 +0200
cubicweb (3.26.20-1) unstable; urgency=medium
* New patch release
-- Laurent Peuch <cortex@worlddomination.be> Fri, 05 Mar 2021 12:13:02 +0100
cubicweb (3.26.19-1) unstable; urgency=medium
* New upstream release
-- Elouan Martinet <elouan.martinet@logilab.fr> Mon, 14 Dec 2020 17:29:01 +0200
cubicweb (3.26.18-1) unstable; urgency=medium
* New upstream release
-- Nicola Spanti <nspanti@logilab.fr> Fri, 25 Sep 2020 11:19:53 +0200
cubicweb (3.26.17-1) unstable; urgency=medium
* New upstream release
-- Chabot Simon <schabot@wilson> Thu, 05 Mar 2020 17:49:14 +0100
cubicweb (3.26.16-1) unstable; urgency=medium
* New upstream release
-- Philippe Pepiot <philippe.pepiot@logilab.fr> Thu, 05 Mar 2020 10:41:03 +0100
cubicweb (3.26.15-1) unstable; urgency=medium
* New upstream release.
-- gvandevelde <guillaume.vandevelde@logilab.fr> Thu, 13 Feb 2020 13:54:00 +0100
cubicweb (3.26.14-1) unstable; urgency=medium
* New upstream release.
...
...
@@ -198,6 +288,12 @@ cubicweb (3.26.0-1) unstable; urgency=medium
-- Denis Laxalde <denis.laxalde@logilab.fr> Thu, 01 Feb 2018 09:24:01 +0100
cubicweb (3.25.5-1) unstable; urgency=medium
* backport SMTP authentication from 3.28
-- Carine Dengler <carine.dengler@logilab.fr> Fri, 23 Apr 2021 15:22:48 +0200
cubicweb (3.25.4-1) unstable; urgency=medium
* New upstream release.
...
...
setup.py
View file @
cc18c06f
...
...
@@ -2,7 +2,7 @@
# pylint: disable=W0142,W0403,W0404,W0613,W0622,W0622,W0704,R0904,C0103,E0611
#
# copyright 2003-2011 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
# contact http
s
://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of CubicWeb.
#
...
...
@@ -17,7 +17,7 @@
# details.
#
# You should have received a copy of the GNU Lesser General Public License along
# with CubicWeb. If not, see <http://www.gnu.org/licenses/>.
# with CubicWeb. If not, see <http
s
://www.gnu.org/licenses/>.
"""Generic Setup script, takes package info from __pkginfo__.py file
"""
...
...
@@ -68,7 +68,7 @@ setup(
'rql >= 0.36.1'
,
'yams >= 0.45.3'
,
'lxml'
,
'logilab-database >= 1.17.2'
,
'logilab-database >= 1.17.2
, < 1.18.0
'
,
'passlib >= 1.7'
,
'pytz'
,
'Markdown'
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment