Commit Graph

2628 Commits

Author SHA1 Message Date
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
Micah Lee
655bb5bad1
Show IndividualFileHistoryItem widgets for directory listings 2019-09-03 21:59:49 -07:00
Micah Lee
644b47082a
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
c55925c1ce
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
09f2f57298
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
f118ebcb09
Merge branch '991_sharing_code' of github.com:mig5/onionshare into 991_sharing_code 2019-09-02 19:46:05 -07:00
Micah Lee
0aa5a89ade
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
cb439743ff
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
f6eb80d5b5
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
273b893946
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
9ae98eb7cb
Extend coverage of website mode tests 2019-09-03 12:23:27 +10:00
Miguel Jacq
458a0fb1d0
Aww. Adjust the website test html code since my easter egg didn't work 2019-09-03 12:00:23 +10:00
Miguel Jacq
f4f7b984e5
remove unnecessary import from GuiWebSiteTest class 2019-09-03 11:53:17 +10:00
Miguel Jacq
5defd4a10b
Add a basic website test 2019-09-03 11:51:59 +10:00
Miguel Jacq
ef78a9c7ed
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
173b2d3f5e
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
877a73ab59
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
d7a7538686
Merge SendBaseModeWeb.build_file_list into SendBaseModeWeb.set_file_info function 2019-09-01 20:53:21 -07:00
Micah Lee
70619dd142
Fix TestSettings.test_init test 2019-09-01 20:46:27 -07:00
Micah Lee
bf20085c4a
Load default settings in CLI mode, of config is not passed in 2019-09-01 20:45:19 -07:00
Micah Lee
6561d71edd
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
1c465b40fe
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
1e1243c8b6
Clear the file list every time a share starts 2019-09-01 19:59:00 -07:00
Micah Lee
414e7f9a38
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
0c9fd8f7b6
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
8293390528
Merge pull request #1019 from micahflee/update_deps
Update deps
2019-09-01 16:24:50 -07:00
Micah Lee
df568d648e
Change link style for directory listing 2019-09-01 16:13:05 -07:00
Micah Lee
e7959f9ae6
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
a0759cedcd
Oops, need to call directory_listing with filesystem_path 2019-09-01 16:02:10 -07:00
Micah Lee
973db941ec
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
7b2b8c2284
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
328b1500ab
Merge branch 'share-code' of https://github.com/hiromipaw/onionshare into hiromipaw-share-code 2019-09-01 17:49:22 -04:00