Merge Request #62
← To merge requests
From
mezuro:mezuro-integration
into
softwarepublico:master
Mezuro visual integration
Criado um plugin para o Mezuro e depois foram corrigidos os conflitos de JavaScript.
Aparentemente o arquivo colab/plugins/mezuro/urls.py
não está fazendo efeito. Tive que fazer a definição de URLs em colab/urls.py
.
Exemplo de configuração de plugin a ser usada: https://beta.softwarepublico.gov.br/gitlab/mezuro/colab/wikis/plugin_configuration
Este MR fecha a issue: https://beta.softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/44
Commits (5)
-
Shorter regexp for dropping bootstrap.min.js and a more generic one for JQuery in a way that it should not change if Colab updates its JQuery version.
-
bootstrap js dropped from colab so the menus works jquery js dropped from colab so accordion can load Signed off by: Simião Correa Lima de Carvalho <simiaosimis@gmail.com>
-
Signed off by: Simião Correa Lima de Carvalho <simiaosimis@gmail.com>
-
Without this, Colab was unable to request assets or any other sub page from Mezuro. This is not the correct fix. The right place to set the url is on: colab/plugins/mezuro/urls.py. But this is not working yet. Notice that we've also identified a bug on the ReverseProxy, which is not repecting the upstream port always trying to request from port 80. Signed off by: Gustavo Jaruga <darksshades@hotmail.com>
-
Signed off by: Gustavo Jaruga <darksshades@hotmail.com>