Commit graph

7534 commits

Author SHA1 Message Date
tobiasKaminsky
1ab754278e
revert 2017-05-19 10:48:26 +02:00
tobiasKaminsky
47b5748b74
Merge remote-tracking branch 'remotes/origin/master' into pinchZoom_new 2017-05-19 10:43:50 +02:00
Nextcloud bot
4ed4ed8dc0
[tx-robot] updated from transifex 2017-05-19 00:25:56 +00:00
Tobias Kaminsky
a08d17b592 Merge pull request #1014 from nextcloud/improve-push
Improve push
2017-05-18 15:04:56 +02:00
Nextcloud bot
547453760e
[tx-robot] updated from transifex 2017-05-18 00:24:19 +00:00
nextcloud-android-bot
849e23872a Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-17 11:47:16 +00:00
Mario Đanić
c5af507080 Merge fd6caadc3f into 01e7112a9a 2017-05-17 11:30:59 +00:00
Mario Danic
fd6caadc3f Unify scope
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-17 13:30:29 +02:00
Mario Đanić
01e7112a9a Merge pull request #194 from nextcloud/setAsWallpaper
Set as wallpaper/contact-photo/etc.
2017-05-17 13:26:51 +02:00
Nextcloud bot
a79dbe78d4
[tx-robot] updated from transifex 2017-05-17 09:58:58 +00:00
Mario Danic
fc7c24b610 Fix delete
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-17 11:17:05 +02:00
Mario Danic
8b923ad8e7 Push fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-17 11:01:00 +02:00
Nextcloud bot
e420fac753
[tx-robot] updated from transifex 2017-05-17 00:23:49 +00:00
AndyScherzinger
9021848af6
use apply instead of commit 2017-05-16 21:50:59 +02:00
AndyScherzinger
c749f6ea32
Fix javaDoc format 2017-05-16 21:41:02 +02:00
tobiasKaminsky
4f8da57a0e
minor improvements due to android studio suggestions 2017-05-16 13:30:07 +02:00
tobiasKaminsky
5126eeac10
do not show "set picture as" for svg images 2017-05-16 13:27:16 +02:00
Mario Danic
05425c0444 Fix push
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-05-16 12:33:44 +02:00
Mario Đanić
f1c0317dce Merge pull request #1001 from nextcloud/enhanceParticipate
Minor improvements to participate view
2017-05-16 11:06:20 +02:00
tobiasKaminsky
852252717b
non-downloaded file will first downloaded and then used for "set as" 2017-05-16 09:48:47 +02:00
Nextcloud bot
e4e75bc7cb
[tx-robot] updated from transifex 2017-05-16 00:23:28 +00:00
tobiasKaminsky
c9fc98499f
add missing import 2017-05-15 14:18:05 +02:00
tobiasKaminsky
6c6b0465b6
Merge remote-tracking branch 'remotes/origin/master' into setAsWallpaper 2017-05-15 14:08:36 +02:00
Tobias Kaminsky
cea61893a0 Merge branch 'master' into enhanceParticipate 2017-05-15 14:04:15 +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
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
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
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