Commit Graph

2422 Commits

Author SHA1 Message Date
Micah Lee
a9f3accf69
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
c0e6137294
Fix css on receive.html as well 2019-03-22 15:27:23 -07:00
Micah Lee
f15fee8ee2
Merge branch 'develop' of https://github.com/ZeroDot1/onionshare into ZeroDot1-develop 2019-03-22 15:23:53 -07:00
Micah Lee
d81f62a1b5
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
f2314f24c7
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
ee1633c600 Repair the css . . . 2019-03-11 05:33:28 +01:00
Micah Lee
967b213df1
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
e8599ed5d4
Merge pull request #931 from palob/launcher-fix
Unhardcode GNU/Linux launcher icon
2019-03-10 13:59:18 -07:00
Micah Lee
1498dfeca0
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
f13f36f572
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
04fd65de11
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
3e9eb66afd
Unhardcode linux launcher icon 2019-03-02 09:06:15 +01:00
Miguel Jacq
93a4905b72
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
a928b369b0
remove unnecessary bit of css 2019-02-25 14:26:29 +11:00
Miguel Jacq
3f7c83c321
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
06d50df10e 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
9c5adaee27
Make progress, noscript warning, and flashes appear above the form, but beneath the logo 2019-02-23 13:16:06 +11:00
Miguel Jacq
df657d8776
remove actual sender_closed test function 2019-02-22 16:53:51 +11:00
Miguel Jacq
b21fa1fb3b
Remove obsolete test for sender closing a Receive Mode service via the web interface 2019-02-22 16:50:40 +11:00
Micah Lee
3af05dcc20
Remove python3-distutils from BUILD.md as well 2019-02-21 10:12:56 -08:00
Micah Lee
5fc0cc326a
Tweak readme install language 2019-02-20 10:55:01 -08:00
Micah Lee
eff44cc3eb
Merge branch 'patch-1' of https://github.com/pahakalle/onionshare into pahakalle-patch-1 2019-02-20 10:52:00 -08:00
Micah Lee
1e7f1c3b88
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
4735bb0dda
Add homebrew install option
also discussed sort of in #863
2019-02-19 19:14:08 +02:00
Micah Lee
cdcceca98d
Add python3-requests as a Build-Depends, which is required to make PPA releases 2019-02-18 16:22:59 -08:00
Miguel Jacq
3743d9a480
Always reset the slug to an empty string when the web server stops 2019-02-19 08:37:32 +11:00
Micah Lee
8e200cd8b0
Prevent crashing when cleaning up file, if file is still in use 2019-02-18 12:28:02 -08:00
Micah Lee
3e2901ad8c
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
879cf687b1
Update share mode screenshots too 2019-02-17 21:37:15 -08:00
Micah Lee
2f026e8e59
Update screenshots 2019-02-17 21:29:47 -08:00
Micah Lee
c0a23ead90
Reword licenses readme 2019-02-17 21:19:47 -08:00
Micah Lee
57522c58b6
Remove console.log() debug statements 2019-02-17 21:19:01 -08:00
Micah Lee
aaa4e239de
Merge branch 'develop' into 899_send_files_ajax 2019-02-17 10:08:01 -08:00
Micah Lee
41f5800e0e
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
8921bfeb56
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
422179a6b5
On error, remove the upload div 2019-02-17 09:58:57 -08:00
Micah Lee
77aa909e35
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
c349e6049c
Update red and green colors to match the Qt GUI colors 2019-02-17 08:12:45 -08:00
Miguel Jacq
8cf8aa201d
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
759a0dc2a3
Set status attribute for ShareHistoryItems as well 2019-02-17 16:28:11 +11:00
Miguel Jacq
51e98f40e7
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
9b35ca9bed
Don't clear in-progress transfers from the History list 2019-02-17 14:07:38 +11:00
Micah Lee
2d78b545a5
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
7e709bb234
Added jQuery, and jQuery license 2019-02-15 15:33:54 -08:00
Micah Lee
e2c4ec1f6f
Make uploading over ajax, and ajax flash messages, work 2019-02-15 14:52:00 -08:00
Micah Lee
a22d21c222
Refactor upload_logic to work with both normal uploads and ajax uploads 2019-02-14 10:11:04 -08:00
Micah Lee
38c39918d4
Display upload progress percent in submit button 2019-02-14 09:45:41 -08:00
Micah Lee
dd3f2d60b6
Update the noscript upload instructions on the receive mode upload page, and add separate page for instructions to disable NoScript XSS setting 2019-02-14 09:31:39 -08:00
Micah Lee
1c16b092a3
Use a div that gets hidden, instead of a <noscript> tag, because the <noscript> tag doesn't when the security slider is on Safer 2019-02-13 17:40:33 -08:00
Micah Lee
5755cd625b
Starting to implement upload progress 2019-02-13 09:56:36 -08:00