Miguel Jacq
|
8bb75cc530
|
Fix conflict in tests
|
2018-09-15 12:07:01 +10:00 |
|
Micah Lee
|
8312058fcc
|
Merge branch 'develop' into receiver-mode-gui
|
2018-09-14 18:59:36 -07:00 |
|
Micah Lee
|
6839ec43d4
|
Merge branch 'mig5-fix_help_systray_slot' into develop
|
2018-09-14 18:43:34 -07:00 |
|
Micah Lee
|
db63b4c9c3
|
Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop
|
2018-09-14 18:43:25 -07:00 |
|
Micah Lee
|
96b59c49e0
|
Merge branch 'mig5-685_use_dist_socks' into develop
|
2018-09-14 18:41:52 -07:00 |
|
Micah Lee
|
2605967011
|
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
|
4a51f09c53
|
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
|
b58ffc3196
|
Merge branch 'mig5-upload_widget_overlap' into receiver-mode-gui
|
2018-09-14 18:36:41 -07:00 |
|
Miguel Jacq
|
e54a1473ce
|
Don't check slug candidate in public mode
|
2018-09-15 11:36:34 +10:00 |
|
Micah Lee
|
fbb55e36dc
|
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
|
23415a43f2
|
Merge branch 'mig5-fix_invalid_version_alert' into develop
|
2018-09-14 18:33:10 -07:00 |
|
Micah Lee
|
4c87393550
|
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
|
1da30cb12d
|
Merge branch 'mig5-opensuse_build_instructions' into develop
|
2018-09-14 17:04:00 -07:00 |
|
Micah Lee
|
04984aa420
|
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
|
51bfee31bf
|
Merge branch 'mig5-681_remove_obsolete_strings' into receiver-mode-gui
|
2018-09-14 16:59:43 -07:00 |
|
Micah Lee
|
d2ef9872a4
|
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
|
1d67c4d25b
|
Merge branch 'mig5-692_appstream_file_location' into develop
|
2018-09-14 16:55:27 -07:00 |
|
Micah Lee
|
8cbac4e671
|
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
|
8861b9f716
|
Merge branch 'mig5-691_remove_meek_lite_amazon' into develop
|
2018-09-14 16:29:53 -07:00 |
|
Miguel Jacq
|
85fa44a01f
|
Pass self to help_clicked function in systray, so we can use self.common
|
2018-09-04 14:49:56 +10:00 |
|
Miguel Jacq
|
45a5a2ae63
|
Use the distribution's PySocks module instead of our custom version
|
2018-09-04 14:26:47 +10:00 |
|
Miguel Jacq
|
11bf059015
|
Fix conflict from receiver-mode-gui branch
|
2018-09-04 11:48:39 +10:00 |
|
Miguel Jacq
|
45d6a94d38
|
Fix conflict from develop branch
|
2018-09-04 11:43:35 +10:00 |
|
Micah Lee
|
b3d5af9d4c
|
Merge branch 'mig5-receive_mode_styling' into receiver-mode-gui
|
2018-09-02 23:04:04 -07:00 |
|
Micah Lee
|
f83aa3cffb
|
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
|
62c443f2fd
|
Merge branch 'mig5-fix_spelling_grammar_receiver_mode' into receiver-mode-gui
|
2018-09-02 22:59:13 -07:00 |
|
Micah Lee
|
eb0419f2d9
|
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
|
936a90c62c
|
Merge branch 'mig5-707_fix_receive_mode_on_tor_disconnect' into receiver-mode-gui
|
2018-09-02 22:57:43 -07:00 |
|
Micah Lee
|
e1976fdca0
|
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
|
a160ab041a
|
Merge branch 'mig5-receiver-mode-gui' into receiver-mode-gui
|
2018-09-02 22:51:26 -07:00 |
|
Micah Lee
|
0e9e729b6f
|
Merge branch 'mig5-693_fix_static_assets_macos' into develop
|
2018-09-02 13:36:30 -07:00 |
|
Micah Lee
|
d90c3c2490
|
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
|
c037e32d8a
|
Merge branch 'mig5-lingering_object_naming_issues' into develop
|
2018-09-02 13:33:55 -07:00 |
|
Micah Lee
|
52c82f9b16
|
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
|
808c5a3333
|
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
|
2fd2cf3e2e
|
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
|
1b4c989f06
|
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
|
1a273e772b
|
remove obsolete strings
|
2018-07-22 17:13:23 +10:00 |
|
Miguel Jacq
|
1d8a902407
|
Also include test dir for strings
|
2018-07-22 17:13:04 +10:00 |
|
Miguel Jacq
|
5442beba8b
|
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
|
e343aa194e
|
Revert "#681 remove obsolete strings"
This reverts commit e4d1f8b8f6.
|
2018-07-22 16:26:10 +10:00 |
|
Miguel Jacq
|
e4d1f8b8f6
|
#681 remove obsolete strings
|
2018-07-22 16:20:19 +10:00 |
|
Miguel Jacq
|
d2934e74ec
|
#692 move appstream file to /usr/share/metainfo
|
2018-07-22 15:50:37 +10:00 |
|
Miguel Jacq
|
a13e98d7bb
|
Fix tests for public_mode
|
2018-07-22 14:58:14 +10:00 |
|
Miguel Jacq
|
3b45f93dbe
|
Expand 'public mode' (optional slugs) to be possible for sharing too, not just receiving, with no rate-limiting/self-destruct on invalid routes.
|
2018-07-21 17:06:11 +10:00 |
|
Miguel Jacq
|
a830eb57fe
|
#691 remove meek_lite Amazon
|
2018-07-21 15:52:11 +10:00 |
|
Miguel Jacq
|
f6b031bc2c
|
Fix another two places where Alert was called without passing the common object
|
2018-07-21 15:50:37 +10:00 |
|
Miguel Jacq
|
e37dbb3efb
|
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
|
4092a65e0c
|
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
|
69ae29272c
|
Fix minor spelling/grammar issues
|
2018-07-14 16:43:21 +10:00 |
|