Commit graph

5 commits

Author SHA1 Message Date
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
eb00a29ca7
Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master
Conflicts:
	onionshare/web.py
	onionshare_gui/onionshare_gui.py
	resources/locale/cs.json
	resources/locale/eo.json
	resources/locale/nl.json

This merge required quite a bit of refactoring because.
2016-12-22 16:00:06 -08:00
Micah Lee
310d861ce0
Stop saying 'hidden service', start saying 'onion service' 2016-09-04 17:23:06 -07:00
Srinivas Devaki
c570d7ea77 added progress bar for zipping files 2016-08-24 01:43:21 +05:30
Micah Lee
e81f809882 Move all resources (locale, images, html, version.txt) into central resources dir, and clean up logic to find absolute paths to resources 2016-04-12 15:14:02 -07:00
Renamed from locale/eo.json (Browse further)