Commit graph

7585 commits

Author SHA1 Message Date
Nextcloud bot
547453760e
[tx-robot] updated from transifex 2017-05-18 00:24:19 +00:00
tobiaskaminsky
0f6f4ad642
do not send status messages if fragment is destroyed 2017-05-17 16:41:01 +02:00
nextcloud-android-bot
44c062e853 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-17 14:20:12 +00:00
Tobias Kaminsky
c4e6ae1824 Merge 37aac8498c into 01e7112a9a 2017-05-17 14:10:05 +00:00
tobiaskaminsky
37aac8498c
prevent NPE
use boolean to determinate if resume or if new start
2017-05-17 16:08:21 +02:00
tobiaskaminsky
9860aaa10f
Merge remote-tracking branch 'remotes/origin/master' into audioRotationBug 2017-05-17 15:39:28 +02:00
Tobias Kaminsky
c2010bb3d0 Merge branch 'master' into crashDueToEmptyString 2017-05-17 15:26:05 +02: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
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
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
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