Juan Ezquerro LLanes
|
3ba1d395ea
|
Merge branch 'master' into hidden_services
# Conflicts:
# app/src/main/java/org/torproject/android/OrbotMainActivity.java
|
2016-11-29 11:09:49 +01:00 |
arrase
|
f6f4d26645
|
type selection spinner
|
2016-11-29 01:41:41 +01:00 |
|
arrase
|
bb5f323b71
|
fix string
|
2016-11-29 00:11:25 +01:00 |
|
arrase
|
8abfba5fe5
|
fix indent
|
2016-11-29 00:06:59 +01:00 |
|
arrase
|
155c18235a
|
feedback
|
2016-11-28 23:58:55 +01:00 |
|
arrase
|
f76f58e2bf
|
delete files from storage
|
2016-11-28 23:43:43 +01:00 |
|
arrase
|
f742b270e3
|
delete by id
|
2016-11-28 23:32:35 +01:00 |
|
arrase
|
07044f7748
|
confirm_service_deletion
|
2016-11-28 23:25:19 +01:00 |
|
arrase
|
a0b3d72fa8
|
fab icon and color
|
2016-11-28 22:43:11 +01:00 |
|
arrase
|
0bdcab134c
|
get data from cursor
|
2016-11-28 22:25:59 +01:00 |
|
arrase
|
7a9ad4720b
|
non perfect but better option to start/stop
|
2016-11-28 22:06:09 +01:00 |
|
arrase
|
9ffb0b3915
|
bug fix
|
2016-11-28 01:04:32 +01:00 |
|
arrase
|
0a6d623cf7
|
bug fix
|
2016-11-28 00:38:26 +01:00 |
|
arrase
|
9e0bdcf147
|
bug fix
|
2016-11-27 23:52:35 +01:00 |
|
arrase
|
238a695c1b
|
bug fix
|
2016-11-27 23:01:58 +01:00 |
|
arrase
|
799d18cbdc
|
bug fix
|
2016-11-27 23:00:25 +01:00 |
|
arrase
|
1060c69623
|
intent api: restore key
|
2016-11-27 20:57:47 +01:00 |
|
arrase
|
bb7ffd9692
|
intent api: restore key
|
2016-11-27 20:07:49 +01:00 |
|
arrase
|
5d3b171e21
|
refactor
|
2016-11-27 19:19:44 +01:00 |
|
arrase
|
f153600dd1
|
insert or update
|
2016-11-27 19:12:16 +01:00 |
|
arrase
|
5f02561f9d
|
backup restore
|
2016-11-27 18:50:20 +01:00 |
|
arrase
|
130b89d846
|
Write config.json
|
2016-11-27 17:15:15 +01:00 |
|
arrase
|
fca54cfcdc
|
move hidden services to files directory
|
2016-11-27 16:03:38 +01:00 |
|
arrase
|
a49ac3fcc5
|
padding
|
2016-11-24 22:45:37 +01:00 |
|
arrase
|
b04d0eb17a
|
actionbar permission request flow
|
2016-11-24 22:22:04 +01:00 |
|
arrase
|
17efdcafa2
|
check empty names
|
2016-11-24 03:06:40 +01:00 |
|
arrase
|
d28db41782
|
big refactor
|
2016-11-24 02:56:11 +01:00 |
|
arrase
|
6658101dd9
|
more margin
|
2016-11-24 02:39:41 +01:00 |
|
arrase
|
da601d86ef
|
layout fix
|
2016-11-24 02:35:00 +01:00 |
|
arrase
|
85de87f0a0
|
layout fix
|
2016-11-24 02:30:19 +01:00 |
|
arrase
|
872ec40214
|
restore backup dialog
|
2016-11-24 02:22:41 +01:00 |
|
arrase
|
f79d2d9005
|
bug fix and refactor
|
2016-11-23 21:20:50 +01:00 |
|
arrase
|
0b21dfc46a
|
bug fix
|
2016-11-23 02:06:38 +01:00 |
|
arrase
|
22c573f70a
|
adds AppDataProvider
|
2016-11-23 01:37:06 +01:00 |
|
arrase
|
0818b0c963
|
isolate hidden services configuration dirs
|
2016-11-23 00:12:06 +01:00 |
|
arrase
|
53e53d6fff
|
clean
|
2016-11-22 23:19:48 +01:00 |
|
arrase
|
f030963c9e
|
refactor
|
2016-11-22 22:37:34 +01:00 |
|
arrase
|
7600b4c58c
|
menu entry for restore backup
|
2016-11-22 01:24:23 +01:00 |
|
arrase
|
57a7b0dbc7
|
remove class
|
2016-11-22 00:45:07 +01:00 |
|
arrase
|
71d24e832b
|
bugfix
|
2016-11-22 00:22:22 +01:00 |
|
arrase
|
dbc7ff3b7d
|
flag for services created by user
|
2016-11-22 00:12:38 +01:00 |
|
arrase
|
f58265ae9f
|
fab icon
|
2016-11-21 22:46:37 +01:00 |
|
arrase
|
8c7b897cd8
|
isolated permission request
|
2016-11-21 22:43:08 +01:00 |
|
arrase
|
8585466c96
|
adds toolbar
|
2016-11-21 21:48:45 +01:00 |
|
arrase
|
d1884c3349
|
refactor
|
2016-11-21 00:04:48 +01:00 |
|
arrase
|
e8a5099518
|
refactor
|
2016-11-21 00:00:58 +01:00 |
|
arrase
|
0fd59bc78d
|
restore backup from intent
|
2016-11-20 23:56:17 +01:00 |
|
arrase
|
11e663be67
|
feedback
|
2016-11-20 22:51:36 +01:00 |
|
arrase
|
3e6c627712
|
action moved
|
2016-11-20 22:31:12 +01:00 |
|
arrase
|
08fb68dcaa
|
action moved
|
2016-11-20 21:11:17 +01:00 |