Micah Lee
375d8498d4
Merge branch 'mig5-fix_simultaneous_downloads' into develop
2018-02-19 17:51:45 -08:00
Micah Lee
c836049c54
Merge branch 'fix_simultaneous_downloads' of https://github.com/mig5/onionshare into mig5-fix_simultaneous_downloads
2018-02-19 17:44:53 -08:00
Micah Lee
b45ae33e87
Merge branch 'develop' of github.com:micahflee/onionshare into develop
2018-02-19 17:02:33 -08:00
Micah Lee
dc2d9fb8af
Merge branch 'cclauss-patch-1' into develop
2018-02-19 17:02:05 -08:00
Micah Lee
e5c9ab89b7
Merge pull request #586 from scootergrisen/patch-4
...
Add [da] translations
2018-02-19 16:59:16 -08:00
Miguel Jacq
b398d238d2
reset done to False if a download is still in progress
2018-02-19 12:47:21 +11:00
cclauss
b50e397bbe
Add flake8 to the testing
2018-02-14 08:00:21 +01:00
Micah Lee
54dfd09fb0
Merge branch 'mig5-602_fix_taberror' into develop
2018-02-13 18:00:19 -08:00
Miguel Jacq
f6be6b5dab
Replace tab with whitespace in nautilus script
2018-02-13 13:23:25 +11:00
Miguel Jacq
ffdbf8dec1
Merge pull request #585 from torbsd/openbsd-port-patches-2
...
Second attempt at patches for an OpenBSD port
2018-02-07 16:54:00 +11:00
attila
7a8376c1fc
Update patch as per the suggestion by @mig5 on
...
https://github.com/micahflee/onionshare/pull/585
Tested on current snapshot, both gui and cli work
2018-02-06 16:39:04 -05:00
scootergrisen
e3fef63aca
Add [da] translations
...
Perhaps add info about this in https://github.com/micahflee/onionshare/wiki/Translating so translators can know they need to translate this file also.
Or even better add the strings to the .json translations files so alle strings are in one place.
2018-02-06 18:26:01 +01:00
Miguel Jacq
cf8aabc969
Merge pull request #584 from scootergrisen/patch-3
...
Add da.json (danish translation)
2018-02-06 12:08:25 +11:00
attila
76526b18a5
Second attempt at patches for an OpenBSD port, this time based off of 1.2
...
and after feedback from the upstream and other contributors at
https://github.com/micahflee/onionshare/pull/489
2018-02-05 18:06:37 -05:00
scootergrisen
b9200279f7
Add da.json (danish translation)
2018-02-05 23:59:40 +01:00
Miguel Jacq
13075abc0f
Merge pull request #583 from scootergrisen/patch-2
...
Remove "at least"
2018-02-06 07:46:02 +11:00
scootergrisen
d5e3073eba
Remove "at least"
2018-02-05 21:38:38 +01:00
Miguel Jacq
152ef5a309
Merge pull request #581 from scootergrisen/patch-1
...
Remove a space
2018-02-06 07:32:58 +11:00
scootergrisen
74d0d75b18
Remove a space
2018-02-05 19:52:14 +01:00
Miguel Jacq
7099dee9d7
Merge pull request #579 from b-meson/dev/master
...
link to our mailing list
2018-02-01 08:27:39 +11:00
Freddy Martinez
08ef15abc5
link to our mailing list
2018-01-31 10:59:46 -08:00
Micah Lee
d962fd2268
Merge branch 'Baccount-bump-Tor-to-0.2.3.9' into develop
2018-01-30 22:15:46 -08:00
Micah Lee
9fe4f26f2a
Merge branch 'bump-Tor-to-0.2.3.9' of https://github.com/Baccount/onionshare into Baccount-bump-Tor-to-0.2.3.9
2018-01-30 21:57:09 -08:00
Micah Lee
7cc1e801a0
Merge branch 'mig5-535_force_update_check_via_qthread' into develop
2018-01-30 21:49:57 -08:00
Micah Lee
605d709200
Merge branch '535_force_update_check_via_qthread' of https://github.com/mig5/onionshare into mig5-535_force_update_check_via_qthread
2018-01-30 21:28:25 -08:00
Micah Lee
e4f5218596
Merge branch 'mig5-mac-python36-update-certs' into develop
2018-01-30 21:05:19 -08:00
Micah Lee
c8f878d2ae
Merge branch 'mac-python36-update-certs' of https://github.com/mig5/onionshare into mig5-mac-python36-update-certs
2018-01-30 21:05:11 -08:00
Micah Lee
0745363c9d
Merge branch 'Baccount-Update-URL' into develop
2018-01-30 21:03:16 -08:00
Micah Lee
4f5d87abe5
Merge branch 'Update-URL' of https://github.com/Baccount/onionshare into Baccount-Update-URL
2018-01-30 21:02:21 -08:00
Micah Lee
b4ad5fc877
Merge branch 'mig5-556_obfs4_in_custom_bridges' into develop
2018-01-30 20:54:59 -08:00
Micah Lee
cf9fd5c99d
Merge branch '556_obfs4_in_custom_bridges' of https://github.com/mig5/onionshare into mig5-556_obfs4_in_custom_bridges
2018-01-30 20:47:29 -08:00
Micah Lee
e09a2e5250
Create github code owners file, make myself the owner
2018-01-30 14:59:43 -08:00
Baccount
8a47515905
Update get-tor-windows.py
2018-01-23 09:24:27 -08:00
Baccount
182b5a3981
Update macOS version tor to 0.2.3.9
2018-01-23 09:19:53 -08:00
Miguel Jacq
7038404075
reinstate the emitted signals for invalid version/error checking for updates
2018-01-23 16:51:13 +11:00
Miguel Jacq
49d5a3f34a
#535 do the forced update check via a (non-blocking) QThread
2018-01-23 16:32:14 +11:00
Miguel Jacq
4f4741138d
stricter regex of IPv4 as well as IPv6 IPs in custom bridges
2018-01-22 16:24:26 +11:00
Miguel Jacq
baec6e0d3a
Add instruction to update Python 3.6's internal certificate store, to avoid validation error on archive.torproject.org
2018-01-21 13:42:46 +11:00
Miguel Jacq
e1f871a454
Merge pull request #560 from Baccount/eject-DMG
...
Eject dmg
2018-01-21 13:37:03 +11:00
Miguel Jacq
a75697ffc7
Merge pull request #563 from pierwill/french-translations
...
French string translations
2018-01-21 13:31:41 +11:00
pierwill
9cd8f8db35
French string translations
2018-01-20 15:41:52 -06:00
Baccount
76c4e890ce
Update en.json
2018-01-18 22:36:34 -08:00
Baccount
908f84d250
Update get-tor-osx.py
2018-01-18 22:29:35 -08:00
Miguel Jacq
8ff81721c7
Support for obfs4 in custom bridges
2018-01-19 15:31:11 +11:00
Micah Lee
d84052228c
Merge branch 'mig5-fix_slug_cli_mode'
2018-01-18 12:40:55 -08:00
Micah Lee
5fd547e4cd
Merge branch 'fix_slug_cli_mode' of https://github.com/mig5/onionshare into mig5-fix_slug_cli_mode
2018-01-18 12:15:57 -08:00
Miguel Jacq
393a63a5c7
load Settings in onionshare/__init__.py before we initiate the web thread, since it needs to send the saved slug to the web server
2018-01-18 22:42:43 +11:00
Micah Lee
69e4cf34d8
Updated changelog again
2018-01-17 19:47:24 -08:00
Micah Lee
2fc65b4eb0
Version bump to 1.2 and updated changelog
2018-01-17 19:36:56 -08:00
Micah Lee
7061ac3654
Temporary fix for #550
2018-01-17 18:53:45 -08:00
