Commit 2d02912b authored by Benjamin "Ziirish" SANS's avatar Benjamin "Ziirish" SANS
Browse files

Merge remote-tracking branch 'origin/master' into stable

parents c26e2330 a9a91c97

CHANGELOG.rst

+5 −0
Original line number Diff line number Diff line 
Changelog

=========



0.4.4 (01/02/2017)

------------------



- Fix: issue `#193 <https://git.ziirish.me/ziirish/burp-ui/issues/193>`_



0.4.3 (12/28/2016)

------------------

burpui/VERSION

+1 −1
Original line number Diff line number Diff line 
0.4.3
 
0.4.4

burpui/misc/backend/burp2.py

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ class Burp(Burp1): 
        self.logger.info('includes: {}'.format(self.includes))

        self.logger.info('enforce: {}'.format(self.enforce))

        self.logger.info('revoke: {}'.format(self.revoke))

        if not self.app.config['BUI_CLI']:

        if self.app and not self.app.config['BUI_CLI']:

            try:

                # make the connection

                self._spawn_burp(True)

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ redis: 


burpui:

  restart: always

  image: registry.ziirish.me/ziirish/burp-ui:0.4.3

  image: registry.ziirish.me/ziirish/burp-ui:0.4.4

  links:

    - redis

  ports:

pkgs/burp-ui-sql/burpui_sql/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ ROOT = os.path.join(os.path.dirname(os.path.realpath(__file__))) 
if os.path.exists(os.path.join(ROOT, 'VERSION')):

    __version__ = open(os.path.join(ROOT, 'VERSION')).read().rstrip()

else:

    __version__ = '0.4.3'
 
    __version__ = '0.4.4'