2676 Commits

Author SHA1 Message Date
Micah Lee
4ee6647ee5 Rename a few more count variables to cur_history_id 2019-09-03 22:20:52 -07:00
Micah Lee
54ba711cbf 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
Micah Lee
11860b55f2 Show IndividualFileHistoryItem widgets for directory listings 2019-09-03 21:59:49 -07:00
Micah Lee
37a2f6369c Start making IndividualFileHistoryItem widgets appear in the history, and make non-GET requests return 405 Method Not Allowed 2019-09-03 21:46:32 -07:00
Micah Lee
727a3956db Make it so all of the state variables, including self.file_info get reset in SendBaseModeWEeb.set_file_info, which fixes the bug where old files you were sharing would end up in new zip files 2019-09-03 20:52:59 -07:00
Miguel Jacq
7a6d34103d Reset the ToggleHistory indicator count/label when a share starts. Add a test for this 2019-09-03 17:02:29 +10:00
Micah Lee
aac77ef425 Merge branch '991_sharing_code' of github.com:mig5/onionshare into 991_sharing_code 2019-09-02 19:46:05 -07:00
Micah Lee
c86ad56a56 When downloading individual files in either share or website mode, gzip the file if needed, and stream the file in such a way that a progress bar is possible 2019-09-02 19:45:14 -07:00
Miguel Jacq
04eabbb833 Check for the (absence of) hyperlink in page markup before we move on to trying to download the individual file 2019-09-03 12:38:20 +10:00
Miguel Jacq
174dc79a25 Test to make sure that we *can't* download an individual file when not in stay_open mode, not just that the hyperlink is not present in the page markup 2019-09-03 12:36:05 +10:00
Miguel Jacq
0bde2e9148 Don't show the IndividualFile History item if we are not in 'stay open' mode, or else 404 requests create History noise 2019-09-03 12:35:30 +10:00
Miguel Jacq
608e0eccc6 Extend coverage of website mode tests 2019-09-03 12:23:27 +10:00
Miguel Jacq
f4a6c2de01 Aww. Adjust the website test html code since my easter egg didn't work 2019-09-03 12:00:23 +10:00
Miguel Jacq
6da58edcda remove unnecessary import from GuiWebSiteTest class 2019-09-03 11:53:17 +10:00
Miguel Jacq
93a63098de Add a basic website test 2019-09-03 11:51:59 +10:00
Miguel Jacq
0abac29b09 Add tests to check that hyperlink to a shared file exists when in stay_open mode (and that the file is downloadable individually when so), and not if not 2019-09-03 11:19:42 +10:00
Miguel Jacq
bd329c487c Register a history item when an individual file is viewed that does not match a 'reserved' path 2019-09-02 18:01:56 +10:00
Micah Lee
113cd7eb4b Remove the "Allow downloading individual files" setting altogether, and make it just automatically enabled if "Stop sharing..." is disabled 2019-09-01 21:22:59 -07:00
Micah Lee
1232eb1072 Merge SendBaseModeWeb.build_file_list into SendBaseModeWeb.set_file_info function 2019-09-01 20:53:21 -07:00
Micah Lee
833fd04ef0 Fix TestSettings.test_init test 2019-09-01 20:46:27 -07:00
Micah Lee
9604ee3881 Load default settings in CLI mode, of config is not passed in 2019-09-01 20:45:19 -07:00
Micah Lee
fdb94eba0c Only allow downloading of individual files if it is enabled in settings, and stop sharing automatically isn't 2019-09-01 20:36:30 -07:00
Micah Lee
1ceaaaf533 Add new "Allow downloading of individual files" checkbox to share settings, and only allow it to be enabled when "Stop sharing after files have been sent" is unchecked 2019-09-01 20:15:30 -07:00
Micah Lee
77d5b29c76 Clear the file list every time a share starts 2019-09-01 19:59:00 -07:00
Micah Lee
bca22301aa Merge pull request #1018 from micahflee/1010_python3_distutils
Add python3-distutils as a dependency
2019-09-01 17:47:14 -07:00
Micah Lee
5a50fdf480 Merge pull request #1017 from micahflee/1014_hide_tor_settings
Hide Tor settings with ONIONSHARE_HIDE_TOR_SETTINGS
2019-09-01 17:45:01 -07:00
Micah Lee
c7c04b349b Merge pull request #1019 from micahflee/update_deps
Update deps
2019-09-01 16:24:50 -07:00
Micah Lee
15e8ec4321 Change link style for directory listing 2019-09-01 16:13:05 -07:00
Micah Lee
2143d7016e Add Web.generate_static_url_path back, so each share has its own static path 2019-09-01 16:03:57 -07:00
Micah Lee
1e83a1bfd6 Oops, need to call directory_listing with filesystem_path 2019-09-01 16:02:10 -07:00
Micah Lee
bffbc1930d Move all mode-specific code out of SendBaseModeWeb and into inherited methods in WebsiteModeWeb and ShareModeWeb 2019-09-01 18:44:44 -04:00
Micah Lee
f2bd2e943d Rename BaseModeWeb to SendBaseModeWeb, because this code is only actually shared by send modes (Share and Website, not Receive) 2019-09-01 18:05:53 -04:00
Micah Lee
e9e0302fd6 Merge branch 'share-code' of https://github.com/hiromipaw/onionshare into hiromipaw-share-code 2019-09-01 17:49:22 -04:00
Micah Lee
8f35960ab7 Update python and pyqt5 in BUILD.md, and for macOS install pyinstaller from pip instead of building from source 2019-09-01 17:39:32 -04:00
Micah Lee
61421cf856 Update pip dependencies 2019-09-01 17:35:02 -04:00
Micah Lee
651f4425b3 Merge pull request #1011 from torbsd/torbsd
DragonFly is *BSD; bringing back #716
2019-09-01 13:44:35 -07:00
Micah Lee
1cb745b071 Add python3-distutils as a dependency, and also remove reduntant build-depends from stdeb.cfg 2019-09-01 13:30:49 -07:00
Micah Lee
74e961fd68 If ONIONSHARE_HIDE_TOR_SETTINGS is set, hide Tor settings in the settings dialog 2019-09-01 13:16:00 -07:00
Micah Lee
287eddd003 Merge pull request #1012 from emmapeel2/translation_updates
weblate translation updates
2019-09-01 12:45:39 -07:00
Micah Lee
4ae26b3623 Change package in build instructions from python-flask-httpauth to python3-flask-httpauth 2019-09-01 12:38:13 -07:00
emma peel
a66f8e1a6a weblate translation updates 2019-07-27 08:01:35 +00:00
Hosted Weblate
7c524d409d Merge branch 'origin/develop' into Weblate. 2019-07-27 09:35:52 +02:00
Hosted Weblate
169ee4c8c7 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-07-27 09:34:09 +02:00
Hosted Weblate
f6fbacaffd Merge branch 'origin/develop' into Weblate. 2019-07-26 13:36:50 +02:00
emma peel
a17a73d5d5 Merge branch 'develop' of github.com:weblate/onionshare-weblate into develop 2019-07-26 11:36:15 +00:00
Hosted Weblate
1d7b3dda8a Merge branch 'origin/develop' into Weblate. 2019-07-26 13:32:43 +02:00
emma peel
0dee28a983 Merge branch 'develop' of github.com:micahflee/onionshare into develop 2019-07-26 11:30:20 +00:00
emma peel
5f6a051fb9 Merge branch 'develop' of github.com:micahflee/onionshare-weblate into develop 2019-07-26 11:26:53 +00:00
emma peel
ccdfed1b0c Squashed commit of the following:
commit 9a60c8c87f3d9f05ef1a05fc472c94bc22616b49
Author: Hosted Weblate <hosted@weblate.org>
Date:   Sat Jun 22 13:01:49 2019 +0200

    Translated using Weblate (Swedish)
    Translated using Weblate (Catalan)
    Translated using Weblate (Danish)

commit 8083fd49298768d96d33684f65b05a2aa3dddd1c
Author: Hosted Weblate <hosted@weblate.org>
Date:   Thu May 16 17:49:23 2019 +0200

    Translated using Weblate (Hungarian)
    Translated using Weblate (Turkish)
    Translated using Weblate (Telugu)
    Translated using Weblate (Swahili)
    Translated using Weblate (Malay)
    Translated using Weblate (Greek)
    Translated using Weblate (Spanish)
    Added translation using Weblate (Swahili)

commit e0db8944813b3f3c48a2d61a6f12c5ed15dee704
Merge: 543744d a352dbe
Author: emma peel <emma.peel@riseup.net>
Date:   Wed May 8 10:04:34 2019 +0000

    Merge branch 'develop' of github.com:weblate/onionshare-weblate into develop

commit 543744d81dca1b0f75724083d073fe66fb0e6c0e
Author: Hosted Weblate <hosted@weblate.org>
Date:   Tue May 7 23:16:35 2019 +0200

    Translated using Weblate (German)

commit 574a0c395318d7f3aeca3c7b9ef8556d22178cfe
Author: Hosted Weblate <hosted@weblate.org>
Date:   Wed May 8 09:42:39 2019 +0200

    Translated using Weblate (Romanian)
    Translated using Weblate (Italian)
    Translated using Weblate (German)
    Translated using Weblate (Dutch)
    Translated using Weblate (Catalan)
    Translated using Weblate (Romanian)
    Translated using Weblate (Italian)
    Translated using Weblate (German)
    Translated using Weblate (German)
    Translated using Weblate (German)
    Translated using Weblate (Turkish)
    Translated using Weblate (Greek)
    Translated using Weblate (German)
    Translated using Weblate (French)
    Translated using Weblate (Arabic)
    Translated using Weblate (Turkish)
    Translated using Weblate (Turkish)
    Translated using Weblate (German)
commit a352dbe9ff3bd54904cbb4cf715ab5341a113acb
Author: Hosted Weblate <hosted@weblate.org>
Date:   Tue May 7 23:16:35 2019 +0200

    Translated using Weblate (German)

	modified:   share/locale/ar.json
	modified:   share/locale/ca.json
	modified:   share/locale/da.json
	modified:   share/locale/de.json
	modified:   share/locale/el.json
	modified:   share/locale/es.json
	modified:   share/locale/fr.json
	modified:   share/locale/hu.json
	modified:   share/locale/it.json
	modified:   share/locale/ms.json
	modified:   share/locale/nl.json
	modified:   share/locale/ro.json
	modified:   share/locale/sv.json
	new file:   share/locale/sw.json
	modified:   share/locale/te.json
	modified:   share/locale/tr.json
2019-07-26 11:25:51 +00:00
Vinicius Zavam
b0b5907566 DragonFly is *BSD; bringing back #716 2019-07-23 15:09:11 +00:00