Commit Graph

2874 Commits

Author SHA1 Message Date
Micah Lee
d01170f8ff
Merge branch 'develop' of github.com:weblate/onionshare-weblate into weblate 2019-09-22 13:45:58 -07:00
Hosted Weblate
1f0c22d405
Translated using Weblate (Norwegian Bokmål)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/nb_NO/

Translated using Weblate (Icelandic)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/is/

Translated using Weblate (Danish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/da/

Translated using Weblate (German)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/de/
2019-09-22 22:39:36 +02:00
Micah Lee
b9ed720590
Fix icon path in PyInstaller file 2019-09-22 13:25:15 -07:00
Micah Lee
06ad2ad073
Version bump to 2.2.dev1 2019-09-22 13:03:08 -07:00
Micah Lee
e2b6eecf34
Merge pull request #1034 from micahflee/932_windows_systray_icon
Hide the system tray icon before closing
2019-09-22 12:57:46 -07:00
Micah Lee
26f2490673
Merge pull request #1030 from mig5/1029_optional_csp
Make setting the Content-Security-Policy header optional so it doesn't break website mode shares
2019-09-22 12:57:13 -07:00
Micah Lee
c0bbe12076
Merge pull request #1033 from micahflee/1027_deps_and_tor
Update dependencies and build instructions
2019-09-22 10:36:22 -07:00
Micah Lee
c3fc5735bc
Typo in Qt version 2019-09-22 10:23:33 -07:00
Micah Lee
f17f198cfc
Merge branch '1027_deps_and_tor' of github.com:micahflee/onionshare into 1027_deps_and_tor 2019-09-22 10:20:37 -07:00
Miguel Jacq
d8c0bc4e4f
Invert the CSP header setting and put it in its own Website Mode settings group. Make the CSP header mandatory for share/receive modes, optional for website mode only. 2019-09-22 16:49:31 +10:00
Micah Lee
0d88d8cb7a
Merge pull request #1036 from micahflee/weblate
Weblate merge
2019-09-20 19:09:50 -07:00
Hosted Weblate
a570855435
Merge branch 'origin/develop' into Weblate. 2019-09-21 03:53:13 +02:00
Micah Lee
821f465286
Merge pull request #7 from micahflee/weblate
Changes from micahflee/onionshare
2019-09-20 18:50:25 -07:00
Micah Lee
dcc601ffe3
Merge branch 'develop' of github.com:micahflee/onionshare-weblate into weblate 2019-09-20 18:48:39 -07:00
Micah Lee
2022b2b2af
Hide the system tray icon before closing 2019-09-20 18:42:40 -07:00
Micah Lee
c40f1b6196
Finish updating instructions for building PyInstaller from source 2019-09-20 18:31:19 -07:00
Micah Lee
e21bf3e80b
Merge pull request #1031 from mig5/950_persistence_fix
Persistence fix (#950)
2019-09-20 17:35:38 -07:00
Micah Lee
078aa63a6b
Merge pull request #1032 from mig5/weblate_translation_suggestions
Source string suggestions from the translators on Weblate
2019-09-20 17:31:38 -07:00
Hosted Weblate
6e964c13ea
Translated using Weblate (French)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/fr/

Translated using Weblate (Swedish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/sv/

Translated using Weblate (Spanish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/es/

Translated using Weblate (Norwegian Bokmål)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/nb_NO/

Translated using Weblate (Swedish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/sv/

Translated using Weblate (French)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/fr/

Translated using Weblate (Icelandic)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/is/

Translated using Weblate (Catalan)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/ca/

Translated using Weblate (Catalan)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/ca/

Translated using Weblate (Danish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/da/

Translated using Weblate (German)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/de/

Translated using Weblate (Turkish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/tr/

Merge branch 'origin/develop' into Weblate.

Translated using Weblate (Norwegian Bokmål)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/nb_NO/

Translated using Weblate (French)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/fr/

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Translated using Weblate (Swedish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/sv/

Translated using Weblate (Catalan)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/ca/

Translated using Weblate (Danish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/da/
2019-09-20 12:27:55 +02:00
Miguel Jacq
09ba78efcf
Source string suggestions from the translators on Weblate 2019-09-16 17:58:15 +10:00
Miguel Jacq
670044fa56
Ensure the backend receives the latest settings object before starting the onion service, and likewise for the GUI, so that we absolutely always save the private key for persistence back to the json settings file when we need to 2019-09-16 14:51:16 +10:00
Miguel Jacq
17063e54db
Fix how security headers get added 2019-09-16 12:30:20 +10:00
Miguel Jacq
2524ddaf94
Make setting the Content-Security-Policy header optional so it doesn't break website mode shares 2019-09-16 12:10:17 +10:00
Micah Lee
98e0f06be7
Update Windows instructions, except building PyInstaller from source 2019-09-15 18:30:50 -07:00
Micah Lee
7d0b0afaad
Update pip dependencies 2019-09-15 18:03:46 -07:00
Micah Lee
957d3e9c6d
Merge pull request #1025 from micahflee/994_breadcrumbs
Breadcrumbs
2019-09-15 17:58:10 -07:00
Micah Lee
e35255861f
Merge pull request #1026 from micahflee/992_website_misc
Validate filenames in CLI for website mode
2019-09-15 17:56:36 -07:00
Micah Lee
76406d1b0c
Update get Tor scripts to grab Tor Browser 8.8.5 2019-09-15 17:55:30 -07:00
Micah Lee
b000ef3099
Validate filenames, and require filenames be passed in, in website mode as well as share mode 2019-09-15 17:06:03 -07:00
Micah Lee
ce9a2f52d0
Add breadcrumbs to share mode 2019-09-15 16:46:28 -07:00
Micah Lee
a5e01a18e2
Add breadcrumbs for website mode 2019-09-15 16:44:24 -07:00
Micah Lee
ecd65f37e3
Fix bug with rendering index.html files in subdirs 2019-09-15 16:23:19 -07:00
Micah Lee
bb0908d6a3
Add org.onionshare.OnionShare.svg, remove onionshare80.xpm, and fix sstdeb.cfg so building a .deb works again 2019-09-15 15:17:40 -07:00
Micah Lee
072c12fbb2
Merge branch 'feature/issue-998' of https://github.com/x80486/onionshare into x80486-feature/issue-998 2019-09-15 15:07:24 -07:00
Micah Lee
51a1f92d99
Merge pull request #1020 from micahflee/991_sharing_code
[WIP] Share code between share mode and website mode
2019-09-15 14:52:57 -07:00
Micah Lee
16fedabf40
Allow 404 errors to work in receive mode 2019-09-15 14:46:29 -07:00
Miguel Jacq
86a2b35d9d
Ensure we increment and return the history_id when throwing error404() in website mode. Add a route for /favicon.ico unless we are in website mode (website might have its own favicon) 2019-09-09 17:23:09 +10:00
Miguel Jacq
b1aa36e805
remove unnecessary import of IndividualFileHistoryItem from share_mode/__init__.py 2019-09-09 16:43:09 +10:00
Miguel Jacq
90ebc3aab4
Fix the discrepancy between SendBaseModeWeb and Web objects' separate cur_history_id attibutes, ensuring that when we call web.error404() we send a new history_id integer for communicating back to the frontend. Add tests for this 2019-09-09 16:35:05 +10:00
Miguel Jacq
8e238ab2d6
Fix tests in Receive Mode that actually do increment the history item widget count where they didn't previously (due to an additional GET that follows the 302 redirect of a POST request on upload) 2019-09-09 12:19:39 +10:00
Micah Lee
26c9256679
Make web requests indicator icon increment on web requests 2019-09-08 17:39:31 -07:00
Micah Lee
2219e107c4
Rename images from share_ to history_, because they are used in all modes 2019-09-08 17:27:24 -07:00
Micah Lee
41b815f0b3
Add web requests counter icon to history widget 2019-09-08 17:24:18 -07:00
Micah Lee
ece908e170
Add individual downloads label to settings dialog 2019-09-08 12:02:17 -07:00
Micah Lee
de67484f09
Don't consider individual downloads in the in_progress counter 2019-09-08 11:58:44 -07:00
Micah Lee
f089ae5847
Make sure IndividualFileHistoryItem widgets display properly in receive mode too 2019-09-08 09:45:53 -07:00
Micah Lee
3f7c4a4e25
Remove method from IndividualFileHistoryItem, and only display these widgets on 200 and 404 requests, not all of the others 2019-09-08 09:35:44 -07:00
Micah Lee
c2011e6915
Make the IndividualFileHistoryItem widgets have color 2019-09-03 22:31:13 -07:00
Micah Lee
dee9e40051
Rename a few more count variables to cur_history_id 2019-09-03 22:20:52 -07:00
Micah Lee
ffe12bdead
Rename download_count/download_id, upload_count/upload_id, and visit_count/visit_id to simply cur_history_id/history_id, and make all errors create IndividualFileHistoryItem widgets 2019-09-03 22:18:30 -07:00