Micah Lee
638d35a465
Try installing 32-bit python and implementing build-win32
2022-03-30 12:50:28 -07:00
Micah Lee
dcfb9640cf
Comment out deleting files, to see if this makes binary run
2022-03-30 12:26:00 -07:00
Micah Lee
8d14f53a67
Make build-windows.py not use special characters, and make it detect 32-bit or 64-bit python
2022-03-30 08:55:04 -07:00
Micah Lee
c5e73076a4
Add --ci-build to Windows build script, and do more to make the build in CircleCI
2022-03-30 08:29:16 -07:00
Micah Lee
724e48053c
Try installing some dependencies with chocolatey
2022-03-29 21:59:39 -07:00
Micah Lee
631aff7cce
Don't require gui tests because they crash
2022-03-29 21:11:46 -07:00
Micah Lee
499923f4af
Only try building after tests pass
2022-03-29 21:05:23 -07:00
Micah Lee
ed04214ae6
Fix YAML
2022-03-29 21:04:39 -07:00
Micah Lee
8fefa4d6b3
Try CircleCI Windows orb
2022-03-29 21:02:03 -07:00
Micah Lee
9c61c46ea8
Merge pull request #1567 from onionshare/fix-tests
...
Fix tests
2022-03-29 08:54:50 -07:00
Micah Lee
ad13c2d920
Actually switch to next gen CircleCI container images
2022-03-28 20:22:14 -07:00
Micah Lee
834fbc8f6c
Switch to next gen CircleCI image
2022-03-28 20:20:23 -07:00
Micah Lee
8a8901fe7e
Set env variable a different way
2022-03-28 20:13:14 -07:00
Micah Lee
582b69e48a
Turn on qt debugging in CircleCI
2022-03-28 20:06:07 -07:00
Micah Lee
8e7bc98228
Merge pull request #1541 from onionshare/upgrade-flask
...
Update flask to 2.0.3
2022-03-28 19:45:59 -07:00
Micah Lee
2b3c7d43da
Merge branch 'develop' into upgrade-flask
2022-03-28 19:34:18 -07:00
Micah Lee
ca5d173790
Merge branch 'develop' of github.com:onionshare/onionshare into windows-tweaks
2022-03-28 19:31:50 -07:00
Micah Lee
792ee59e93
Merge branch 'develop' of github.com:onionshare/onionshare into upgrade-flask
2022-03-28 19:31:39 -07:00
Micah Lee
15eda5ed04
Merge branch 'censorship_default_route' of https://github.com/mig5/onionshare into mig5-censorship_default_route
2022-03-28 19:23:45 -07:00
Micah Lee
fbcad47138
Merge pull request #1552 from mig5/better_meek_logs
...
More verbose and consistent Meek exception logging
2022-03-28 19:12:59 -07:00
Micah Lee
0d58475c34
Update socket.io.min.js to latest version
2022-03-28 18:21:18 -07:00
Micah Lee
4ff23fa9bd
Merge branch 'develop' into upgrade-flask
2022-03-28 18:18:57 -07:00
Miguel Jacq
9c4a598fc0
Support for Censorship Circumvention API's /default route.
...
Fall back to trying Censorship API's /default route if no other bridges found.
At time of writing, this returns a couple of built-in obfs4 bridges.
If even that request fails, we will still fall back to our own full list of
obfs4 bridges.
2022-03-28 12:31:07 +11:00
Micah Lee
52cb5cf71a
Merge pull request #1560 from mig5/fix_censorship_builtin_bridges_response
...
Remove meek workaround in Censorship Circumvention API's built-in bridges response
2022-03-27 17:27:03 -07:00
Miguel Jacq
5cbd9ae66d
Remove meek workaround in Censorship Circumvention API's built-in bridges response
2022-03-28 10:45:23 +11:00
Micah Lee
06e9b3d3fc
Fix built-in bridge detection, and update built-in bridges. Also update README after setting up Windows dev environment
2022-03-27 12:44:41 -07:00
Micah Lee
1608091fe3
Merge pull request #1556 from SaptakS/update-tor-versions
...
Updates tor browser version in get-tor scripts
2022-03-27 11:27:43 -07:00
Saptak S
858bfea7ef
Updates tor browser version in get-tor scripts
2022-03-25 19:08:58 +05:30
Miguel Jacq
21243fd9bd
More verbose and consistent Meek exception logging
2022-03-22 14:29:02 +11:00
Micah Lee
d59328d99c
Merge branch 'censorship' into develop
2022-03-06 15:02:28 -08:00
Micah Lee
185c8b2ba3
Fix some strings in advanced docs
2022-03-06 15:01:42 -08:00
Micah Lee
88bae837ba
Merge branch 'patch-17' of https://github.com/comradekingu/onionshare into comradekingu-patch-17
2022-03-06 14:53:03 -08:00
Micah Lee
f08e6e9830
Remove useless CLI stuff from GUI tests, and refactor so that qtapp is a singleton and all tests can be run at once
2022-03-06 14:26:51 -08:00
Micah Lee
06eb12cf8f
Try running tests a different way
2022-03-06 14:17:13 -08:00
Micah Lee
5c2802d8b0
Sleep between running tests, to hopefully prevent segfaults in CI
2022-03-06 14:02:07 -08:00
Micah Lee
5ada415e8e
Switch from pytest.yield_fixture to just pytest.fixture, to remove warnings when running tests
2022-03-06 14:01:32 -08:00
Micah Lee
782a9e1909
Merge branch 'develop' into censorship
2022-03-06 13:55:36 -08:00
Micah Lee
76b03b3fc3
Merge pull request #1524 from onionshare/1512_individual_files_windows
...
Fix individual files problem in Windows
2022-03-06 13:55:03 -08:00
Micah Lee
be506a65c3
Merge pull request #1533 from SaptakS/settings-subtabs
...
Settings subtabs
2022-03-06 13:43:25 -08:00
Micah Lee
4974aee1f2
Merge pull request #1526 from onionshare/1486_rocket_ship
...
Rocket ship animation
2022-03-06 13:39:01 -08:00
Micah Lee
acb31117e4
Merge pull request #1525 from comradekingu/patch-18
...
Various string fixes
2022-03-06 13:37:17 -08:00
Micah Lee
102bbf8601
Move stars and planet right 40 pixels
2022-03-06 11:58:16 -08:00
Micah Lee
dc812bd4d0
Fix rocket ship graphic to have more fire
2022-03-06 11:54:38 -08:00
Micah Lee
bf0b962634
Fix bug getting country code
2022-03-06 11:52:05 -08:00
Micah Lee
622d689b2c
Merge pull request #1535 from mig5/censorship_update_countries_json
...
Update countries json files and script
2022-03-06 11:46:47 -08:00
Micah Lee
b068e83852
Update flask to 2.0.3, flask-socketio to 5.1.1, update socketio js, and the rest of the pip deps
2022-03-06 11:35:01 -08:00
Micah Lee
4e6d31ed46
Merge pull request #1539 from egypcio/compress-tgz
...
Actually compress the tarball, using tar with -z
2022-03-06 10:54:30 -08:00
Micah Lee
2588fb0262
Merge pull request #1540 from egypcio/shallow-copy
...
Suggest the use of git shallow copy, while cloning
2022-03-06 10:53:46 -08:00
Micah Lee
69b7dd672e
Merge branch 'develop' into censorship
2022-03-06 10:47:47 -08:00
Vinícius Zavam
eb9c2a7177
Suggest the use of git shallow copy, while cloning
2022-03-02 14:40:49 +00:00
