mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-18 15:01:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
7494 commits 221 branches 1585 tags 637 MiB
Commit graph

7494 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Kaminsky
d6a1c7ee83 Merge branch 'master' into crashDueToEmptyString 2017-05-17 12:10:52 +02:00
Nextcloud bot
a79dbe78d4
[tx-robot] updated from transifex 2017-05-17 09:58:58 +00:00
Nextcloud bot
e420fac753
[tx-robot] updated from transifex 2017-05-17 00:23:49 +00:00
Mario Đanić
f1c0317dce Merge pull request #1001 from nextcloud/enhanceParticipate 
Minor improvements to participate view
 2017-05-16 11:06:20 +02:00
Nextcloud bot
e4e75bc7cb
[tx-robot] updated from transifex 2017-05-16 00:23:28 +00:00
Tobias Kaminsky
cea61893a0 Merge branch 'master' into enhanceParticipate 2017-05-15 14:04:15 +02:00
tobiasKaminsky
7b4bb187d3
Merge remote-tracking branch 'remotes/origin/master' into crashDueToEmptyString 2017-05-15 14:03:30 +02:00
Tobias Kaminsky
03cfb9b8b2 Merge pull request #1003 from nextcloud/useNewLib 
Use new lib
 2017-05-15 14:01:10 +02:00
tobiasKaminsky
d57150587e
manually override lint results 2017-05-15 13:59:20 +02:00
tobiaskaminsky
ab59cd784e
use 1.0.18 2017-05-15 13:03:33 +02:00
Tobias Kaminsky
a2ff44a77e Merge branch 'master' into crashDueToEmptyString 2017-05-15 12:44:22 +02:00
Mario Đanić
5f534f7939 Merge pull request #997 from nextcloud/logFolder 
Use app specific log folder
 2017-05-15 12:34:11 +02:00
tobiasKaminsky
ebd94e889e
use contribute url from setup.xml 
escape quote signs
 2017-05-15 11:42:28 +02:00
tobiasKaminsky
df861519b1
Merge remote-tracking branch 'origin/crashDueToEmptyString' into crashDueToEmptyString 2017-05-15 10:57:57 +02:00
tobiasKaminsky
66cbc31bd7
comment gms again 2017-05-15 10:57:51 +02:00
nextcloud-android-bot
8220047f3b Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-15 08:48:56 +00:00
Tobias Kaminsky
130475d664 Merge 6f3c3b5579 into 0017e16748 2017-05-15 08:32:45 +00:00
tobiasKaminsky
6f3c3b5579
remove all "string empty" 2017-05-15 10:27:43 +02:00
nextcloud-android-bot
2faa609c79 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-15 07:27:44 +00:00
Tobias Kaminsky
7c7458dda1 Merge aeba233894 into 0017e16748 2017-05-15 07:10:25 +00:00
tobiasKaminsky
aeba233894
use app specific log folder 2017-05-15 09:08:19 +02:00
tobiasKaminsky
4e80906cd9
fix typo 2017-05-15 07:40:14 +02:00
tobiasKaminsky
c6c1713ec2
beautify it 2017-05-15 07:39:00 +02:00
tobiasKaminsky
3351cd4541
add string.empty 2017-05-15 07:38:19 +02:00
Nextcloud bot
0017e16748
[tx-robot] updated from transifex 2017-05-15 00:23:31 +00:00
Nextcloud bot
6db771d36a
[tx-robot] updated from transifex 2017-05-14 00:23:16 +00:00
Mario Đanić
01fc8aba7c Merge pull request #993 from nextcloud/contactButton 
remove old reference to onClick, this is now handled via ButterKnife
 2017-05-13 22:58:26 +02:00
nextcloud-android-bot
c93e5ebd62 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-13 20:43:07 +00:00
Tobias Kaminsky
514187be90 Merge c28f17d9af into 8ed477ca0d 2017-05-13 20:32:56 +00:00
tobiaskaminsky
c28f17d9af
remove old reference to onClick, this is now handled via ButterKnife 
use "end" instead of "right" for RTL support
 2017-05-13 22:30:00 +02:00
Andy Scherzinger
8ed477ca0d Merge pull request #990 from nextcloud/lintConfig 
disable 'MissingTranslation' as this is handled by transifex
 2017-05-13 22:12:27 +02:00
nextcloud-android-bot
7608e00528 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-13 14:57:35 +00:00
Tobias Kaminsky
fe4e366a4d Merge 3612523c12 into e89a8190f7 2017-05-13 14:31:34 +00:00
AndyScherzinger
3612523c12
Merge branch 'master' of https://github.com/nextcloud/android into lintConfig 2017-05-13 16:31:08 +02:00
Andy Scherzinger
e89a8190f7 Merge pull request #451 from nextcloud/fix_file_modification_date_on_upload 
Fix file modification date on upload
 2017-05-13 15:34:01 +02:00
nextcloud-android-bot
4e81fc9190 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-13 13:08:58 +00:00
Andy Scherzinger
72b957a25d Merge 02100ae744 into 4f2eae90d1 2017-05-13 12:53:19 +00:00
AndyScherzinger
02100ae744
remove unnecessary casts 2017-05-13 14:53:01 +02:00
AndyScherzinger
086e18d377
use apply() instead of commit() 2017-05-13 14:52:39 +02:00
AndyScherzinger
e48cc1bbbc
document empty method bodies (codacy) 2017-05-13 14:48:40 +02:00
AndyScherzinger
f2a81fcc08
fix javaDoc (lint) 2017-05-13 14:38:21 +02:00
AndyScherzinger
54b3229c6a
add missing super calls (lint) 2017-05-13 14:38:08 +02:00
AndyScherzinger
904ec2623d
remove unnecessary semicolons (lint) 2017-05-13 14:11:20 +02:00
AndyScherzinger
da4cebafd3
fix rebase 2017-05-13 14:11:18 +02:00
AndyScherzinger
f9719dc374
use lib master since lib pr got merged 2017-05-13 14:11:17 +02:00
davigonz
a480dff6ca
Read modification time from the file in local filesystem and set it to the file 
# Conflicts:
#	src/com/owncloud/android/operations/UploadFileOperation.java
 2017-05-13 14:11:04 +02:00
Andy Scherzinger
4f2eae90d1 Merge pull request #395 from nextcloud/federated_sharing_edit_options 
Updated federated sharing edit options
 2017-05-13 14:09:59 +02:00
AndyScherzinger
f9e7c85d03
fix last modified timestamp 2017-05-13 13:55:20 +02:00
AndyScherzinger
06a82e45f0
bump lib to v1.0.17 2017-05-13 13:52:34 +02:00
tobiasKaminsky
09f9019c9c
some minor code formatting 2017-05-13 13:50:49 +02:00