Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-13 21:21:34 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,632 Commits 16 Branches 45 Tags
Commit Graph

1632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Micah Lee
61179a0860 Fix bad merge in license comment 2018-09-15 19:05:40 -07:00
Micah Lee
905a444099 Merge branch 'develop' into receiver-mode-gui 2018-09-14 18:59:36 -07:00
Micah Lee
0881f7f6d9 Merge branch 'mig5-fix_help_systray_slot' into develop 2018-09-14 18:43:34 -07:00
Micah Lee
9765b62443 Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop 2018-09-14 18:43:25 -07:00
Micah Lee
989efb3606 Merge branch 'mig5-685_use_dist_socks' into develop 2018-09-14 18:41:52 -07:00
Micah Lee
5661015acb Merge branch '685_use_dist_socks' of https://github.com/mig5/onionshare into mig5-685_use_dist_socks 2018-09-14 18:40:26 -07:00
Micah Lee
95285c5580 Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into mig5-fix_help_systray_slot 2018-09-14 18:38:32 -07:00
Micah Lee
f6e623d67d Merge branch 'mig5-upload_widget_overlap' into receiver-mode-gui 2018-09-14 18:36:41 -07:00
Micah Lee
e6c4c672ea Merge branch 'upload_widget_overlap' of https://github.com/mig5/onionshare into mig5-upload_widget_overlap 2018-09-14 18:33:51 -07:00
Micah Lee
406a53d643 Merge branch 'mig5-fix_invalid_version_alert' into develop 2018-09-14 18:33:10 -07:00
Micah Lee
7eb1300430 Merge branch 'fix_invalid_version_alert' of https://github.com/mig5/onionshare into mig5-fix_invalid_version_alert 2018-09-14 18:32:32 -07:00
Micah Lee
95e2e5753e Merge branch 'mig5-opensuse_build_instructions' into develop 2018-09-14 17:04:00 -07:00
Micah Lee
421d4087ff Merge branch 'opensuse_build_instructions' of https://github.com/mig5/onionshare into mig5-opensuse_build_instructions 2018-09-14 17:03:50 -07:00
Micah Lee
f3607fe9aa Merge branch 'mig5-681_remove_obsolete_strings' into receiver-mode-gui 2018-09-14 16:59:43 -07:00
Micah Lee
d63b6e9262 Merge branch '681_remove_obsolete_strings' of https://github.com/mig5/onionshare into mig5-681_remove_obsolete_strings 2018-09-14 16:57:33 -07:00
Micah Lee
935a25d33e Merge branch 'mig5-692_appstream_file_location' into develop 2018-09-14 16:55:27 -07:00
Micah Lee
c1b30d9620 Merge branch '692_appstream_file_location' of https://github.com/mig5/onionshare into mig5-692_appstream_file_location 2018-09-14 16:55:11 -07:00
Micah Lee
53736b42bc Merge branch 'mig5-691_remove_meek_lite_amazon' into develop 2018-09-14 16:29:53 -07:00
Miguel Jacq
3eace71261 Pass self to help_clicked function in systray, so we can use self.common 2018-09-04 14:49:56 +10:00
Miguel Jacq
1e29a12221 Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Miguel Jacq
32f0e39a46 Fix conflict from develop branch 2018-09-04 11:43:35 +10:00
Micah Lee
7abf63c4f6 Merge branch 'mig5-receive_mode_styling' into receiver-mode-gui 2018-09-02 23:04:04 -07:00
Micah Lee
b37f9272c7 Merge branch 'receive_mode_styling' of https://github.com/mig5/onionshare into mig5-receive_mode_styling 2018-09-02 23:01:06 -07:00
Micah Lee
40ae3c8193 Merge branch 'mig5-fix_spelling_grammar_receiver_mode' into receiver-mode-gui 2018-09-02 22:59:13 -07:00
Micah Lee
54c98f0b57 Merge branch 'fix_spelling_grammar_receiver_mode' of https://github.com/mig5/onionshare into mig5-fix_spelling_grammar_receiver_mode 2018-09-02 22:59:06 -07:00
Micah Lee
2101fe3068 Merge branch 'mig5-707_fix_receive_mode_on_tor_disconnect' into receiver-mode-gui 2018-09-02 22:57:43 -07:00
Micah Lee
fc5af35b33 Merge branch '707_fix_receive_mode_on_tor_disconnect' of https://github.com/mig5/onionshare into mig5-707_fix_receive_mode_on_tor_disconnect 2018-09-02 22:56:39 -07:00
Micah Lee
21c16857ed Merge branch 'mig5-receiver-mode-gui' into receiver-mode-gui 2018-09-02 22:51:26 -07:00
Micah Lee
69f2cc212d Merge branch 'mig5-693_fix_static_assets_macos' into develop 2018-09-02 13:36:30 -07:00
Micah Lee
f2f77389e4 Merge branch '693_fix_static_assets_macos' of https://github.com/mig5/onionshare into mig5-693_fix_static_assets_macos 2018-09-02 13:36:21 -07:00
Micah Lee
92b7c5f062 Merge branch 'mig5-lingering_object_naming_issues' into develop 2018-09-02 13:33:55 -07:00
Micah Lee
8b7aa3b321 Merge branch 'lingering_object_naming_issues' of https://github.com/mig5/onionshare into mig5-lingering_object_naming_issues 2018-09-02 13:33:35 -07:00
Miguel Jacq
b53469fc7d Truncate the length of the uploaded file name if it is longer than the width of the Upload window 2018-09-01 09:20:50 +10:00
Miguel Jacq
fee1a1eba2 Fix the passing of the latest version returned to the UI if it is an invalid version 2018-08-30 15:18:29 +10:00
Miguel Jacq
0c50f4ea93 Add explicit dependency on rpm-build in the BUILD.md. Add a link to community-provided OpenSuSE instructions 2018-08-15 09:09:52 +10:00
Miguel Jacq
f6f469db59 remove obsolete strings 2018-07-22 17:13:23 +10:00
Miguel Jacq
f6dbc55c0c Also include test dir for strings 2018-07-22 17:13:04 +10:00
Miguel Jacq
0be4f36894 Fix check_lacked_trans.py script to check subfolders and also match on more than first occurrence of strings._ in a single line 2018-07-22 17:00:30 +10:00
Miguel Jacq
ba72623801 Revert "#681 remove obsolete strings" 
This reverts commit b5c06d446aad28bb60958888c3f4de52ecb6d2a6.
 2018-07-22 16:26:10 +10:00
