1831 Commits

Author SHA1 Message Date
Miguel Jacq
b465d9db85 Analyse the right file size to determine if the download has finished in the UI (in order to decide whether to stop server yet) 2018-09-25 14:40:10 +10:00
Miguel Jacq
4bc537762c Merge branch 'develop' into gui_tests 2018-09-24 10:42:46 +10:00
Miguel Jacq
1fa5deaaeb Refactor the unit tests to use common, abstracted tests 2018-09-24 10:41:48 +10:00
Micah Lee
2c307ea582 Merge branch 'update-deps' into develop 2018-09-23 14:50:54 -07:00
Micah Lee
6139c1c3b8 Merge pull request #785 from Baccount/update-deps
Bump Tor to 0.3.4.8
2018-09-23 14:49:48 -07:00
Micah Lee
4b654214d9 Fix locale test 2018-09-23 14:39:29 -07:00
Micah Lee
f340e55dc3 Fixes a few strings after testing 2018-09-23 14:36:36 -07:00
Micah Lee
090e1aa107 Fix some of the language on strings, and move back to "upload" and "download" terminology 2018-09-23 14:00:13 -07:00
Allan Nordhøy
969f3cff6f Spelling cancelled ;) 2018-09-23 06:38:39 +02:00
Allan Nordhøy
5c94e8dd1f No "expired", Allowed sharing timeframe 2018-09-23 06:28:31 +02:00
Allan Nordhøy
d36182a09c Language rework 2018-09-23 06:22:05 +02:00
Baccount
79e21954c9 Upgrade Tor to 0.3.4.8 2018-09-22 11:20:55 -07:00
Baccount
e737f2979d Update get-tor-windows.py 2018-09-22 11:18:18 -07:00
Miguel Jacq
c02088f366 Nope 2018-09-22 18:07:14 +10:00
Miguel Jacq
50dc13d045 pytest 2018-09-22 18:01:17 +10:00
Miguel Jacq
6e5d579cbb One more travis test 2018-09-22 17:57:53 +10:00
Miguel Jacq
4b04d5b002 Add persistent slug test. Add test of clipboard contents in Share mode. Remove travis stuff that I couldn't get to work 2018-09-22 17:47:38 +10:00
Miguel Jacq
3138ca77d8 fighting with travis... 2018-09-22 17:06:02 +10:00
Miguel Jacq
d9bb78417e need pytest-qt 2018-09-22 17:02:16 +10:00
Miguel Jacq
90a9d468ac xvfb might already be installed? 2018-09-22 16:57:26 +10:00
Miguel Jacq
a478c5bab3 Try and make travis-friendly tests 2018-09-22 16:54:52 +10:00
Miguel Jacq
53c34259c0 GUI unit tests in both share and receive mode 2018-09-22 16:50:39 +10:00
Miguel Jacq
d2268f56c5 Merge pull request #782 from micahflee/781_fix_receive_mode
Access .upload_count from the correct object after the web refactor
2018-09-22 10:50:07 +10:00
Micah Lee
a8779d9c4f Access .upload_count from the correct object after the web refactor 2018-09-21 17:42:36 -07:00
Miguel Jacq
645af13ebb Merge pull request #774 from micahflee/663_zip_away
Don't zip if only sharing one file, and big refactor of web module
2018-09-22 10:13:53 +10:00
Micah Lee
b96b36122d Actually tell the GUI the progess 2018-09-21 17:08:11 -07:00
Micah Lee
711473f47e Include onionshare.web module in setup.py 2018-09-21 16:24:22 -07:00
Micah Lee
33d7e112b7 Merge branch 'develop' into 663_zip_away 2018-09-21 16:23:49 -07:00
Micah Lee
fa20d7685b Dynamically figure out the total size of the download based on the whether or not the client making the http request accepts gzip 2018-09-21 16:22:37 -07:00
Miguel Jacq
61fe42a218 Merge pull request #779 from micahflee/small_locale_fixes
A few more locale fixes...
2018-09-22 09:15:19 +10:00
Micah Lee
5e942152a2 Remove the 'using_ephemeral' string 2018-09-21 15:11:18 -07:00
Miguel Jacq
d8cf3d47f3 Merge pull request #777 from micahflee/small_locale_fixes
Remove unused wait_for_hs string, and change tests to test with a dif…
2018-09-22 07:27:31 +10:00
Miguel Jacq
e9aa77d51d Merge pull request #772 from micahflee/linux_deps
Make fedora and debian dependencies get added as package dependencies
2018-09-22 06:59:58 +10:00
Micah Lee
20d950e142 Remove no_filenames string, and instead display CLI usage if you don't specify filenames 2018-09-21 13:58:42 -07:00
Micah Lee
13791ec1ab Remove unused wait_for_hs string, and change tests to test with a different string. Also remove a few other unused strings 2018-09-21 13:38:01 -07:00
Micah Lee
e941ce0fd7 If only sharing one file, compress it with gzip, and serve it with gzip compression if the browser supports it 2018-09-21 12:29:23 -07:00
Micah Lee
5003d44cfb Pass common into ShareModeWeb and ReceiveModeWeb 2018-09-21 11:41:49 -07:00
Micah Lee
4127aa4d71 Move more mode-specific logic out of the Web class and into the approprate mode web classes 2018-09-21 11:36:19 -07:00
Micah Lee
05a2ee0559 Refactor the CLI main function to explicitly use 'share' or 'receive' mode 2018-09-21 11:19:36 -07:00
Micah Lee
916c5ed197 Refactor web even more to all of the share and receive web logic into ShareModeWeb and ReceiveModeWeb classes 2018-09-21 11:14:32 -07:00
Micah Lee
4f27fac840 Refactor web to push share and receive mode logic into their respective files 2018-09-20 23:58:27 -07:00
Micah Lee
d699a7f641 Fix tests to point to new location of ZipWriter class 2018-09-20 23:45:13 -07:00
Micah Lee
48ec4ad583 Split the web module into different files for receive mode and share mode logic 2018-09-20 23:43:04 -07:00
Micah Lee
fe0657128b Make web a module, so I can split it into multiple files 2018-09-20 23:31:52 -07:00
Micah Lee
0ea31d39f7 Only add the download_filename to cleanup_filenames (which get deleted) if the file is zipped up. Otherwise, OnionShare deletes the original file 2018-09-20 23:18:17 -07:00
Miguel Jacq
6110ab8686 Merge pull request #773 from micahflee/ctrl_c
Smoothly quit when Ctrl-C is pressed
2018-09-21 16:17:28 +10:00
Micah Lee
948b406c2a Smoothly quit when Ctrl-C is pressed 2018-09-20 23:09:14 -07:00
Micah Lee
574ef19515 Change more references to web.zip_filesize to be refer to web.download_filesize 2018-09-20 12:25:07 -07:00
Micah Lee
c3a4698153 Also package the new python modules 2018-09-20 09:30:44 -07:00
Micah Lee
a7453bf462 Make fedora and debian dependencies get added to packages built 2018-09-20 09:26:11 -07:00