Miguel Jacq
606123db91
Version bump to 1.3
2018-02-25 08:27:39 +11:00
Micah Lee
760661c9c1
Merge branch 'mig5-fix_simultaneous_downloads' into develop
2018-02-19 17:51:45 -08:00
Micah Lee
97c41c637e
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
fa367abf6a
Merge branch 'develop' of github.com:micahflee/onionshare into develop
2018-02-19 17:02:33 -08:00
Micah Lee
c0e0aca782
Merge branch 'cclauss-patch-1' into develop
2018-02-19 17:02:05 -08:00
Micah Lee
64b5b4d81f
Merge pull request #586 from scootergrisen/patch-4
...
Add [da] translations
2018-02-19 16:59:16 -08:00
Miguel Jacq
6791e59aa5
reset done to False if a download is still in progress
2018-02-19 12:47:21 +11:00
cclauss
e31b4a688b
Add flake8 to the testing
2018-02-14 08:00:21 +01:00
Micah Lee
090a023db0
Merge branch 'mig5-602_fix_taberror' into develop
2018-02-13 18:00:19 -08:00
Miguel Jacq
ab16afcae8
Replace tab with whitespace in nautilus script
2018-02-13 13:23:25 +11:00
Miguel Jacq
d1ce17cf5f
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
bc8f233db9
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
888523b0ab
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
ec25adaeac
Merge pull request #584 from scootergrisen/patch-3
...
Add da.json (danish translation)
2018-02-06 12:08:25 +11:00
attila
ae494c8e33
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
3da58604ed
Add da.json (danish translation)
2018-02-05 23:59:40 +01:00
Miguel Jacq
d2530dc23f
Merge pull request #583 from scootergrisen/patch-2
...
Remove "at least"
2018-02-06 07:46:02 +11:00
scootergrisen
ec33c9eddc
Remove "at least"
2018-02-05 21:38:38 +01:00
Miguel Jacq
20a1a7006e
Merge pull request #581 from scootergrisen/patch-1
...
Remove a space
2018-02-06 07:32:58 +11:00
scootergrisen
0d8e842e48
Remove a space
2018-02-05 19:52:14 +01:00
Miguel Jacq
3e0010ca01
Merge pull request #579 from b-meson/dev/master
...
link to our mailing list
2018-02-01 08:27:39 +11:00
Freddy Martinez
e207db2a6c
link to our mailing list
2018-01-31 10:59:46 -08:00
Micah Lee
3d85edc778
Merge branch 'Baccount-bump-Tor-to-0.2.3.9' into develop
2018-01-30 22:15:46 -08:00
Micah Lee
cbe95be6bd
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
3dcbb2ada7
Merge branch 'mig5-535_force_update_check_via_qthread' into develop
2018-01-30 21:49:57 -08:00
Micah Lee
cedfd5deff
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
4d77eea1b5
Merge branch 'mig5-mac-python36-update-certs' into develop
2018-01-30 21:05:19 -08:00
Micah Lee
4ddd6456c2
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
289a8650b4
Merge branch 'Baccount-Update-URL' into develop
2018-01-30 21:03:16 -08:00
Micah Lee
5aed6f96a1
Merge branch 'Update-URL' of https://github.com/Baccount/onionshare into Baccount-Update-URL
2018-01-30 21:02:21 -08:00
Micah Lee
ce38c3cc97
Merge branch 'mig5-556_obfs4_in_custom_bridges' into develop
2018-01-30 20:54:59 -08:00
Micah Lee
a996d2d86a
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
29ad669e54
Create github code owners file, make myself the owner
2018-01-30 14:59:43 -08:00
Baccount
6fda59551f
Update get-tor-windows.py
2018-01-23 09:24:27 -08:00
Baccount
0a66951508
Update macOS version tor to 0.2.3.9
2018-01-23 09:19:53 -08:00
Miguel Jacq
a28f427c0c
reinstate the emitted signals for invalid version/error checking for updates
2018-01-23 16:51:13 +11:00
Miguel Jacq
70a624c331
#535 do the forced update check via a (non-blocking) QThread
2018-01-23 16:32:14 +11:00
Miguel Jacq
9a3bcb9834
stricter regex of IPv4 as well as IPv6 IPs in custom bridges
2018-01-22 16:24:26 +11:00
Miguel Jacq
524f8839d2
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
a068bf4518
Merge pull request #560 from Baccount/eject-DMG
...
Eject dmg
2018-01-21 13:37:03 +11:00
Miguel Jacq
b82f17717d
Merge pull request #563 from pierwill/french-translations
...
French string translations
2018-01-21 13:31:41 +11:00
pierwill
c8215f9670
French string translations
2018-01-20 15:41:52 -06:00
Baccount
1fb2116efd
Update en.json
2018-01-18 22:36:34 -08:00
Baccount
e597ce0c2b
Update get-tor-osx.py
2018-01-18 22:29:35 -08:00
Miguel Jacq
16bd3291e3
Support for obfs4 in custom bridges
2018-01-19 15:31:11 +11:00
Micah Lee
95c8c0fb81
Merge branch 'mig5-fix_slug_cli_mode'
2018-01-18 12:40:55 -08:00
Micah Lee
c797dc93e1
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
206472cb78
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
849998226a
Updated changelog again
2018-01-17 19:47:24 -08:00
Micah Lee
1d1648bb90
Version bump to 1.2 and updated changelog
2018-01-17 19:36:56 -08:00
