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
Nextcloud bot
62b5c74d46
[tx-robot] updated from transifex
2018-01-19 01:39:56 +00:00
Tobias Kaminsky
9b9914b2ed
daily dev 20180119
2018-01-19 01:09:58 +01:00
Andy Scherzinger
1127b43ca8
Merge pull request #1994 from nextcloud/pullapprove
...
Pullapprove: label
2018-01-18 22:50:45 +01:00
Tobias Kaminsky
7adb159984
Pullapprove: label
...
Changes label.
https://docs.pullapprove.com/groups/users/
> The GitHub users who are in this group. Case-insensitive.
So I do not get why pullapprove currently misbehaves.
2018-01-18 22:28:03 +01:00
Andy Scherzinger
d2a954b29b
Update build.gradle
2018-01-18 22:25:25 +01:00
Andy Scherzinger
c6a4bc3b24
Merge pull request #1977 from nextcloud/hardenPreviewAdapter
...
Hardening preview adapter for null files
2018-01-18 21:45:22 +01:00
AndyScherzinger
02a67c6f94
bump uiautomator
2018-01-18 21:37:55 +01:00
AndyScherzinger
336c1705b1
codacy: organize imports
2018-01-18 21:28:54 +01:00
AndyScherzinger
2d79a37b9f
added newline
2018-01-18 21:27:48 +01:00
AndyScherzinger
fdd0431beb
center image/text
2018-01-18 21:27:48 +01:00
tobiaskaminsky
5d30d83e67
Hardening preview adapter for null files
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 21:27:47 +01:00
Andy Scherzinger
61c6a37acb
Merge pull request #1986 from nextcloud/NPEonFilename
...
No path magic, but simply use parent id
2018-01-18 21:27:15 +01:00
Andy Scherzinger
8933a065d6
Merge pull request #1988 from nextcloud/npeOnGetActivity
...
use provide activity instead of calling getActivity, which might be null
2018-01-18 21:26:49 +01:00
Andy Scherzinger
7c7ee7aa36
Merge pull request #1983 from nextcloud/snackbar
...
Resized images: snackbar fix
2018-01-18 21:25:56 +01:00
Andy Scherzinger
60c416ea26
Merge pull request #1993 from nextcloud/intentNPE
...
Intent can be null if service is restarted
2018-01-18 21:24:58 +01:00
Andy Scherzinger
12f2be740c
Merge pull request #1978 from nextcloud/hardenNotificationManager
...
harden notificationManager
2018-01-18 21:24:16 +01:00
Andy Scherzinger
fb622ea6b5
Merge pull request #1997 from nextcloud/walledException
...
Internet walled: catch any exception
2018-01-18 21:11:36 +01:00
Andy Scherzinger
e21429a557
Merge pull request #1985 from nextcloud/drawerLoad
...
Fix NPE in external link icon loading
2018-01-18 21:07:33 +01:00
Andy Scherzinger
bf53f74025
Merge pull request #1981 from nextcloud/SyncFolderNPE
...
Avoid NPE
2018-01-18 21:06:54 +01:00
Andy Scherzinger
f54f114d9d
Merge pull request #1995 from nextcloud/shareButton
...
Make drawable mutable
2018-01-18 21:05:43 +01:00
Andy Scherzinger
6504145638
Merge pull request #1980 from nextcloud/retryFailedInThread
...
Retry upload in thread
2018-01-18 15:57:02 +01:00
tobiaskaminsky
b71c302db8
catch any exception
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 13:56:49 +01:00
tobiaskaminsky
252bc8cbd6
make drawable mutable
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 12:07:16 +01:00
tobiaskaminsky
948f3bd2f2
try to instantiate again
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:28:59 +01:00
tobiaskaminsky
36e8ad636a
harden notificationManager
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:28:59 +01:00
tobiaskaminsky
3145260054
also fix #1976
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:07:00 +01:00
tobiaskaminsky
2239730cb5
fix NPE in external link icon loading
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 09:07:00 +01:00
