Merge branch 'develop'

secondfry · Oct 13, 2018 · 7f1bb62 · 7f1bb62
2 parents d9da2a6 + b4ea4cf
commit 7f1bb62
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/resources/ui/gui_main.ui b/resources/ui/gui_main.ui
@@ -530,7 +530,7 @@
                </sizepolicy>
               </property>
               <property name="text">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/farshield/shortcircuit/blob/master/README.md#security-prioritization&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;[?]&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/secondfry/shortcircuit/blob/master/README.md#security-prioritization&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;[?]&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="openExternalLinks">
                <bool>true</bool>

diff --git a/resources/ui/gui_tripwire.ui b/resources/ui/gui_tripwire.ui
@@ -154,7 +154,7 @@
      <item>
       <widget class="QLabel" name="label_6">
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/farshield/shortcircuit/blob/master/README.md#eve-scout&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;[Should I enable this?]&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://github.com/secondfry/shortcircuit/blob/master/README.md#eve-scout&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;[Should I enable this?]&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="openExternalLinks">
         <bool>true</bool>

diff --git a/src/shortcircuit/__init__.py b/src/shortcircuit/__init__.py
@@ -6,4 +6,4 @@
 
 
 __appname__ = "Short Circuit"
-__version__ = "v0.3.0-beta"
+__version__ = "v0.3.1-beta"
diff --git a/src/shortcircuit/app.py b/src/shortcircuit/app.py
@@ -709,7 +709,7 @@ def version_check_done(self, version):
 
             if ret == QtGui.QMessageBox.AcceptRole:
                 QtGui.QDesktopServices.openUrl(
-                    QtCore.QUrl("https://github.com/farshield/shortcircuit/releases/tag/{}".format(version))
+                    QtCore.QUrl("https://github.com/secondfry/shortcircuit/releases/tag/{}".format(version))
                 )
 
     # event: QCloseEvent

diff --git a/src/shortcircuit/model/evescout.py b/src/shortcircuit/model/evescout.py
@@ -19,7 +19,7 @@ def __init__(self, eve_db, url="https://www.eve-scout.com/api/wormholes"):
     def augment_map(self, solar_map):
         connections = -1
         headers = {
-            "User-Agent": "Short Circuit v0.3.0-beta"
+            "User-Agent": "Short Circuit v0.3.1-beta"
         }
         try:
             result = requests.get(

diff --git a/src/shortcircuit/model/tripwire.py b/src/shortcircuit/model/tripwire.py
@@ -12,7 +12,7 @@ class Tripwire:
     """
     Tripwire handler
     """
-    USER_AGENT = "Short Circuit v0.3.0-beta"
+    USER_AGENT = "Short Circuit v0.3.1-beta"
 
     def __init__(self, eve_db, username, password, url):
         self.eve_db = eve_db
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@


		__appname__ = "Short Circuit"
		__version__ = "v0.3.0-beta"
		__version__ = "v0.3.1-beta"