Miguel Jacq
45d6a94d38
Fix conflict from develop branch
2018-09-04 11:43:35 +10: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
Miguel Jacq
a830eb57fe
#691 remove meek_lite Amazon
2018-07-21 15:52:11 +10:00
Micah Lee
1ad68c46d4
Merge branch 'license' into develop
2018-06-18 19:29:03 -07:00
Micah Lee
4570db3786
Actually add licenses folder to PyInstaller spec
2018-06-17 16:55:04 -07:00
Micah Lee
a251dff670
Add onionshare license to licenses folder, and add licenses folder to PyInstaller spec, and to NSIS installer
2018-06-17 16:43:38 -07:00
Miguel Jacq
41c10b1ea2
Fix installation of static assets on MacOS and probably Windows too
2018-05-28 16:14:44 +10:00
Micah Lee
ce852fc60a
Create separate templates and static folder, and make the web app use both of these. Yay, now we have real static resources
2018-03-06 02:54:12 -08:00
irykoon
b2c310f2e0
Support meek_lite Pluggable Transport
...
Currently, meek/meek_lite is one of the few, if not only, mature pluggable transport that works in some heavily cenosored areas, for example, China. Therefore, this can be a nice feature to have.
2018-02-15 23:19:53 +00:00
Miguel Jacq
7237b65a32
resolve conflicts
2018-01-17 12:50:11 +11:00
Micah Lee
b7192f2764
Updating Windows build deps, and recreating the nsis installer script for new files
2018-01-15 21:32:55 -08:00
Miguel Jacq
ed8c4c8302
ensure hte obfs4 torrc template is included in installers
2018-01-14 20:12:06 +11:00
Micah Lee
6d58d5dcff
Added support for bundled Tor in macOS
2017-04-18 15:12:24 -07:00
Micah Lee
9b3cee0878
Added support for bundled tor connection type in Windows, including using ports instead of socket files
2017-04-14 18:33:44 -07:00
Micah Lee
7141ebecf7
Update Windows build script to work with PyInstaller, update readme about only having onionshare-gui.exe, and update PyInstaller spec to create an 'onionshare' folder instead of an 'onionshare-gui' one
2017-02-22 14:28:50 -08:00
Micah Lee
9be8169233
Make CLI work with PyInstaller in macOS
2017-02-22 13:34:20 -08:00
Micah Lee
d5af08c1c4
Fixed syntax error in pyinstaller.spec
2017-02-21 17:07:14 -08:00
Micah Lee
248f59cbd1
Renamed 'resources' to 'share', and updated location of 'share' files in OSX/Win binaries
2017-02-21 16:59:14 -08:00
Micah Lee
42d2b0b417
Remove jinja2.asyncsupport from PyInstaller, because it's not used and causes a crash during building
2017-02-21 14:26:45 -08:00
Micah Lee
8493a398ef
Add a pyinstaller spec
2017-01-07 18:17:15 -08:00
Micah Lee
db9d81ba90
Migrate from PyInstaller to cx_Freeze for OSX
2016-09-04 19:21:09 -07:00
Micah Lee
ef7fa690f5
Add correct version number to OSX app Info.plist ( fixes #275 )
2016-04-14 12:04:05 -07:00
Micah Lee
e37ce32fcd
Updated Windows packaging scripts to work with PyInstaller
2016-04-12 17:53:33 -07:00
Micah Lee
5249f5d96a
Add wordlists.txt to OSX and Windows packages #( #238 )
2016-04-12 17:13:12 -07:00
Micah Lee
0b588e543a
Fix PyInstaller to point to new resources directory, for OSX and Windows
2016-04-12 15:21:47 -07:00
Micah Lee
07bdbd5714
Renamed linux_scripts to scripts, since they are now used for Linux, OSX, and Windows
2016-04-12 10:46:44 -07:00
Micah Lee
ef5665b050
Switched from py2app to PyInstaller for Windows. Renamed version to version.txt, to avoid Windows namespace collision with version.dll.
2016-04-11 23:25:40 -07:00
