mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity
10003 commits 223 branches 1586 tags 638 MiB
Commit graph

10003 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tobias Kaminsky
bbd57d4f10
Merge pull request #2072 from tilosp/prioritize-screenshots 
Auto upload: Prioritize Screenshots Folder
 2018-01-31 14:56:05 +01:00
Tilo Spannagel
52f1e58535
Auto upload: Prioritize Screenshots Folder 
Signed-off-by: Tilo Spannagel <development@tilosp.de>
 2018-01-31 13:15:45 +01:00
Tobias Kaminsky
c368df4f3c
Merge pull request #2080 from nextcloud/300rc3 
3.0.0 RC3
 2018-01-31 10:15:30 +01:00
Tobias Kaminsky
50153b7340
Merge pull request #2079 from nextcloud/fix143upgrade 
Fix upgrade from 1.4.3 to 3.0.0
 2018-01-31 10:15:12 +01:00
tobiasKaminsky
5b160add9c
simplify 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-31 10:07:55 +01:00
tobiasKaminsky
3a7f5fc47c
3.0.0 RC3 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-31 09:57:47 +01:00
tobiasKaminsky
56b7e3afc4
Fix upgrade from 1.4.3 to 3.0.0 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-31 09:51:30 +01:00
Tobias Kaminsky
1853deb143
Merge pull request #2078 from nextcloud/correctE2Ename 
Store info that file is encrypted
 2018-01-31 09:08:53 +01:00
tobiasKaminsky
b0a1152a75
store info that file is encrypted 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2018-01-31 08:47:50 +01:00
Tobias Kaminsky
d1c53093cc
Merge pull request #2068 from nextcloud/snackbarOnlyIfActivityExists 
show download snackbar only if activity exists
 2018-01-31 08:10:32 +01:00
Tobias Kaminsky
44bef145a2
Merge pull request #2066 from nextcloud/fix-autoupload-2 
Fix auto restart of pending Auto Upload entries
 2018-01-31 07:37:17 +01:00
tobiaskaminsky
d9435fcf1d
show download snackbar only if activity exists 
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
 2018-01-31 07:35:41 +01:00
Nextcloud bot
09337e9cea
[tx-robot] updated from transifex 2018-01-31 01:39:53 +00:00
Tobias Kaminsky
6dc5815276 daily dev 20180131 2018-01-31 00:55:05 +01:00
Tobias Kaminsky
9512f425b3 Merge branch 'master' of github.com:/nextcloud/android 2018-01-31 00:30:36 +01:00
Mario Đanić
737ce03e51
Merge pull request #2067 from nextcloud/hardenExternalStorage 
getExternalFilesDir(null) can be null --> preventing NPE
 2018-01-30 19:26:05 +01:00