Commit graph

9794 commits

Author SHA1 Message Date
Tobias Kaminsky
ba5a0a4c1e
Merge pull request #2029 from nextcloud/mario-patch-readme
Update README.md
2018-01-23 13:52:18 +01:00
tobiaskaminsky
633faf2169
show infos on untrusted domain if available
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-23 13:16:29 +01:00
Mario Đanić
82318d7ce1
Update README.md 2018-01-23 12:56:30 +01:00
Andy Scherzinger
268b08fef8
Merge pull request #2028 from nextcloud/fixPre44DrawerCrash
Fix crash on <4.4 when opening drawer
2018-01-23 12:53:59 +01:00
tobiaskaminsky
873f7333cd
fix crash on <4.4 when opening drawer
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-23 12:46:28 +01:00
Mario Danic
0737092d5a Try to fix 4
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 11:28:30 +01:00
Andy Scherzinger
4f4184f04f
Merge pull request #2025 from nextcloud/fix-conditions-check
Fix conditions check
2018-01-23 10:22:29 +01:00
tobiaskaminsky
544c4723b9 rebased
create parent folder if needed
fix line breaks

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-23 08:10:45 +01:00
Mario Danic
c1a72a4b4b Lots of storage changes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 08:10:45 +01:00
Mario Danic
ec13dc8234 More tries
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 08:10:45 +01:00
Mario Danic
833c7f5773 Fix a bug with storage settings
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 08:10:45 +01:00
Mario Danic
63a6fd650c Try to fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 08:10:45 +01:00
Mario Danic
91c429bf20 Try to fix it
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 08:10:45 +01:00
Mario Danic
f675c1c972
Missing stuff all around
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 07:42:13 +01:00
Mario Danic
cadde9dc9a
Fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 07:42:13 +01:00
Mario Danic
b4e8b85910
Remove useless assignment
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 07:42:13 +01:00
Mario Danic
38dc41ad3b
Remove commented out stuff
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 07:42:12 +01:00
Mario Danic
9b2b72c713
Fix upload checks
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 07:42:12 +01:00
Mario Danic
39b477f513
Fix conditions check
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-23 07:42:12 +01:00
Nextcloud bot
2111bd66c0
[tx-robot] updated from transifex 2018-01-23 01:40:20 +00:00
Tobias Kaminsky
3136661962 daily dev 20180123 2018-01-23 01:03:50 +01:00
tobiaskaminsky
d7cfbffe34
replace text filed
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-22 22:52:38 +01:00
Andy Scherzinger
fa05e04f66
Merge pull request #2021 from nextcloud/IOOBE
Prevent index out of bounds exception
2018-01-22 22:52:06 +01:00
tobiaskaminsky
beb312b8af
prevent index out of bounds exception
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-22 21:58:30 +01:00
Andy Scherzinger
99c054c912
Merge pull request #1966 from nextcloud/removeModifiedFlavor
Remove modified flavor
2018-01-22 21:43:49 +01:00
nextcloud-android-bot
110831ca65
Drone: update Lint results to reflect reduced error/warning count [skip ci] 2018-01-22 17:33:31 +01:00
tobiasKaminsky
fdc9abcd34
remove modified flavor
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-22 17:33:28 +01:00
Andy Scherzinger
d293cd50ec
Merge pull request #1990 from nextcloud/comradekingu-patch-1
Spelling: Synced, config, copylefted, (4.4)
2018-01-22 17:12:34 +01:00
Allan Nordhøy
2c07590717
Contactlist user icon → User icon for contact list 2018-01-22 17:01:20 +01:00
Allan Nordhøy
8b861f5efd
sync, folder, mobile freedom, A - Z 2018-01-22 17:01:20 +01:00
Allan Nordhøy
7dd747f1c1
Spelling: Admin, sync, filename, make note 2018-01-22 17:01:20 +01:00
Allan Nordhøy
e4bc267209
Spelling: Synced, config, copylefted, (4.4) 2018-01-22 17:01:17 +01:00
Andy Scherzinger
943fd8a1ac
Merge pull request #2024 from nextcloud/preventCopyMove
Prevent copy/move into encrypted folder
2018-01-22 17:00:52 +01:00
tobiaskaminsky
e3efbb1770
prevent copy/move into encrypted folder --> M2
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-22 12:39:31 +01:00
Nextcloud bot
0e2b4109cc
[tx-robot] updated from transifex 2018-01-22 01:39:28 +00:00
Nextcloud bot
110086217b
[tx-robot] updated from transifex 2018-01-21 01:39:58 +00:00
Tobias Kaminsky
d612f90ccb daily dev 20180121 2018-01-21 00:58:05 +01:00
Andy Scherzinger
f4350da349
Merge pull request #2009 from nextcloud/getIdForE2E
Use id instead of account name
2018-01-20 14:31:30 +01:00
Nextcloud bot
565b8af563
[tx-robot] updated from transifex 2018-01-20 01:40:02 +00:00
Tobias Kaminsky
4a3424285c daily dev 20180120 2018-01-20 01:04:32 +01:00
Andy Scherzinger
faeafb69fa
Merge pull request #2008 from nextcloud/sortingPreviewOrder
Obey sort order also on preview image slide
2018-01-19 14:46:54 +01:00
Andy Scherzinger
c9927cd7f2
Merge pull request #2004 from nextcloud/fixDuplicateColumn
Catch error on duplicate column
2018-01-19 14:46:37 +01:00
Andy Scherzinger
741503de06
Merge pull request #2001 from nextcloud/authOnOldNC
Auth: NPE
2018-01-19 14:46:22 +01:00
Andy Scherzinger
847fb45ea5
Merge pull request #2002 from nextcloud/NPEonActivityResult
NPE if activity is already closed
2018-01-19 14:46:04 +01:00
tobiaskaminsky
a259a3f84b
use id instead of account name
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-19 14:17:41 +01:00
tobiaskaminsky
2ff542520a
obey sort order also on preview image slide
remove obsolete code

Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-19 12:04:11 +01:00
tobiaskaminsky
f79f3f65e4
catch error on duplicate column
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-19 10:43:23 +01:00
Nextcloud bot
9bf81a02de
[tx-robot] updated from transifex 2018-01-19 08:46:06 +00:00
tobiaskaminsky
7a06cbce79
NPE if activity is already closed
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-19 09:18:33 +01:00
tobiaskaminsky
bc7f2b0f4e
fix NPE
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-19 08:51:51 +01:00