Commit graph

9599 commits

Author SHA1 Message Date
Tobias Kaminsky
4914b11bc1
Merge branch 'master' into contactsBackupNPE 2018-01-09 08:19:57 +01:00
Tobias Kaminsky
666ff25ce6
Merge pull request #1933 from nextcloud/userinfoButterknife
do not use id twice
2018-01-09 08:19:40 +01:00
Tobias Kaminsky
a1e0173e9c
Merge branch 'master' into userinfoButterknife 2018-01-09 08:12:42 +01:00
Nextcloud bot
ae6c33c9fa
[tx-robot] updated from transifex 2018-01-09 01:40:56 +00:00
Tobias Kaminsky
22a1a668d5 daily dev 20180109 2018-01-09 00:48:33 +01:00
tobiasKaminsky
62f74a8ff5
do not use id twice
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-08 15:47:44 +01:00
tobiaskaminsky
e6d597e172
code formatting
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-08 14:23:14 +01:00
tobiaskaminsky
9733b886af
fix potential NPEs
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-08 14:21:11 +01:00
Tobias Kaminsky
ab8b149067
Merge pull request #1887 from nextcloud/oreo
Oreo support
2018-01-08 09:37:58 +01:00
nextcloud-android-bot
f60e9d9cd0
Drone: update Lint results to reflect reduced error/warning count [skip ci] 2018-01-08 09:22:09 +01:00
tobiaskaminsky
138e35c512
add roundIcon to Manifest 2018-01-08 09:22:09 +01:00
AndyScherzinger
84d40f0421
fix compile error 2018-01-08 09:22:09 +01:00
AndyScherzinger
487407fb49
codacy: combine if blocks 2018-01-08 09:22:09 +01:00
AndyScherzinger
9111fa0555
use vector xml for launcher icon background 2018-01-08 09:22:09 +01:00
AndyScherzinger
9d029de12e
fix folder name -v26 2018-01-08 09:22:08 +01:00
AndyScherzinger
505306cbf5
try moving background to v26 directory for lint 2018-01-08 09:22:08 +01:00
AndyScherzinger
8f49c74a2c
cleanup dev verison parts 2018-01-08 09:22:08 +01:00
AndyScherzinger
0bdf9ffa51
remove replace call (originally introduced for round launcher icon) 2018-01-08 09:22:08 +01:00
AndyScherzinger
346c5ca9a3
move vector launcher foreground file to v26 directory 2018-01-08 09:22:08 +01:00
AndyScherzinger
4b87a0d109
properly enforce round launcher icon 2018-01-08 09:22:08 +01:00
tobiasKaminsky
5b6f0354f6
extract channel creation 2018-01-08 09:22:08 +01:00
AndyScherzinger
94823e576d
manifest 2018-01-08 09:22:08 +01:00
AndyScherzinger
c6016b9a0a
fix build for modified 2018-01-08 09:22:07 +01:00
AndyScherzinger
09fdc9b2e1
reworked raw logos 2018-01-08 09:22:07 +01:00
AndyScherzinger
95f2b488f9
fix positioning of Nc logo within icons 2018-01-08 09:22:07 +01:00
AndyScherzinger
1fadabac13
line break added 2018-01-08 09:22:07 +01:00
AndyScherzinger
36f3c936ec
raw files for adaptive launcher icon generator 2018-01-08 09:22:07 +01:00
AndyScherzinger
dbf753cce3
enforce round launcher icon on pre Oreo devices 2018-01-08 09:22:07 +01:00
AndyScherzinger
0137ec8ef6
reworked Nc13 style launcher icon work 2018-01-08 09:22:07 +01:00
AndyScherzinger
a5eb437a30
linebreaks added 2018-01-08 09:22:06 +01:00
AndyScherzinger
80a2f76f51
round & adaptive icon added 2018-01-08 09:22:06 +01:00
tobiasKaminsky
4ea1a907f4
add notification channel support, with only one initially set-up 2018-01-08 09:22:06 +01:00
tobiasKaminsky
1da1f11ea5
change sdk versions 2018-01-08 09:21:51 +01:00
tobiasKaminsky
1ab3f4aa57
add icon launcher ressource 2018-01-08 09:21:51 +01:00
Tobias Kaminsky
82cbe524c0 daily dev 20180108 2018-01-08 08:13:48 +01:00
Nextcloud bot
583cc6cdd6
[tx-robot] updated from transifex 2018-01-08 01:41:16 +00:00
Mario Đanić
24cd4fce11
Merge pull request #1923 from nextcloud/fix-1911
Fix #1911
2018-01-07 20:29:29 +01:00
Mario Danic
7cce49af2a Remove extra parentheses
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-07 20:24:59 +01:00
Nextcloud bot
a4b3ddf9d8
[tx-robot] updated from transifex 2018-01-07 01:40:29 +00:00
Nextcloud bot
fbd97a9439
[tx-robot] updated from transifex 2018-01-06 01:40:46 +00:00
Tobias Kaminsky
313354aa4c daily dev 20180106 2018-01-06 00:49:38 +01:00
Nextcloud bot
ee811e2749
[tx-robot] updated from transifex 2018-01-05 14:58:54 +00:00
Tobias Kaminsky
a4db68404f
Merge pull request #1904 from nextcloud/uploadsStorageManagerNPE
Uploads storage manager: prevent NPE
2018-01-05 13:23:31 +01:00
Tobias Kaminsky
9a9ea0af85
Merge branch 'master' into uploadsStorageManagerNPE 2018-01-05 13:11:30 +01:00
Tobias Kaminsky
026241a3af
Merge pull request #1906 from nextcloud/notificationManager
Get notification manager if it does not exist
2018-01-05 13:11:17 +01:00
Tobias Kaminsky
7a997c0544
Merge branch 'master' into notificationManager 2018-01-05 11:39:33 +01:00
Tobias Kaminsky
419eb04dc3
Merge pull request #1912 from nextcloud/NotificationActivity
Notification activity: account can be null
2018-01-05 11:38:57 +01:00
Tobias Kaminsky
38d6706ea6
Merge branch 'master' into NotificationActivity 2018-01-05 10:58:34 +01:00
Tobias Kaminsky
07eec991e8
Merge pull request #1905 from nextcloud/mFileNeverNull
mFiles should be never null
2018-01-05 10:56:46 +01:00
Tobias Kaminsky
b7370297e7
Merge branch 'master' into mFileNeverNull 2018-01-05 10:41:26 +01:00