Commit graph

7703 commits

Author SHA1 Message Date
Nextcloud bot
0ae25b0c2c
[tx-robot] updated from transifex 2017-05-23 06:55:56 +00:00
Nextcloud bot
00f4e595fa
[tx-robot] updated from transifex 2017-05-23 00:26:22 +00:00
Tobias Kaminsky
670a78468b Merge pull request #1033 from nextcloud/release143
Bump version 1.4.3
2017-05-22 17:24:40 +02:00
tobiasKaminsky
0627dd2a84
bump version 2017-05-22 17:21:37 +02:00
Tobias Kaminsky
58b0592d44 Merge pull request #1032 from nextcloud/nc12auth
HOTFIX: Ignore oauth for now and use always basic auth
2017-05-22 17:14:48 +02:00
tobiasKaminsky
d17af1d37e
ignore oauth for now and use always basic auth 2017-05-22 17:09:05 +02:00
tobiaskaminsky
ce57d257b1
Merge remote-tracking branch 'remotes/origin/master' into brandingDrawer2 2017-05-22 10:03:15 +02:00
tobiaskaminsky
1f8ee72aa5
set to 757575ff and no transparence as in othere files 2017-05-22 10:02:08 +02:00
tobiaskaminsky
16cfaa5525
change/add nav_videos res 2017-05-22 09:49:58 +02:00
Nextcloud bot
9bc5d1bde7
[tx-robot] updated from transifex 2017-05-22 00:25:50 +00:00
Nextcloud bot
ae373a0693
[tx-robot] updated from transifex 2017-05-21 00:25:37 +00:00
Nextcloud bot
50889f726b
[tx-robot] updated from transifex 2017-05-20 00:24:46 +00:00
Andy Scherzinger
c33a88104d Merge pull request #1024 from nextcloud/contactsSort
Sort contact list
2017-05-19 14:50:15 +02:00
tobiasKaminsky
32a5c7d81a
formatting 2017-05-19 07:47:00 +02:00
Nextcloud bot
4ed4ed8dc0
[tx-robot] updated from transifex 2017-05-19 00:25:56 +00:00
alejandro
f94169a458 Sort contacts list 2017-05-18 18:50:21 -05:00
Tobias Kaminsky
332d48abac Merge branch 'master' into crashDueToEmptyString 2017-05-18 16:16:45 +02:00
Tobias Kaminsky
a08d17b592 Merge pull request #1014 from nextcloud/improve-push
Improve push
2017-05-18 15:04:56 +02:00
nextcloud-android-bot
b43dc9d1a7 Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-18 12:50:27 +00:00
Tobias Kaminsky
4898ee1050 Merge 2d78364f70 into 547453760e 2017-05-18 12:36:12 +00:00
tobiaskaminsky
2d78364f70
Warning "Duplicated icons under different names" increased, but no other way possible 2017-05-18 14:35:57 +02:00
tobiaskaminsky
7eddd7440c
fixed "all files" 2017-05-18 14:34:44 +02:00
nextcloud-android-bot
b86682254f Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-18 12:04:04 +00:00
Tobias Kaminsky
512ddb0e27 Merge f0597ec7a9 into 547453760e 2017-05-18 11:49:16 +00:00
tobiaskaminsky
f0597ec7a9
comment gms 2017-05-18 13:49:06 +02:00
tobiaskaminsky
fabecc86a5
Merge remote-tracking branch 'remotes/origin/master' into contactListImprovement 2017-05-18 13:47:03 +02:00
nextcloud-android-bot
17beb10fdd Drone: update Lint results to reflect reduced error/warning count [skip ci] 2017-05-18 11:15:26 +00:00
Tobias Kaminsky
98989a9363 Merge 44b9355315 into 547453760e 2017-05-18 10:52:31 +00:00
tobiaskaminsky
44b9355315
change to value of current master 2017-05-18 12:52:20 +02:00
tobiaskaminsky
da497abdb6
move/copy drawer icons 2017-05-18 12:20:55 +02:00
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