Browse Source
Merge branch '3.1.x' into tipo_votacao_multiplas_materias
pull/3781/head
cristian-longhi
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with
21 additions and
11 deletions
-
CHANGES.md
-
docker/docker-compose.yaml
-
sapl/settings.py
-
sapl/templates/base.html
-
setup.py
|
|
|
@ -1,4 +1,16 @@ |
|
|
|
|
|
|
|
3.1.164-RC2 / 2025-09-08 |
|
|
|
======================== |
|
|
|
|
|
|
|
* Restaura prod settings de docker-compose |
|
|
|
* Restringe tipos de arquivos para upload (#3794) |
|
|
|
* feat: cria script para remocao de proposicoes de um autor (#3703) |
|
|
|
* HOT-Fix: Conserta erro introduzido no PR #3785 |
|
|
|
* Atualização da imagem base Docker (#3787) |
|
|
|
* Ajustes solicitados - Relatório de Votações Nominais (#3785) |
|
|
|
* Refatora lógica de geração de CSV/json/xlsx (#3786) |
|
|
|
* Remove btn libras de media print (#3777) |
|
|
|
|
|
|
|
3.1.164-RC1 / 2025-08-05 |
|
|
|
======================== |
|
|
|
|
|
|
|
|
|
|
|
@ -33,11 +33,11 @@ services: |
|
|
|
networks: |
|
|
|
- sapl-net |
|
|
|
sapl: |
|
|
|
# image: interlegis/sapl:3.1.164-RC1 |
|
|
|
build: |
|
|
|
context: ../ |
|
|
|
dockerfile: ./docker/Dockerfile |
|
|
|
container_name: sapl |
|
|
|
image: interlegis/sapl:3.1.164-RC2 |
|
|
|
# build: |
|
|
|
# context: ../ |
|
|
|
# dockerfile: ./docker/Dockerfile |
|
|
|
# container_name: sapl |
|
|
|
labels: |
|
|
|
NAME: "sapl" |
|
|
|
restart: always |
|
|
|
@ -53,9 +53,7 @@ services: |
|
|
|
EMAIL_HOST_PASSWORD: senhasmtp |
|
|
|
USE_SOLR: 'True' |
|
|
|
SOLR_COLLECTION: sapl |
|
|
|
SOLR_URL: http://admin:solr@saplsolr:8983 |
|
|
|
SOLR_USER: solr |
|
|
|
SOLR_PASSWORD: solr |
|
|
|
SOLR_URL: http://solr:solr@saplsolr:8983 |
|
|
|
IS_ZK_EMBEDDED: 'True' |
|
|
|
ENABLE_SAPN: 'False' |
|
|
|
TZ: America/Sao_Paulo |
|
|
|
|
|
|
|
@ -43,7 +43,7 @@ ALLOWED_HOSTS = ['*'] |
|
|
|
LOGIN_REDIRECT_URL = '/' |
|
|
|
LOGIN_URL = '/login/?next=' |
|
|
|
|
|
|
|
SAPL_VERSION = '3.1.164-RC1' |
|
|
|
SAPL_VERSION = '3.1.164-RC2' |
|
|
|
|
|
|
|
if DEBUG: |
|
|
|
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' |
|
|
|
|
|
|
|
@ -200,7 +200,7 @@ |
|
|
|
<small> |
|
|
|
Desenvolvido pelo <a href="http://www.interlegis.leg.br/">Interlegis</a> em software livre e aberto. |
|
|
|
</small> |
|
|
|
<span>Release: 3.1.164-RC1</span> |
|
|
|
<span>Release: 3.1.164-RC2</span> |
|
|
|
</p> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
@ -38,7 +38,7 @@ install_requires = [ |
|
|
|
] |
|
|
|
setup( |
|
|
|
name='interlegis-sapl', |
|
|
|
version='3.1.164-RC1', |
|
|
|
version='3.1.164-RC2', |
|
|
|
packages=find_packages(), |
|
|
|
include_package_data=True, |
|
|
|
license='GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007', |
|
|
|
|
