mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 08:24:08 +03:00
Code Issues Projects Releases Packages Wiki Activity
10119 commits 221 branches 1588 tags 639 MiB
Commit graph

10119 commits

This branch
This branch
All branches
Author SHA1 Message Date
eho
5a49c5a464 Encryption: Get IV directly from the cipher object when encrypting the private key. 
In Android O and newer (at least) javax.crypto.spec.IvParameterSpec is unsupported. Get the IV directly from the cipher object instead.
 2018-02-12 21:06:53 +01:00
Andy Scherzinger
2c59093bd8
Merge pull request #2109 from nextcloud/bugfix/beautifyEmptyString 
Don't beautify empty inputs
 2018-02-12 18:27:51 +01:00
AndyScherzinger
b1f5ae5297
also trim() when beatifying URLs and twitter handles 2018-02-12 18:17:08 +01:00
Bartosz Przybylski
5df5d1d7b5
Don't beautify empty inputs 2018-02-12 18:17:08 +01:00
Tobias Kaminsky
f5758956ef
Merge pull request #2138 from codedsun/UIGlitch 
Fix#2125:ShareDialogFix
 2018-02-12 15:25:55 +01:00
Andy Scherzinger
a0273ced28
Merge pull request #2146 from nextcloud/fix2141 
Fix time display in activities list
 2018-02-12 12:01:51 +01:00
tobiasKaminsky
9f2ef53e11
update tablet to fit long text 
slightly larger export

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-02-12 11:47:27 +01:00
AndyScherzinger
3ba75af913
Fix #2141 by using the correct time pattern 2018-02-12 10:14:46 +01:00
tobiasKaminsky
d5d8a64fb5
- change grey area for davdroid 
- minor fix
- export to 512px height to reduce size
- 3 text lines for phone
- more languages

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-02-12 10:14:28 +01:00
Andy Scherzinger
9ee7be7125
Merge pull request #2118 from nextcloud/bump3_0 
Bump to 3.0
 2018-02-12 09:38:54 +01:00
Nextcloud bot
2623f061e2
[tx-robot] updated from transifex 2018-02-12 07:55:43 +00:00
Nextcloud bot
6877c5669e
[tx-robot] updated from transifex 2018-02-12 07:45:48 +00:00
Suneet Srivastava
7ffa5886c1 Fix#2125:ShareDialogFix 2018-02-11 00:09:41 +05:30
Nextcloud bot
a835c1b950
[tx-robot] updated from transifex 2018-02-10 08:54:50 +00:00
Tobias Kaminsky
d06113abeb daily dev 20180210 2018-02-10 00:58:11 +01:00
Andy Scherzinger
df0795fad9
Merge pull request #2114 from cheikhSall/issue2040 
Rename folder to existing name issue
 2018-02-09 15:39:15 +01:00
Tobias Kaminsky
46df218d49
Update build.gradle 2018-02-09 15:25:35 +01:00
Tobias Kaminsky
614b0133ac
Update build.gradle 2018-02-09 15:25:06 +01:00
Andy Scherzinger
a6f657b752
Merge branch 'master' into issue2040 2018-02-09 13:24:36 +01:00
Andy Scherzinger
a66617e45a
Merge pull request #2115 from nextcloud/comradekingu-patch-1 
Spelling: New intro strings, could not rename, info
 2018-02-09 13:12:19 +01:00
Allan Nordhøy
f81f9ab35e
New intro strings, could not rename, info 2018-02-09 12:54:38 +01:00
Nextcloud bot
88950f3e3b
[tx-robot] updated from transifex 2018-02-09 01:41:08 +00:00
tobiasKaminsky
0fd69c08e7
bump to 3.0 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-02-08 08:26:29 +01:00
Tobias Kaminsky
073f08bf3f
Merge pull request #2113 from nextcloud/fix-au 
Fixes auto upload
 2018-02-08 06:39:00 +00:00
Nextcloud bot
bbf9ba21a3
[tx-robot] updated from transifex 2018-02-08 01:39:20 +00:00
Tobias Kaminsky
40c393bdbf daily dev 20180208 2018-02-08 01:55:25 +01:00
cc7d6683af Rename folder to existing name issue 2018-02-08 00:18:54 +01:00
Andy Scherzinger
d4b19e6ea6
Merge pull request #2005 from nextcloud/codacy 
Codacy fixes
 2018-02-07 18:25:02 +01:00
AndyScherzinger
66e99d0557
codacy: cleanup nested if conditions 2018-02-07 12:26:29 +01:00
AndyScherzinger
0aa8289cb8
codacy: use local variables when adequate 2018-02-07 12:26:28 +01:00
AndyScherzinger
a54fea72d6
revert SHOW_ON_UPGRADE removal 2018-02-07 12:26:28 +01:00
AndyScherzinger
69f313561d
codacy: fix code style issues 2018-02-07 12:26:28 +01:00
AndyScherzinger
0ade905557
codacy: remove unused code 2018-02-07 12:26:19 +01:00
Mario Danic
dbc32b2427 Fixes auto upload 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-02-07 11:07:00 +01:00
Nextcloud bot
93913ae931
[tx-robot] updated from transifex 2018-02-07 01:39:16 +00:00
Tobias Kaminsky
8342ef5dcc daily dev 20180207 2018-02-07 00:56:34 +01:00
Andy Scherzinger
0b91537d14
Merge pull request #2105 from nextcloud/shareIconColor 
Theme share icon
 2018-02-06 14:45:30 +01:00
tobiasKaminsky
e327e6a7c0
theme share icon 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-02-06 11:16:14 +00:00
Tobias Kaminsky
8a5a6ce9b0
Merge pull request #2095 from nextcloud/fix-2094 
Fix #2094
 2018-02-06 06:39:00 +00:00
Nextcloud bot
e57c47ab5b
[tx-robot] updated from transifex 2018-02-06 01:39:35 +00:00
Nextcloud bot
3c01a0dd59
[tx-robot] updated from transifex 2018-02-04 01:39:28 +00:00
Tobias Kaminsky
8aac87540f daily dev 20180204 2018-02-04 00:59:24 +01:00
Andy Scherzinger
0009b259cd
Merge pull request #2088 from nextcloud/installLocation 
Force install location to internal, even if this is default
 2018-02-03 22:02:58 +01:00
Mario Danic
e27b2f7689 Fix #2094 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-02-03 10:38:37 +01:00
Nextcloud bot
39116962b9
[tx-robot] updated from transifex 2018-02-03 01:39:15 +00:00
tobiaskaminsky
13e99f8482
force install location to internal, even if this is default 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-02-02 09:32:02 +01:00
Nextcloud bot
5eeeab171a
[tx-robot] updated from transifex 2018-02-02 01:41:41 +00:00
Nextcloud bot
87aed75104
[tx-robot] updated from transifex 2018-02-01 05:46:50 +00:00
Nextcloud bot
68c60d3287
[tx-robot] updated from transifex 2018-02-01 01:41:58 +00:00
Tobias Kaminsky
93a6fd4ce7 daily dev 20180201 2018-02-01 01:08:42 +01:00