Miguel Jacq
b5c06d446a #681 remove obsolete strings 2018-07-22 16:20:19 +10:00
Miguel Jacq
2d3c686383 #692 move appstream file to /usr/share/metainfo 2018-07-22 15:50:37 +10:00
Miguel Jacq
a6bc01533b #691 remove meek_lite Amazon 2018-07-21 15:52:11 +10:00
Miguel Jacq
4bdbf3f152 Fix another two places where Alert was called without passing the common object 2018-07-21 15:50:37 +10:00
Miguel Jacq
35f0857f03 Only show the 'I'm Finished Sending' button if the user actually already sent (or tried to send) anything 2018-07-17 11:53:55 +10:00
Miguel Jacq
194478f346 Improve styling of flash() messages by using categories, and style the closed.html. Replace references to 'Uploading' with 'Sending' for consistency 2018-07-17 11:45:14 +10:00
Miguel Jacq
cb47c34942 Fix minor spelling/grammar issues 2018-07-14 16:43:21 +10:00
Miguel Jacq
757a6bac59 #707 Hide/show the primary action in Receive Mode when tor connection is lost/regained 2018-07-14 16:19:16 +10:00
Miguel Jacq
bc36b73b6f Remove duplicate line 2018-07-13 15:50:17 +10:00
Micah Lee
48e9beb1bb Merge branch 'license' into develop 2018-06-18 19:29:03 -07:00
Micah Lee
85609e6841 Remove the /fd sha256 from signtool.exe command, because I'm having trouble generating signatures with the smart card setup with sha256 digests v1.3.1 2018-06-18 16:28:09 -07:00