summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD.md2
-rw-r--r--CHANGELOG.md14
-rw-r--r--README.md2
-rw-r--r--install/onionshare.nsi4
-rw-r--r--install/pyinstaller.spec2
-rw-r--r--onionshare_gui/mode/website_mode/__init__.py6
-rw-r--r--onionshare_gui/server_status.py2
-rw-r--r--screenshots/onionshare-website-server.pngbin0 -> 148709 bytes
-rw-r--r--share/locale/da.json9
-rw-r--r--share/locale/en.json7
-rw-r--r--share/locale/fr.json1
-rw-r--r--share/locale/is.json9
-rw-r--r--share/locale/nb.json1
-rw-r--r--share/locale/tr.json7
-rw-r--r--share/version.txt2
15 files changed, 25 insertions, 43 deletions
diff --git a/BUILD.md b/BUILD.md
index 260a5d7e..67fc8691 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -14,7 +14,7 @@ Install the needed dependencies:
For Debian-like distros:
```
-apt install -y python3-flask python3-stem python3-pyqt5 python3-crypto python3-socks python-nautilus tor obfs4proxy python3-pytest build-essential fakeroot python3-all python3-stdeb dh-python python3-flask-httpauth python3-distutils
+apt install -y python3-flask python3-flask-httpauth python3-stem python3-pyqt5 python3-crypto python3-socks python-nautilus tor obfs4proxy python3-pytest build-essential fakeroot python3-all python3-stdeb dh-python python3-flask-httpauth python3-distutils
```
For Fedora-like distros:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b70da866..7ca10992 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
# OnionShare Changelog
+## 2.2
+
+* New feature: Website mode, which allows publishing a static HTML website as an onion service
+* Allow individual files to be viewed or downloaded in Share mode, including the ability to browse into subdirectories and use breadcrumbs to navigate back
+* Show a counter when individual files or pages are viewed
+* Better History items including colors and status codes to differentiate between successful and failed requests
+* Swap out the random /slug suffix for HTTP basic authentication (when in non-public mode)
+* Hide the Tor connection settings if the ONIONSHARE_HIDE_TOR_SETTINGS environment variable is set (Tails compatibility)
+* Remove the NoScript XSS warning in Receive Mode now that the NoScript/Tor Browser bug is fixed. The ajax upload method still exists when javascript is enabled.
+* Better support for DragonFly BSD
+* Updated various dependencies, including Flask, Werkzeug, urllib3, requests, and PyQt5
+* Updated Tor to 0.4.1.5
+* Other minor bug fixes
+
## 2.1
* New feature: Auto-start timer, which allows scheduling when the server starts
diff --git a/README.md b/README.md
index fb134e93..0c14c121 100644
--- a/README.md
+++ b/README.md
@@ -42,3 +42,5 @@ Test status: [![CircleCI](https://circleci.com/gh/micahflee/onionshare.svg?style
![Receive mode OnionShare](/screenshots/onionshare-receive-server.png)
![Receive mode Tor Browser](/screenshots/onionshare-receive-client.png)
+
+![Website mode OnionShare](/screenshots/onionshare-website-server.png) \ No newline at end of file
diff --git a/install/onionshare.nsi b/install/onionshare.nsi
index 68213528..52e9b526 100644
--- a/install/onionshare.nsi
+++ b/install/onionshare.nsi
@@ -5,8 +5,8 @@
# change these with each release
!define INSTALLSIZE 115186
!define VERSIONMAJOR 2
-!define VERSIONMINOR 1
-!define VERSIONSTRING "2.1"
+!define VERSIONMINOR 2
+!define VERSIONSTRING "2.2.dev1"
RequestExecutionLevel admin
diff --git a/install/pyinstaller.spec b/install/pyinstaller.spec
index 24664bf9..7eeb5153 100644
--- a/install/pyinstaller.spec
+++ b/install/pyinstaller.spec
@@ -58,7 +58,7 @@ if p == 'Darwin':
app = BUNDLE(
coll,
name='OnionShare.app',
- icon='install/onionshare.icns',
+ icon='onionshare.icns',
bundle_identifier='com.micahflee.onionshare',
info_plist={
'CFBundleShortVersionString': version,
diff --git a/onionshare_gui/mode/website_mode/__init__.py b/onionshare_gui/mode/website_mode/__init__.py
index b277b6c3..7382f5a7 100644
--- a/onionshare_gui/mode/website_mode/__init__.py
+++ b/onionshare_gui/mode/website_mode/__init__.py
@@ -200,12 +200,6 @@ class WebsiteMode(Mode):
"""
self.primary_action.hide()
- def handle_request_load(self, event):
- """
- Handle REQUEST_LOAD event.
- """
- self.system_tray.showMessage(strings._('systray_site_loaded_title'), strings._('systray_site_loaded_message'))
-
def on_reload_settings(self):
"""
If there were some files listed for sharing, we should be ok to re-enable
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index dbcc6ca8..85b1f230 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -209,7 +209,7 @@ class ServerStatus(QtWidgets.QWidget):
if self.mode == ServerStatus.MODE_SHARE:
self.url_description.setText(strings._('gui_share_url_description').format(info_image))
elif self.mode == ServerStatus.MODE_WEBSITE:
- self.url_description.setText(strings._('gui_share_url_description').format(info_image))
+ self.url_description.setText(strings._('gui_website_url_description').format(info_image))
else:
self.url_description.setText(strings._('gui_receive_url_description').format(info_image))
diff --git a/screenshots/onionshare-website-server.png b/screenshots/onionshare-website-server.png
new file mode 100644
index 00000000..55e4fa27
--- /dev/null
+++ b/screenshots/onionshare-website-server.png
Binary files differ
diff --git a/share/locale/da.json b/share/locale/da.json
index b50fedc1..dffe13cb 100644
--- a/share/locale/da.json
+++ b/share/locale/da.json
@@ -233,15 +233,8 @@
"invalid_password_guess": "Ugyldigt adgangskodegæt",
"gui_website_url_description": "<b>Alle</b> men OnionShare-adressen kan <b>besøge</b> dit websted med <b>Tor Browser</b>: <img src='{}' />",
"gui_mode_website_button": "Udgiv websted",
- "systray_site_loaded_title": "Webstedet er indlæst",
- "systray_site_loaded_message": "OnionShare-webstedet er indlæst",
- "systray_website_started_title": "Starter delingswebsted",
- "systray_website_started_message": "Nogen besøger dit websted",
"gui_website_mode_no_files": "Intet websted delt endnu",
- "gui_visit_started": "Nogen har besøgt dit websted {}",
"incorrect_password": "Forkert adgangskode",
"gui_settings_individual_downloads_label": "Fravælg for at tillade download af individuelle filer",
- "history_requests_tooltip": "{}-webanmodninger",
- "systray_individual_file_downloaded_title": "Individuel fil er indlæst",
- "systray_individual_file_downloaded_message": "Individuel fil {} vist"
+ "history_requests_tooltip": "{}-webanmodninger"
}
diff --git a/share/locale/en.json b/share/locale/en.json
index a5a948b0..badb83ca 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -152,8 +152,6 @@
"systray_menu_exit": "Quit",
"systray_page_loaded_title": "Page Loaded",
"systray_page_loaded_message": "OnionShare address loaded",
- "systray_site_loaded_title": "Website Loaded",
- "systray_site_loaded_message": "OnionShare website loaded",
"systray_share_started_title": "Sharing Started",
"systray_share_started_message": "Starting to send files to someone",
"systray_share_completed_title": "Sharing Complete",
@@ -162,10 +160,6 @@
"systray_share_canceled_message": "Someone canceled receiving your files",
"systray_receive_started_title": "Receiving Started",
"systray_receive_started_message": "Someone is sending files to you",
- "systray_website_started_title": "Starting sharing website",
- "systray_website_started_message": "Someone is visiting your website",
- "systray_individual_file_downloaded_title": "Individual file loaded",
- "systray_individual_file_downloaded_message": "Individual file {} viewed",
"gui_all_modes_history": "History",
"gui_all_modes_clear_history": "Clear All",
"gui_all_modes_transfer_started": "Started {}",
@@ -181,7 +175,6 @@
"gui_website_mode_no_files": "No Website Shared Yet",
"gui_receive_mode_no_files": "No Files Received Yet",
"gui_receive_mode_autostop_timer_waiting": "Waiting to finish receiving",
- "gui_visit_started": "Someone has visited your website {}",
"receive_mode_upload_starting": "Upload of total size {} is starting",
"days_first_letter": "d",
"hours_first_letter": "h",
diff --git a/share/locale/fr.json b/share/locale/fr.json
index 12467c07..c0baa245 100644
--- a/share/locale/fr.json
+++ b/share/locale/fr.json
@@ -233,7 +233,6 @@
"systray_website_started_title": "Début du partage du site Web",
"systray_website_started_message": "Quelqu’un visite votre site Web",
"gui_website_mode_no_files": "Aucun site Web n’a encore été partagé",
- "gui_visit_started": "Quelqu’un a visité votre site Web {}",
"invalid_password_guess": "La tentative de mot de passe est invalide",
"gui_mode_website_button": "Publier un site Web",
"incorrect_password": "Le mot de passe est erroné",
diff --git a/share/locale/is.json b/share/locale/is.json
index 73e0dbc3..23dd0e20 100644
--- a/share/locale/is.json
+++ b/share/locale/is.json
@@ -229,15 +229,8 @@
"invalid_password_guess": "Ógilt lykilorð",
"gui_website_url_description": "<b>Hver sem er</b> með þetta OnionShare vistfang getur <b>skoðað</b> vefsvæðið þitt með því að nota <b>Tor-vafrann</b>: <img src='{}' />",
"gui_mode_website_button": "Birta vefsvæði",
- "systray_site_loaded_title": "Vefsvæði hefur verið hlaðið inn",
- "systray_site_loaded_message": "OnionShare-vefsvæði hefur verið hlaðið inn",
- "systray_website_started_title": "Byrja að deila vefsvæðinu",
- "systray_website_started_message": "Einhver er að skoða vefinn þinn",
"gui_website_mode_no_files": "Ennþá hefur engu vefsvæði verið deilt",
- "gui_visit_started": "Einhver hefur skoðað vefsvæðið {}",
"incorrect_password": "Rangt lykilorð",
"gui_settings_individual_downloads_label": "Taktu merkið úr til að leyfa niðurhal á stökum skrám",
- "history_requests_tooltip": "{} vefbeiðnir",
- "systray_individual_file_downloaded_title": "Stakri skrá hlaðið inn",
- "systray_individual_file_downloaded_message": "Staka skráin {} skoðuð"
+ "history_requests_tooltip": "{} vefbeiðnir"
}
diff --git a/share/locale/nb.json b/share/locale/nb.json
index 2450c197..1bbb01ce 100644
--- a/share/locale/nb.json
+++ b/share/locale/nb.json
@@ -238,7 +238,6 @@
"systray_website_started_title": "Starter deling av nettside",
"systray_website_started_message": "Noen besøker din nettside",
"gui_website_mode_no_files": "Ingen nettside delt enda",
- "gui_visit_started": "Noen har besøkt din nettside {}",
"invalid_password_guess": "Feil passord",
"incorrect_password": "Feil passord",
"gui_settings_individual_downloads_label": "Forby nedlasting av enkeltfiler",
diff --git a/share/locale/tr.json b/share/locale/tr.json
index 1e894e17..cbcb549f 100644
--- a/share/locale/tr.json
+++ b/share/locale/tr.json
@@ -200,10 +200,5 @@
"invalid_password_guess": "Geçersiz parola tahmini",
"gui_website_url_description": "Bu OnionShare adresi olan <b>herkes</b>, <b>Tor Browser</b>'ı kullanarak web sitenizi <b>ziyaret</b> edebilir: <img src='{}' />",
"gui_mode_website_button": "Web Sitesini Yayınla",
- "systray_site_loaded_title": "Site Yüklendi",
- "systray_site_loaded_message": "OnionShare sitesi yüklü",
- "systray_website_started_title": "Paylaşım web sitesi başlatılıyor",
- "systray_website_started_message": "Birisi web sitenizi ziyaret ediyor",
- "gui_website_mode_no_files": "Henüz Paylaşılan Web Sitesi Yok",
- "gui_visit_started": "Birisi web sitenizi ziyaret etti {}"
+ "gui_website_mode_no_files": "Henüz Paylaşılan Web Sitesi Yok"
}
diff --git a/share/version.txt b/share/version.txt
index 879b416e..4ec9ad89 100644
--- a/share/version.txt
+++ b/share/version.txt
@@ -1 +1 @@
-2.1
+2.2.dev1 \ No newline at end of file
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion