2630 Commits

Author SHA1 Message Date
Micah Lee
cc760595cf Update Windows instructions, except building PyInstaller from source 2019-09-15 18:30:50 -07:00
Micah Lee
233979ec2d Update pip dependencies 2019-09-15 18:03:46 -07:00
Micah Lee
afd3149cb5 Update get Tor scripts to grab Tor Browser 8.8.5 2019-09-15 17:55:30 -07:00
Micah Lee
eced6fb9ce 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
96a471c9de 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
73e6cb1874 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
d2b3f0c2ed Allow 404 errors to work in receive mode 2019-09-15 14:46:29 -07:00
Miguel Jacq
36fdd3f1d5 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
f908a1f383 remove unnecessary import of IndividualFileHistoryItem from share_mode/__init__.py 2019-09-09 16:43:09 +10:00
Miguel Jacq
2c87ea55ff 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
4a4437394d 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
8cc1aa48bb Make web requests indicator icon increment on web requests 2019-09-08 17:39:31 -07:00
Micah Lee
3422cf6ea8 Rename images from share_ to history_, because they are used in all modes 2019-09-08 17:27:24 -07:00
Micah Lee
8aa871b277 Add web requests counter icon to history widget 2019-09-08 17:24:18 -07:00
Micah Lee
04d49dc3bd Add individual downloads label to settings dialog 2019-09-08 12:02:17 -07:00
Micah Lee
bd3a7fe1f7 Don't consider individual downloads in the in_progress counter 2019-09-08 11:58:44 -07:00
Micah Lee
79f563e443 Make sure IndividualFileHistoryItem widgets display properly in receive mode too 2019-09-08 09:45:53 -07:00
Micah Lee
bc210c954d 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
bef116760d Make the IndividualFileHistoryItem widgets have color 2019-09-03 22:31:13 -07:00
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