Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-14 05:31:25 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,425 Commits 17 Branches 45 Tags
Commit Graph

2425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Micah Lee
b62714628d Merge pull request #941 from mig5/configurable_connect_timeout 
Allow the bundled Tor connection timeout to be configurable from the CLI
 2019-03-22 18:00:05 -07:00
Micah Lee
06731ce56a Merge pull request #935 from mig5/fix_receive_mode_folder_collision 
On a folder name collision, make sure we update the self.receive_mode_dir attribute
 2019-03-22 17:50:33 -07:00
Micah Lee
395e9f7fe1 Fix css on receive.html as well 2019-03-22 15:27:23 -07:00
Micah Lee
9575ca556f Merge branch 'develop' of https://github.com/ZeroDot1/onionshare into ZeroDot1-develop 2019-03-22 15:23:53 -07:00
Micah Lee
f5833b67ad Merge pull request #917 from mig5/916_messaging_above_send_button 
Make progress, noscript warning, and flashes appear above the form, but beneath the logo
 2019-03-22 15:17:50 -07:00
Miguel Jacq
d7ba11ef0c Don't force connect timeout of 150 when using Bridges if a user-supplied connect timeout has been passed in already 2019-03-12 15:36:49 +11:00
Miguel Jacq
726cb0ad9e Allow the bundled Tor connection timeout to be configurable from the CLI 2019-03-12 15:29:07 +11:00
Miguel Jacq
2666bb2dae Use png rather than svg for warning image. Concatenate flash messages with commas to reduce page height. Allow warning message to be wider 2019-03-11 17:27:17 +11:00
ZeroDot1
e2d2da22ed Repair the css . . . 2019-03-11 05:33:28 +01:00
Micah Lee
c09c786fea Weblate merge (#940) 
* Translated using Weblate (Chinese (Simplified))
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/zh_Hans/

Translated using Weblate (Chinese (Simplified))
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/zh_Hans/

Added translation using Weblate (Malay)

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

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

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

Merge branch 'origin/develop' into Weblate.

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

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

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

* Translated using Weblate (Chinese (Simplified))
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/zh_Hans/

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

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

* Translated using Weblate (Portuguese (Brazil))
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/pt_BR/

* Translated using Weblate (Italian)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/it/

* Translated using Weblate (Finnish)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/fi/

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

* Translated using Weblate (Arabic)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/ar/

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

* Translated using Weblate (Indonesian)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/id/

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

* Translated using Weblate (Chinese (Traditional))
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/zh_Hant/

* Translated using Weblate (Indonesian)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/id/

* 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 (Hindi)
Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/hi/

Added translation using Weblate (Hindi)
 2019-03-10 15:07:38 -07:00
Micah Lee
543919e7a7 Merge pull request #931 from palob/launcher-fix 
Unhardcode GNU/Linux launcher icon
 2019-03-10 13:59:18 -07:00
Micah Lee
54fbe82d10 Merge pull request #926 from mig5/fix_settings_in_web_test 
Use a custom Settings object in test_onionshare_web.py, rather than potentially load non-ephemeral settings
 2019-03-10 13:58:11 -07:00
Micah Lee
67c3c7fec7 Merge pull request #914 from mig5/sender_close_test_obsolete 
Remove obsolete test for sender closing a Receive Mode service via the web interface
 2019-03-10 12:32:36 -07:00
Miguel Jacq
188281e8d2 On a folder name collision, make sure we update the self.receive_mode_dir attribute after creating a unique folder with a suffix. Adjust Receive Mode tests to test for this 2019-03-08 12:54:10 +11:00
Vincent Bermel
6a6b97b23d Unhardcode linux launcher icon 2019-03-02 09:06:15 +01:00
Miguel Jacq
74e44f71b7 Use a custom Settings object in test_onionshare_web.py, rather than potentially load non-ephemeral settings 2019-02-26 11:10:09 +11:00
Miguel Jacq
7e4efc39e5 remove unnecessary bit of css 2019-02-25 14:26:29 +11:00
Miguel Jacq
db6ba60973 Move the noscript warning to top of page and make it appear less of an error, per more recommendations (and with supplied svg) from @ninavizz 2019-02-24 10:22:44 +11:00
ZeroDot1
ba3c509a15 Add asynchronous functions to the templates to reduce page load times. 
Asynchronous functions for CSS and JS.
 2019-02-23 19:37:56 +01:00
Miguel Jacq
18962ab41a Make progress, noscript warning, and flashes appear above the form, but beneath the logo 2019-02-23 13:16:06 +11:00
Miguel Jacq
5e37565783 remove actual sender_closed test function 2019-02-22 16:53:51 +11:00
Miguel Jacq
f1ec7d9381 Remove obsolete test for sender closing a Receive Mode service via the web interface 2019-02-22 16:50:40 +11:00
Micah Lee
d86b13d91c Remove python3-distutils from BUILD.md as well 2019-02-21 10:12:56 -08:00
Micah Lee
1f1aa6fd52 Tweak readme install language 2019-02-20 10:55:01 -08:00
Micah Lee
1e2fba5d76 Merge branch 'patch-1' of https://github.com/pahakalle/onionshare into pahakalle-patch-1 2019-02-20 10:52:00 -08:00
Micah Lee
f524679be0 Remove python3-distutils as a dependency because it isn't in every debian, and also doesn't seem necessary; and change the default suite to cosmic to make the PPA release simpler 2019-02-20 10:51:33 -08:00
Kalle Laine
39e492dae1 Add homebrew install option 
also discussed sort of in #863
 2019-02-19 19:14:08 +02:00
Micah Lee
5e983936eb Add python3-requests as a Build-Depends, which is required to make PPA releases 2019-02-18 16:22:59 -08:00
Miguel Jacq
7690a63935 Always reset the slug to an empty string when the web server stops 2019-02-19 08:37:32 +11:00
Micah Lee
6a658982a0 Prevent crashing when cleaning up file, if file is still in use 2019-02-18 12:28:02 -08:00
Micah Lee
2220281e80 Fix minor bugs: When making the ajax POST request, strip the trailing slash from window.location.pathname so the URL works in public mode; and add a newline before printing message when receiving file 2019-02-18 10:57:20 -08:00
Micah Lee
b5730f1e45 Update share mode screenshots too 2019-02-17 21:37:15 -08:00
Micah Lee
409e530c6d Update screenshots 2019-02-17 21:29:47 -08:00
Micah Lee
c39698e95e Reword licenses readme 2019-02-17 21:19:47 -08:00
Micah Lee
f887d543d1 Remove console.log() debug statements 2019-02-17 21:19:01 -08:00
Micah Lee
430396a433 Merge branch 'develop' into 899_send_files_ajax 2019-02-17 10:08:01 -08:00
Micah Lee
23957841f3 Merge pull request #906 from mig5/show_canceled_item_as_canceled 
Update the GUI when the browser has canceled an upload in Receive Mode. Don't increment the completed counter
 2019-02-17 10:07:34 -08:00
Micah Lee
afe0cd37bf Merge pull request #905 from mig5/902_dont_clear_in_progress 
Don't clear in-progress transfers from the History list
 2019-02-17 10:02:48 -08:00
Micah Lee
fb2ffdae8b On error, remove the upload div 2019-02-17 09:58:57 -08:00
Micah Lee
711377f0d5 Don't use jQuery for the ajax request, instead manually use an XMLHttpRequest in order to more easily support multiple upload divs 2019-02-17 09:51:19 -08:00
Micah Lee
5cdd5521e9 Update red and green colors to match the Qt GUI colors 2019-02-17 08:12:45 -08:00
Miguel Jacq
34b2caafaa Use constants for history item status, to be consistent with other parts of the project 2019-02-17 17:42:25 +11:00
Miguel Jacq
81bd87c325 Set status attribute for ShareHistoryItems as well 2019-02-17 16:28:11 +11:00
Miguel Jacq
5ba7d544bc Update the GUI when the browser has canceled an upload in Receive Mode. Don't increment the completed counter 2019-02-17 15:49:37 +11:00
Miguel Jacq
54f7e54c67 Don't clear in-progress transfers from the History list 2019-02-17 14:07:38 +11:00
Micah Lee
1b68adc6d0 Refactor file upload interface to use jQuery, and to have separate upload progress bars. The progess bars make clear when the data has been sent to the first Tor node, and when its waiting on the rest of the Tor network. It also allows the sender to cancel uploads 2019-02-15 18:52:28 -08:00
Micah Lee
002f91d108 Added jQuery, and jQuery license 2019-02-15 15:33:54 -08:00
Micah Lee
032d545030 Make uploading over ajax, and ajax flash messages, work 2019-02-15 14:52:00 -08:00
Micah Lee
18fe0b1760 Refactor upload_logic to work with both normal uploads and ajax uploads 2019-02-14 10:11:04 -08:00
Micah Lee
bc9312da30 Display upload progress percent in submit button 2019-02-14 09:45:41 -08:00