Commit Graph

1080 Commits

Author SHA1 Message Date
Anthony Restaino
f314b64e40 updated to latest netcipher submodule 2015-07-18 16:59:57 -04:00
Anthony Restaino
6c9d23488b Merge remote-tracking branch 'origin/master' into dev
Conflicts:
	app/src/main/res/values-pt/strings.xml
2015-07-18 16:43:42 -04:00
Anthony Restaino
41cb2c4d27 Convert BrowserActivity to an abstract class, remove unused resources 2015-07-18 16:38:57 -04:00
Anthony Restaino
969cab81e7 New Full-screen mode works better and doesn't hide the top of the WebView, +other
* Now using material alertdialog on all versions
* cleaned up some code
* fixed lint issues and other inspection related problems
* Attempted to fix bugs found
2015-07-18 14:30:41 -04:00
Anthony Restaino
b98dd272c0 Merge pull request #255 from DF1E/settings
Material Settings
2015-07-18 10:05:35 -04:00
Anthony Restaino
67b506c5f8 Merge pull request #254 from smarquespt/master
Portuguese update
2015-07-17 22:18:09 -04:00
Anthony Restaino
e9af39a20b Merge pull request #260 from chirs1985/master
1. Use the " \ " character to escape the " ' " character
2015-07-17 22:16:04 -04:00
chirs1985
5950c66567 1. Use the " \ " character to escape the " ' " character
2. lose the </string-arrary>
2015-07-06 11:06:39 +08:00
DF1E
56c9934145 remove LicenseActivity intent 2015-06-16 15:13:27 +02:00
DF1E
1d5b904c64 create PreferenceCategory for licenses 2015-06-15 18:39:24 +02:00
DF1E
7d9f382333 Toolbar fix 2015-06-14 12:13:35 +02:00
DF1E
c60b4389a0 small fix
this info dialog is not necessary because the flash CheckBox isn't
enabled if API>19
2015-06-13 19:37:07 +02:00
DF1E
6b80df1d27 clean manifest 2015-06-12 17:10:46 +02:00
DF1E
b60f555553 new Settings 3/3
now we have to bring the ToolBar back and fix some bugs...
And testing!
2015-06-12 17:10:23 +02:00
DF1E
2127863465 new Settings 2/3 2015-06-12 14:00:36 +02:00
DF1E
d47a86d9b5 new Settings 1/3 2015-06-12 13:14:29 +02:00
DF1E
a03444f4d0 rebase test for main settings screen 2015-06-11 18:48:24 +02:00
Sérgio Marques
86b8eaee12 Portuguese update 2015-06-09 10:21:35 +01:00
Anthony Restaino
d8b8d2c047 Moved proxy code to utility class, remove proxy from lite version to reduce apk size 2015-06-05 00:03:02 -04:00
Anthony Restaino
9dc9634299 Fixed bug 2015-06-03 11:00:54 -04:00
Anthony Restaino
e13e2dd006 Fix error in strings 2015-06-03 10:58:54 -04:00
Anthony Restaino
4c7bb196dd Merge remote-tracking branch 'origin/master' into dev 2015-06-03 10:55:53 -04:00
Anthony Restaino
a2f2fbc82b Merge pull request #249 from str4d/i2p-android
Support I2P (and other proxies in future)
2015-06-03 10:54:11 -04:00
Anthony Restaino
80d765b61c Merge remote-tracking branch 'origin/master' into dev 2015-06-03 10:52:34 -04:00
Anthony Restaino
b478c1ea98 Code cleanup 2015-06-03 10:50:51 -04:00
Anthony Restaino
7e5dbbc811 Merge pull request #251 from MarkThat/patch-3
Patch 3
2015-06-03 10:49:00 -04:00
str4d
2eec8be4ce Add manual proxy picker 2015-06-03 06:50:32 +00:00
Mark.
0c10efec00 Corrections.
Removed few strings which i added for error. Can these changes be merged without gradle?  I don't understand how to use it hehe.
Cheers!
2015-05-30 11:39:41 +02:00
Mark.
2cbe2e80e7 Update strings.xml 2015-05-29 15:36:05 +02:00
Mark.
e7029a7b64 Update.
I found some errors and fixed them and added the new translations.
2015-05-29 15:34:19 +02:00
Anthony Restaino
1e0770057e Merge pull request #241 from AltNico/cleanup
Remove unnecessary files
2015-05-27 07:21:13 -04:00
str4d
810483ec74 Use constants for proxy choices, part 2 2015-05-26 12:52:11 +00:00
str4d
a0b2197d8f Use constants for proxy choices 2015-05-26 10:52:58 +00:00
str4d
a5a20eebbd Notify user if proxy is not ready when they try to load a URL 2015-05-26 10:36:02 +00:00
str4d
6e8da9f6d3 Fix for I2PAndroidHelper.isI2PAndroidRunning() always returning false
Requires v0.7 of the I2P client library, which will be released once I2P 0.9.20
is released.
2015-05-26 03:25:47 +00:00
Nico Alt
c74b84d070 remove unnecessary files
Basically, all I have done was adding some missing files/directories to
.gitignore and the executing the following commands:
git rm --cached -r ./
git add --all
2015-05-25 22:43:24 +02:00
Anthony Restaino
e9203f20b3 Utilize gradle product flavors to produce free and plus versions 2015-05-25 12:55:35 -04:00
Anthony Restaino
4a38511218 Merge remote-tracking branch 'origin/master' into dev 2015-05-25 11:53:21 -04:00
Anthony Restaino
3517435956 Merge pull request #247 from Roboe/l10n-es
Updated Spanish (es) localization
2015-05-25 11:51:08 -04:00
Anthony Restaino
8bb38d1a90 Merge pull request #238 from ageback/master
Complete S.Chinese.
2015-05-25 11:45:18 -04:00
str4d
111d594c6b Use I2P if configured 2015-05-25 12:09:36 +00:00
str4d
6c2a557135 Change Orbot checkbox to an HTTP proxy choice list (None, Orbot, I2P) 2015-05-24 13:20:08 +00:00
str4d
46fbc56604 Add I2P client library to dependencies 2015-05-24 13:19:02 +00:00
Roboe
0beec60b7f [Spanish l10n] Fixed duplicated string 2015-05-24 00:19:40 +02:00
Roboe
1de67105d9 [Spanish l10n] Added new strings 2015-05-23 17:37:45 +02:00
Roberto M.F.
eacadcebba [Spanish l10n] Fixed some strings and updated untranslated ones 2015-05-22 18:09:49 +02:00
Anthony Restaino
9f8dff8c5d Added an AMOLED Black theme, changed from tabs to spaces for some files 2015-05-13 10:35:32 -04:00
Anthony Restaino
b400ef0647 Merge pull request #237 from smarquespt/master
Portuguese update
2015-05-13 09:09:55 -04:00
Michael Lu
025714bd97 Complete S.Chinese. 2015-05-13 15:26:03 +08:00
Sérgio Marques
5e131a0a6c Portuguese update 2015-05-12 16:34:22 +01:00