5c80572264
Merge branch 'master' of https://github.com/SuppSandroB/Ony into ony-dev
...
Conflicts:
AndroidManifest.xml
jni/Android.mk
res/menu/main.xml
src/org/torproject/android/OrbotMainActivity.java
src/org/torproject/android/service/TorService.java
src/org/torproject/android/ui/TipsAndTricks.java
src/org/torproject/android/vpn/OrbotVpnService.java
src/org/torproject/android/wizard/ConfigureTransProxy.java
src/org/torproject/android/wizard/Permissions.java
2015-02-02 13:42:56 -05:00
cf50ec1433
more tweaks to new layout
2015-02-01 23:35:57 -05:00
6a83a0d2f6
update project and layout for v15 merged browser + VPN
2015-02-01 12:49:10 -05:00
21b75b4c56
vpn changes
2015-01-20 15:47:24 +01:00
2f899cb680
the lead developer appears!
2014-12-03 09:36:00 -05:00
91f4fa0e16
cleanup landscape layout
2014-11-29 00:43:18 -05:00
d5823e3059
updates to layout to make it cleaner
2014-11-28 23:52:57 -05:00
406d83cb50
add layout tweaks for v21
2014-11-24 13:10:56 -05:00
ba2619804c
putting torrc back in
2014-11-17 11:59:16 -05:00
5917e63693
updates for Android L and PIE binary support
2014-11-13 13:42:14 -05:00
2d98a29d82
temporarily use udpgw-client to make DNS and UDP tunneling to work
2014-10-24 01:14:54 -04:00
e45991899a
first commit of new OrbotVPN integration into Orbot
2014-10-21 12:30:13 -04:00
dbbd8292c2
Merge branch 'master' of https://github.com/freckles-the-pirate/orbot into freckles-the-pirate-master
2014-09-30 23:34:08 -04:00
cdae262a2b
Fixed annoying typo
2014-09-24 07:24:30 +00:00
2bcb1ee5fb
removing binaries from source repo
2014-09-14 21:08:40 -04:00
93614ddd61
update english versions strings
2014-09-14 16:15:55 -04:00
a3dc39d41b
updating binaries
2014-09-14 16:10:27 -04:00
313c92f863
add warning about restarting Orbot after settings changes
2014-09-06 01:02:38 -04:00
37c831975d
Add drawables
...
.
2014-09-05 18:14:09 -07:00
1229da66cb
Merge branch 'master' of https://git.torproject.org/orbot
2014-09-01 19:27:17 -07:00
b76be6dee0
disable stdout log by default and enable daemon mode
2014-08-26 22:43:09 -04:00
add04f238d
exit menu option should be a menu
2014-08-21 09:48:06 -04:00
186e74b5dc
add new transproxy flush pref and strings
2014-08-21 09:47:51 -04:00
59b333984d
Add buttons to filter application selection.
2014-08-13 17:23:33 -07:00
ade6172145
enable transproxy refresh feature, default off
2014-08-11 11:18:46 -04:00
0d424797a2
make expanded notif off by default; handle exceptions better
...
- some devices seem to not like these new expanded/remoteviews notifications, so we are turning them off by default. This will also help with load issues on onionoo servers
2014-08-11 10:10:18 -04:00
28877b12e2
new strings for app conflict checker function
2014-08-07 12:43:00 -04:00
0709b0e486
remove this, as torrc.custom is built at runtime
2014-08-02 01:14:43 -04:00
754139a566
add new strings
2014-08-02 00:58:47 -04:00
6626b6551c
update strings, localisations
2014-07-28 21:39:02 -04:00
816d7d717a
new icons for martus
2014-07-17 13:43:46 -04:00
6574312609
new tips for app download
2014-07-17 13:43:09 -04:00
9d541d8aad
added mobile martus to rec'd apps
2014-07-16 17:06:50 -04:00
4d6c32a6a2
support dynamic SOCKS ip in polipo configuration
2014-07-15 16:10:24 -04:00
e1ec776cb8
re-arch status callbacks and improve notification
2014-07-14 09:19:30 -04:00
f2f076c29c
fixes for layout and notification data
...
be sure to only get the IP of the last hop (that is the exit)
2014-07-10 12:34:31 -04:00
181b92276a
make the notification larger for more display room!
2014-07-10 11:23:34 -04:00
3bc8760beb
Merge branch 'new_notification_expanded' of github.com:amoghbl1/orbot-1 into amoghbl1-new_notification_expanded
2014-07-10 11:05:59 -04:00
a447bbf07e
update strings
2014-07-10 11:03:56 -04:00
bfa1d56208
remove diag/test menu
2014-06-27 13:03:06 -04:00
0e95ddaeac
update translations from transifex
2014-06-24 10:11:12 -04:00
43eac85644
fixed merge conflicts
2014-06-20 02:01:17 +05:30
133922f7b4
updated the expanded notification ui, calls for getting exit ip implemented, exit ip added temporarily in the title of the notification till the final ui is ready. Regex to match ip address on getting response from the exit node written.
2014-06-18 06:02:23 +05:30
b6715b4d3c
fixes #12411 and #12412 enables DNS and transport by default
...
with new Orbot settings to enable user to easily change/disable
2014-06-17 15:42:54 -04:00
2ce9ea92f1
make default config files have ports off by default (0)
2014-06-13 12:58:39 -04:00
65eb7ad249
fix torrc defaults - add back in avoiddiskwrites
2014-06-11 22:02:32 -04:00
4716696515
make transport settings dynamic (remove from torrc)
2014-06-11 20:23:38 -04:00
6ab9a7bff1
reduce memory usage of polipo
2014-06-11 11:26:10 -04:00
af51a98535
allow support for adding custom lines to torrc
2014-06-09 18:47:48 -04:00
22938c9ed9
multiple fixes for tor start including "auto" control port
...
also try to kill hung tor process
2014-06-09 18:35:08 -04:00
Nathan Freitas
SandroB
SecUpwN
Jordan
amoghbl1