mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-29 18:59:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
9838 commits 230 branches 1574 tags 622 MiB
Commit graph

9838 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Kaminsky
d1a3f7e85a
Merge pull request #2187 from b-harper/template-link 
fix template link in CONTRIBUTING.md
 2018-02-19 13:46:23 +01:00
Nextcloud bot
96d939b2e8
[tx-robot] updated from transifex 2018-02-19 01:40:31 +00:00
Nextcloud bot
8b8f0fdccf
[tx-robot] updated from transifex 2018-02-17 01:43:24 +00:00
Tobias Kaminsky
ba3af697c4 daily dev 20180217 2018-02-17 00:34:16 +01:00
b-harper
2f08ccf85d
fix template link in CONTRIBUTING.md 2018-02-16 08:22:08 -06:00
Tobias Kaminsky
661b7424af
Merge pull request #2163 from nextcloud/folders-structure-au 
Implement folder structure
 2018-02-16 10:08:36 +01:00
Nextcloud bot
46e0f3c73a
[tx-robot] updated from transifex 2018-02-16 01:42:40 +00:00
Nextcloud bot
0cafb86e28
[tx-robot] updated from transifex 2018-02-15 01:44:53 +00:00
Tobias Kaminsky
579f305e07 daily dev 20180215 2018-02-15 00:34:29 +01:00
Tobias Kaminsky
6038848665
Merge pull request #2154 from ardevd/master 
Encryption: Get IV directly from the cipher object when encrypting the private key
 2018-02-14 12:02:27 +01:00
Tobias Kaminsky
5efbf0c7f1
Merge pull request #2149 from nextcloud/fix-ssl 
Fix SSL
 2018-02-14 09:04:43 +01:00
Mario Danic
4ba1a8758c
Fix SSL 
Document empty body
Fix drone issue
Fix codacy

Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-02-14 08:42:55 +01:00
Tobias Kaminsky
1e39e967f2
Merge pull request #2158 from nextcloud/deletePublicKey 
Delete public key if storage of private key did not worked
 2018-02-14 08:16:09 +01:00
tobiasKaminsky
33529d045c
bump lib version 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-02-14 07:50:56 +01:00
tobiasKaminsky
04de5cab62
delete public key if storage of private key did not worked 2018-02-14 07:50:56 +01:00
Nextcloud bot
6a35a44598
[tx-robot] updated from transifex 2018-02-14 01:41:22 +00:00
Tobias Kaminsky
699024cb30 daily dev 20180214 2018-02-14 00:34:28 +01:00
Mario Danic
de3e05c764 Implement folder structure 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-02-13 21:56:03 +01:00
Andy Scherzinger
23d7b96e6b
Merge pull request #2150 from nextcloud/fix-push-once-again 
Fix push
 2018-02-13 21:00:19 +01:00
Mario Danic
7c870c198e
Fix build issues 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-02-13 18:36:26 +01:00
Mario Danic
df8e73fff2
Fix push 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2018-02-13 18:36:18 +01:00
Tobias Kaminsky
b2548f34d4 daily dev 20180213 2018-02-13 00:34:23 +01:00
Nextcloud bot
1e5924d611
[tx-robot] updated from transifex 2018-02-12 22:59:11 +00:00
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
AndyScherzinger
3ba75af913
Fix #2141 by using the correct time pattern 2018-02-12 10:14:46 +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