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
tobiaskaminsky
d7cfbffe34
replace text filed
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-22 22:52:38 +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
tobiasKaminsky
fdc9abcd34
remove modified flavor
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-22 17:33:28 +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
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
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
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
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
tobiaskaminsky
cab4f6a9a8
Intent can be null if service is restarted
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-18 08:33:16 +01:00
Nextcloud bot
795f0451b5
[tx-robot] updated from transifex
2018-01-18 01:39:55 +00:00
tobiaskaminsky
3d3fbe557a
use provide activity instead of calling getActivity, which might be null.
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 15:23:26 +01:00
tobiaskaminsky
55df66377f
no path magic, but simply use parent id
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 15:07:58 +01:00
tobiaskaminsky
3eb99c65c5
try to avoid Exception on dismissDialog
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 14:32:17 +01:00
tobiaskaminsky
cff3b455c0
Snackbar fix IAE
...
download only if activity exists
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 14:08:06 +01:00
tobiaskaminsky
e9f352c27c
avoid npe
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 13:22:43 +01:00
tobiaskaminsky
fef6d38c40
retry upload in thread
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 13:05:54 +01:00
tobiaskaminsky
b8e5b8c4bf
fix DB for dev version
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 08:17:16 +01:00
Nextcloud bot
43675d9880
[tx-robot] updated from transifex
2018-01-17 06:09:03 +00:00
tobiaskaminsky
e054fbcb83
replace … with … to make it clearer for translators
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-17 07:03:51 +01:00
Nextcloud bot
7cc57d2e45
[tx-robot] updated from transifex
2018-01-17 01:40:40 +00:00
tobiasKaminsky
3753832a9a
remove 200 features from whats new
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-16 11:10:36 +01:00
Nextcloud bot
5522b0b82e
[tx-robot] updated from transifex
2018-01-16 01:42:35 +00:00
tobiasKaminsky
59fafc7b3d
function is private
...
fix modified, but will soon be removed
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 13:24:07 +01:00
tobiasKaminsky
88498e4071
use copy & delete instead of move
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 12:40:15 +01:00
Mario Danic
1c8d46f9ff
Revert change
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:33 +01:00
Mario Danic
f626f58378
Attempt to fix moves
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:33 +01:00
tobiaskaminsky
45f7cb1cc7
linebreaks
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 11:23:32 +01:00
Mario Danic
66711f215c
Fix code review issues
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:32 +01:00
Mario Danic
4c6a98d8af
Add new line
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:32 +01:00
Mario Danic
ee7d4ed56c
Implement keys migration
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:32 +01:00
Mario Danic
d56f53bb11
Fix uploads
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:31 +01:00
Mario Danic
845e85fb24
Most improvements
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-15 11:23:31 +01:00
tobiasKaminsky
c1fe52bbf8
Detect top of encryption folders
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 10:45:43 +01:00
tobiaskaminsky
2e4fcd3f39
add support for slightly modified nc13 background (bigger dots)
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 09:56:00 +01:00
tobiasKaminsky
fab57d271e
search only folders when copy/move
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 09:06:19 +01:00
tobiaskaminsky
157afd9d61
fix #1800
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 09:06:19 +01:00
tobiaskaminsky
614d78ba58
refined annotations
...
added one more annotation
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-15 08:40:54 +01:00
tobiasKaminsky
08c33b83c4
annotate via custom annotation
2018-01-15 08:40:54 +01:00
tobiasKaminsky
d16ebf6e9d
fix missing conversion
2018-01-15 08:40:54 +01:00
tobiasKaminsky
c4cee26b1f
trying to first show old one, but asyncDrawable is not working
2018-01-15 08:40:53 +01:00
tobiasKaminsky
3a1c1c904b
Use ETag for avatars
2018-01-15 08:40:53 +01:00
tobiasKaminsky
eef69ea4ce
change crc32 to v28
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:01 +01:00
tobiasKaminsky
f8ed3750a5
remove unused ressources
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
756eddb3a7
fix due to rebase
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
1167b82adb
moved methods
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
fc7b4f789c
enable subfolder
...
check if in subfolder of encrypted folder
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
a9e558160f
remove obsolete string
...
fix showing wrong string
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:12:00 +01:00
tobiasKaminsky
48f991663d
fix #1938
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
cfd24f306d
remove duplicated upgrade
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
8038791820
changes due to to rebase
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
b52197d8ce
extract RSA/AES to static string
...
make final
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
d5c5fb5933
new line
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
6043767343
replace printStacktrace() with Log_OC
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
3307d52dfb
remove printStacktrace()
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:59 +01:00
tobiasKaminsky
3a8b59a0c1
return RemoteOperationResult on error
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
a6eae2396e
move public method up, add doc
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
b82cf3e167
new line
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
311656b0a1
delete stale file
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
385306e45e
make FolderMetadata access private and use getter/setter
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
29bcd8cd51
re-enable tests
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
dba3a33a49
new line
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
16080f8d05
re-add: always use new key / iv on upload
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:58 +01:00
tobiasKaminsky
3c2a01f7bc
disable logger
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:57 +01:00
tobiasKaminsky
c5883f8305
make text selectable
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-15 08:11:57 +01:00
tobiaskaminsky
b8d7922e0a
also lower case
2018-01-15 08:11:57 +01:00
tobiaskaminsky
373b999806
fix potential NPE
2018-01-15 08:11:57 +01:00
tobiaskaminsky
21a04b1bfe
delete local keys on account removal
2018-01-15 08:11:57 +01:00
tobiaskaminsky
128f3c97c8
ignore whitespaces in password
2018-01-15 08:11:57 +01:00
tobiaskaminsky
64221ece39
use new user agent
2018-01-15 08:11:57 +01:00
tobiaskaminsky
bba88d48de
enable logger, disable prior merge
2018-01-15 08:11:56 +01:00
tobiaskaminsky
1fe5c99d87
add cancel button
2018-01-15 08:11:56 +01:00
tobiaskaminsky
54ea7d9bcf
use nextcloud user agent for E2e calls
2018-01-15 08:11:56 +01:00
tobiaskaminsky
f3c3e1ca80
extract string and reword
2018-01-15 08:11:56 +01:00
tobiaskaminsky
debd89ed93
show info that mnemonic needs to be written down
2018-01-15 08:11:56 +01:00
tobiasKaminsky
d52baebb94
merge
2018-01-15 08:11:56 +01:00
tobiasKaminsky
21fd05af8c
codacy
2018-01-15 08:11:55 +01:00
tobiasKaminsky
9a7d59a1af
merge
2018-01-15 08:11:55 +01:00
tobiasKaminsky
17b1088ced
description, remove todo, suppress lint warning
2018-01-15 08:11:55 +01:00
tobiasKaminsky
917189f3ca
append salt to private key
2018-01-15 08:11:55 +01:00
tobiasKaminsky
d6b9f7e54b
immediately store folder token
2018-01-15 08:11:55 +01:00
tobiasKaminsky
9996753032
rebase
2018-01-15 08:11:55 +01:00
tobiasKaminsky
d06ef53659
change iv/key handling
2018-01-15 08:11:54 +01:00
tobiasKaminsky
41c602193a
remove EncryptionTest as it is now part of EncryptionIT
2018-01-15 08:11:54 +01:00
tobiasKaminsky
1293217da6
- rebased -> changed db numbers
...
- deleted old file
- add proper resume on folder lock
2018-01-15 08:11:54 +01:00
tobiasKaminsky
4e6c886cbb
store & re-use token for retry of failed encrypted upload
2018-01-15 08:11:54 +01:00
tobiasKaminsky
e2ed7a6a1a
versionCode/versionName
2018-01-15 08:11:54 +01:00
tobiasKaminsky
0abe4efd37
codacy
2018-01-15 08:11:54 +01:00
tobiasKaminsky
5637d7d366
changes due to rebase
2018-01-15 08:11:54 +01:00
tobiasKaminsky
71304fe236
better random
2018-01-15 08:11:53 +01:00
tobiasKaminsky
b838210720
wip
2018-01-15 08:11:53 +01:00
tobiasKaminsky
2ca5727975
split up large method - part 1
2018-01-15 08:11:53 +01:00
Jan-Christoph Borchardt
45bcdebd9d
First release of E2E
2018-01-15 08:11:53 +01:00
AndyScherzinger
eb667c9831
bump version to 2.0.0RC9
2018-01-15 08:11:53 +01:00
tobiasKaminsky
9b1b89cd3c
always use new key/iv
...
cleanup
2018-01-15 08:11:53 +01:00
tobiasKaminsky
e1df7d32cc
fix codacy
2018-01-15 08:11:53 +01:00
Jan-Christoph Borchardt
6caf0834ce
First release of E2E
2018-01-15 08:11:53 +01:00
tobiasKaminsky
f175706ab0
immediately show correct infos about uploaded file
2018-01-15 08:11:52 +01:00
tobiasKaminsky
22701416bf
change iv/key handling
2018-01-15 08:11:52 +01:00
tobiasKaminsky
7985e96f64
remove EncryptionTest as it is now part of EncryptionIT
2018-01-15 08:11:52 +01:00
tobiasKaminsky
020333affc
- rebased -> changed db numbers
...
- deleted old file
- add proper resume on folder lock
2018-01-15 08:11:52 +01:00
tobiasKaminsky
b3f0fd3c17
correct appending of (2), (3), and so on
2018-01-15 08:11:52 +01:00
tobiasKaminsky
ade5bfe226
store & re-use token for retry of failed encrypted upload
2018-01-15 08:11:52 +01:00
tobiasKaminsky
7bb8a28bd6
if image is encrypted -> download file as no resized image is possible
2018-01-15 08:11:52 +01:00
tobiasKaminsky
8361848583
versionCode/versionName
2018-01-15 08:11:51 +01:00
tobiasKaminsky
cca39f888a
codacy
2018-01-15 08:11:51 +01:00
tobiasKaminsky
ebb4ffc489
changes due to rebase
2018-01-15 08:11:51 +01:00
tobiasKaminsky
14e66fed69
use only CN
2018-01-15 08:11:51 +01:00
tobiasKaminsky
042d0ea23a
better random
2018-01-15 08:11:51 +01:00
tobiasKaminsky
cd0bebf45e
wip
2018-01-15 08:11:51 +01:00
tobiasKaminsky
590e617c8a
split up large method - part 1
2018-01-15 08:11:51 +01:00
Jan-Christoph Borchardt
34f198cc48
First release of E2E
2018-01-15 08:11:50 +01:00
AndyScherzinger
e87bf739cf
bump version to 2.0.0RC9
2018-01-15 08:11:50 +01:00
tobiaskaminsky
ff7cf4ad12
Set CN to userID
2018-01-15 08:11:50 +01:00
tobiasKaminsky
50b56bc09f
use pem for private key
2018-01-15 08:11:50 +01:00
ardevd
c534d603c7
e2e: Cleaned up cipher transformation arguments.
...
- Define commonly used transformation specs in constants.
2018-01-15 08:11:50 +01:00
tobiasKaminsky
275ec70658
codacy: Avoid reassigning parameters such as 'remotePath'
...
Switch statements should have a default label
2018-01-15 08:11:50 +01:00
tobiasKaminsky
58b7f33a48
codacy: assertTrue -> assertFalse
...
use specific exceptions
add missing break
2018-01-15 08:11:50 +01:00
tobiasKaminsky
fab1f4b23e
always use new key/iv
...
cleanup
2018-01-15 08:11:50 +01:00
tobiasKaminsky
9848c1dc28
setup: in case of error show message and let user retry
2018-01-15 08:11:49 +01:00
tobiasKaminsky
3702bdfe60
fix codacy: enhance IT
2018-01-15 08:11:49 +01:00
tobiasKaminsky
febe6b60c0
fix codacy
2018-01-15 08:11:49 +01:00
Jan-Christoph Borchardt
b6e84b66fd
First release of E2E
2018-01-15 08:11:49 +01:00
Nextcloud bot
de2e7942f1
[tx-robot] updated from transifex
2018-01-15 01:39:52 +00:00
Nextcloud bot
a853724015
[tx-robot] updated from transifex
2018-01-14 01:40:24 +00:00
tobiaskaminsky
42c2d58a63
remove unused resource
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-13 09:58:59 +01:00
Nextcloud bot
c63abd886d
[tx-robot] updated from transifex
2018-01-13 01:39:00 +00:00
Mario Đanić
ba589e3a7e
Merge pull request #1946 from nextcloud/fix-1837
...
Add notifications on sync failure
2018-01-12 18:05:05 +01:00
tobiasKaminsky
470425cada
revert package visibility
2018-01-12 08:31:03 +01:00
tobiaskaminsky
cc0130aac0
prevent NPE
...
code enhancement
2018-01-12 08:30:50 +01:00
Nextcloud bot
83cfe5389f
[tx-robot] updated from transifex
2018-01-12 01:41:37 +00:00
Mario Danic
79fcaec2a6
Fixed all complaints
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-11 15:54:01 +01:00
tobiaskaminsky
d434674315
use interface
...
fix #1918
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-11 15:09:16 +01:00
tobiaskaminsky
110d4ae49b
if nextPageURL is empty/null do not load any more items, otherwise you get the first items again
...
if pageURL is null (when manually refreshing), then clear list
2018-01-11 13:51:51 +01:00
tobiasKaminsky
77e9e66a9c
add content description
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-11 12:16:55 +01:00
Bartosz Przybylski
f87bd26b92
Fix accessibility by setting content description
2018-01-11 12:16:55 +01:00
Bartosz Przybylski
2578f4a125
More member access modification and rearrange
2018-01-11 12:16:55 +01:00
Bartosz Przybylski
e483fb8f68
More access modifiers fixes
2018-01-11 12:16:55 +01:00
Bartosz Przybylski
a43eadba02
Fix semi absurd codacy bot issues
2018-01-11 12:16:54 +01:00
Bartosz Przybylski
200d264424
Remove unused id and use standard margin
2018-01-11 12:16:54 +01:00
Bartosz Przybylski
23162c36bf
Remove containers in user info
...
Replace designated containers with Recycler And adapter.
2018-01-11 12:16:54 +01:00
Tobias Kaminsky
361b829070
move to headline
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-11 12:16:54 +01:00
Tobias Kaminsky
1d822ca658
update icon & text
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-11 12:16:54 +01:00
tobiaskaminsky
44c1c725c0
also show info on rotation
2018-01-11 12:16:54 +01:00
tobiaskaminsky
2a39e00f3b
show info if no userinfo is available
2018-01-11 12:16:54 +01:00
Mario Danic
129f44325d
Reformat
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-11 12:07:01 +01:00
Mario Danic
b64cfbde70
Add notifications on sync failure
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-11 12:07:01 +01:00
tobiasKaminsky
5bf0075498
ellipsis with spaces
2018-01-11 11:41:47 +01:00
tobiasKaminsky
7e1cdda31a
tint correctly on very first login
2018-01-11 11:04:15 +01:00
Mario Danic
5f94d65441
Use write contacts & read contacts
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-11 10:31:31 +01:00
Mario Danic
84477705bd
Fix external storage permission
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-11 10:31:31 +01:00
Nextcloud bot
276b0301eb
[tx-robot] updated from transifex
2018-01-11 01:41:47 +00:00
tobiaskaminsky
964faa54ec
add max SDK to permissions
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-10 10:27:35 +01:00
tobiasKaminsky
b0586ee9da
show snackbar longer
2018-01-10 07:40:59 +01:00
tobiasKaminsky
462d9d90cc
- move check count from shared pref to arbitrary provider
...
- use it also for checking new dev version (if enabled)
2018-01-10 07:40:59 +01:00
Nextcloud bot
859cd05cd5
[tx-robot] updated from transifex
2018-01-10 01:41:24 +00:00
tobiasKaminsky
3c8f1fd081
remove unused import
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-09 11:59:37 +01:00
Victor Nidens
4193dd04ab
Restored Sharing menu for reshared file with warning if resharing isn't allowed
2018-01-09 11:08:40 +01:00
tobiasKaminsky
e505421db9
Implicitly using the default locale is a common source of bugs
...
internal: Locale.ROOT
otherwise Locale.getDefault()
2018-01-09 10:51:22 +01:00
Bartosz Przybylski
a3db144ecc
Crop center the image in account info
...
Because we need to correctly crop and center the image we can no longer support snapping of toolbar in appbar. Since AppBarLayout is a subclass of LinearLayout and doesn't look deeper into subview hierachy for snapping children, thus it is better not to support it.
Also instead of using ScrollView and pad it with some weird magic numbers, use NestedScrollView class which is made to cooperate with AppBarLayout.
2018-01-09 10:30:20 +01:00
Bartosz Przybylski
0e1dc14016
Fixes #1903 : Fix image scaling in navigation drawer
...
* Insted of setting a background in ViewGroup add a ImageView inside it, stretch it, set cropping scaleType and then set a background image downloaded from server.
* CenterCrop will scale the image to fill the View, if needed image will be cropped in the center but the aspect ration will be kept
* Cleanup code to use more general types instead of direct layout type, previously enforcing LinearLayout wasn't using anything special about this class.
2018-01-09 10:30:20 +01:00
tobiasKaminsky
213646cb41
prevent account NPE
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-09 09:52:29 +01:00
tobiaskaminsky
fe14e66043
remove unneeded fully qualified name
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-09 09:05:53 +01:00
tobiaskaminsky
60fae3c502
code enhancements
2018-01-09 09:05:53 +01:00
tobiaskaminsky
e288507ce8
sorting in "receive external files"
2018-01-09 09:05:52 +01:00
Sven R. Kunze
1a86ba7eac
refactoring folder preferences
...
- based getFolderPreference and setFolderPreference on ArbitraryDataProvider
- converted Boolean-based "is grid preferred" to String-based folder layout preference
Signed-off-by: Sven R. Kunze <srkunze@mail.de>
2018-01-09 09:05:52 +01:00
Sven R. Kunze
0105b19e79
finished folder-based sort order
...
- base getSortOrder on getFolderPreference
- base setSortOrder on setFolderPreference
- added folder parameter to all call-sites of getSortOrder and getSortOrder
2018-01-09 09:05:52 +01:00
Sven R. Kunze
4b5e4b96a9
defined new way of addressing and storing sort orders
...
- defined string constants for all sort orders
- defined new SortOrder classes to handle sorting
- store/retrieve string constant in/from preferences
- cleaned up related code
2018-01-09 09:05:52 +01:00
Sven R. Kunze
830f909e8c
cleaned up OCFileListFragment preference management
...
- base isGridViewPreferred on getIsGridViewPreferred
- base setGridAsPreferred and setListAsPreferred on setIsGridViewPreferred
- moved GRID_IS_PREFERED_PREFERENCE to PreferenceManager
- moved KEY_FAB_EVER_CLICKED to PreferenceManager
2018-01-09 09:05:52 +01:00
Sven R. Kunze
0ef8995f5f
added folder-recognizing preference helpers
...
- added getFolderPreference
- added setFolderPreference
2018-01-09 09:05:52 +01:00
tobiaskaminsky
2b0dd3209c
use cancelContactBackupJobForAccount to disable all backup jobs
...
switched if branches, according to findBugs
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-09 08:37:37 +01:00
tobiasKaminsky
2655d6f87b
code enhancement
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-09 08:37:37 +01:00
tobiasKaminsky
f1731f889d
on account removal also disable contacts backup job
...
remove unneeded function
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-09 08:37:36 +01:00
Tobias Kaminsky
4914b11bc1
Merge branch 'master' into contactsBackupNPE
2018-01-09 08:19:57 +01:00
Tobias Kaminsky
a1e0173e9c
Merge branch 'master' into userinfoButterknife
2018-01-09 08:12:42 +01:00
Nextcloud bot
ae6c33c9fa
[tx-robot] updated from transifex
2018-01-09 01:40:56 +00:00
tobiasKaminsky
62f74a8ff5
do not use id twice
...
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-08 15:47:44 +01:00
tobiaskaminsky
e6d597e172
code formatting
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-08 14:23:14 +01:00
tobiaskaminsky
9733b886af
fix potential NPEs
...
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-08 14:21:11 +01:00
tobiaskaminsky
138e35c512
add roundIcon to Manifest
2018-01-08 09:22:09 +01:00
AndyScherzinger
84d40f0421
fix compile error
2018-01-08 09:22:09 +01:00
AndyScherzinger
487407fb49
codacy: combine if blocks
2018-01-08 09:22:09 +01:00
AndyScherzinger
9111fa0555
use vector xml for launcher icon background
2018-01-08 09:22:09 +01:00
AndyScherzinger
9d029de12e
fix folder name -v26
2018-01-08 09:22:08 +01:00
AndyScherzinger
505306cbf5
try moving background to v26 directory for lint
2018-01-08 09:22:08 +01:00
AndyScherzinger
8f49c74a2c
cleanup dev verison parts
2018-01-08 09:22:08 +01:00
AndyScherzinger
0bdf9ffa51
remove replace call (originally introduced for round launcher icon)
2018-01-08 09:22:08 +01:00
AndyScherzinger
346c5ca9a3
move vector launcher foreground file to v26 directory
2018-01-08 09:22:08 +01:00
AndyScherzinger
4b87a0d109
properly enforce round launcher icon
2018-01-08 09:22:08 +01:00
tobiasKaminsky
5b6f0354f6
extract channel creation
2018-01-08 09:22:08 +01:00
AndyScherzinger
94823e576d
manifest
2018-01-08 09:22:08 +01:00
AndyScherzinger
c6016b9a0a
fix build for modified
2018-01-08 09:22:07 +01:00
AndyScherzinger
95f2b488f9
fix positioning of Nc logo within icons
2018-01-08 09:22:07 +01:00
AndyScherzinger
dbf753cce3
enforce round launcher icon on pre Oreo devices
2018-01-08 09:22:07 +01:00
AndyScherzinger
0137ec8ef6
reworked Nc13 style launcher icon work
2018-01-08 09:22:07 +01:00
AndyScherzinger
a5eb437a30
linebreaks added
2018-01-08 09:22:06 +01:00
AndyScherzinger
80a2f76f51
round & adaptive icon added
2018-01-08 09:22:06 +01:00
tobiasKaminsky
4ea1a907f4
add notification channel support, with only one initially set-up
2018-01-08 09:22:06 +01:00
tobiasKaminsky
1da1f11ea5
change sdk versions
2018-01-08 09:21:51 +01:00
Nextcloud bot
583cc6cdd6
[tx-robot] updated from transifex
2018-01-08 01:41:16 +00:00
Mario Đanić
24cd4fce11
Merge pull request #1923 from nextcloud/fix-1911
...
Fix #1911
2018-01-07 20:29:29 +01:00
Mario Danic
7cce49af2a
Remove extra parentheses
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-07 20:24:59 +01:00
Nextcloud bot
a4b3ddf9d8
[tx-robot] updated from transifex
2018-01-07 01:40:29 +00:00
Nextcloud bot
fbd97a9439
[tx-robot] updated from transifex
2018-01-06 01:40:46 +00:00
Nextcloud bot
ee811e2749
[tx-robot] updated from transifex
2018-01-05 14:58:54 +00:00
Tobias Kaminsky
9a9ea0af85
Merge branch 'master' into uploadsStorageManagerNPE
2018-01-05 13:11:30 +01:00
Tobias Kaminsky
7a997c0544
Merge branch 'master' into notificationManager
2018-01-05 11:39:33 +01:00
Tobias Kaminsky
38d6706ea6
Merge branch 'master' into NotificationActivity
2018-01-05 10:58:34 +01:00
Tobias Kaminsky
b7370297e7
Merge branch 'master' into mFileNeverNull
2018-01-05 10:41:26 +01:00
Tobias Kaminsky
0b22058db3
Merge branch 'master' into screenshots
2018-01-05 10:29:23 +01:00
Tobias Kaminsky
b41962da42
Merge branch 'master' into screenshots
2018-01-05 09:15:10 +01:00
tobiasKaminsky
f8efb31a27
code formatting
2018-01-05 08:48:53 +01:00
tobiasKaminsky
8d6e32b43d
extraText can be null
...
getWindow can be null
action bar can be null
getType() or getAction on intent can be null
code enhancements
2018-01-05 08:48:53 +01:00
Nextcloud bot
cfa9bfe700
[tx-robot] updated from transifex
2018-01-05 01:41:24 +00:00
Mario Danic
8a865ee638
Fix 1911
...
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-04 22:22:30 +01:00
Tobias Kaminsky
eb0028d2cf
Merge branch 'master' into autoUploadWithoutPermission
2018-01-04 12:18:46 +01:00
Nextcloud bot
a86c3bfa5b
[tx-robot] updated from transifex
2018-01-04 11:15:53 +00:00
Tobias Kaminsky
0863719f46
Merge branch 'master' into fdroidMetadata
2018-01-04 10:52:39 +01:00
Tobias Kaminsky
d341b89eef
Update strings.xml
2018-01-04 10:39:41 +01:00
Nextcloud bot
7de5242a26
[tx-robot] updated from transifex
2018-01-04 01:33:44 +00:00
tobiasKaminsky
37ce53db5c
minor code cleanup
2018-01-03 10:12:10 +01:00
tobiasKaminsky
a6474c32aa
make auto upload safe with no storage permission
2018-01-03 10:06:17 +01:00
tobiasKaminsky
c3a0a38db1
account possible can be null
2018-01-03 08:38:54 +01:00
tobiasKaminsky
d5f0aa7db1
account possible can be null
2018-01-03 08:35:32 +01:00
Nextcloud bot
ec246eac59
[tx-robot] updated from transifex
2018-01-03 01:31:19 +00:00
tobiasKaminsky
576fb79f67
get notification manager if it does not exist
2018-01-02 15:05:51 +01:00
tobiasKaminsky
b4b2500b75
mFiles is never null
2018-01-02 13:07:33 +01:00
tobiaskaminsky
7d8633a0bc
prevent NPE
2018-01-02 11:51:03 +01:00
Tobias Kaminsky
8cf83f0a02
Update ScreenshotsIT.java
...
new line
2018-01-02 09:37:37 +01:00
tobiasKaminsky
0a577b9fd6
fix lint
2018-01-02 09:37:37 +01:00
tobiasKaminsky
f6c7ccfedc
add mocked devices for phone and tablet
2018-01-02 09:37:37 +01:00
tobiasKaminsky
ba18ef206f
add davdroid screenshot
...
add translation
2018-01-02 09:37:31 +01:00
tobiaskaminsky
5b754ae51d
fix things due to CR and codacy
2018-01-02 09:37:21 +01:00
tobiaskaminsky
36253ccec2
Screenshots with fastlane screengrab
2018-01-02 09:37:20 +01:00
Nextcloud bot
ad6509bdb5
[tx-robot] updated from transifex
2018-01-02 07:40:51 +00:00
Nextcloud bot
6f27269f47
[tx-robot] updated from transifex
2018-01-02 01:31:44 +00:00
Nextcloud bot
deada3f594
[tx-robot] updated from transifex
2018-01-01 01:31:26 +00:00
Nextcloud bot
df15f85cfe
[tx-robot] updated from transifex
2017-12-31 01:32:03 +00:00
Nextcloud bot
e5f8ef7df0
[tx-robot] updated from transifex
2017-12-30 01:32:33 +00:00
tobiasKaminsky
0d9386a52d
rebas
2017-12-29 08:58:52 +01:00
tobiasKaminsky
33a8af0fca
resolve merge conflicts
2017-12-29 08:57:07 +01:00
tobiaskaminsky
2b793f3bb2
use new metadata locations for fdroid
2017-12-29 08:56:40 +01:00
tobiasKaminsky
1b200a5bad
versionDev as flavor
2017-12-29 08:56:40 +01:00
Nextcloud bot
56685d9b5a
[tx-robot] updated from transifex
2017-12-29 01:28:51 +00:00
Mario Đanić
3ebc31db17
Merge pull request #1792 from nextcloud/combineSendShare
...
Combine send share
2017-12-29 00:54:47 +01:00
Mario Đanić
df67ba4149
Merge pull request #1862 from nextcloud/lastRTL
...
Lint: last RTL
2017-12-29 00:53:06 +01:00
Mario Đanić
2fc82eef67
Merge pull request #1885 from nextcloud/fix-1877
...
Clicking checkbox image should also check list item
2017-12-29 00:52:45 +01:00
Mario Đanić
c4e6c3a172
Merge pull request #1883 from nextcloud/codacy
...
Fix further codacy issues
2017-12-29 00:52:23 +01:00
Mario Đanić
c11478c983
Merge pull request #1861 from nextcloud/unusedResources
...
Lint: remove unused resources
2017-12-29 00:52:08 +01:00
Nextcloud bot
95a1d69d39
[tx-robot] updated from transifex
2017-12-28 01:29:21 +00:00
tobiasKaminsky
b307c6b7cc
remove unused resources
2017-12-27 13:24:46 +01:00
tobiasKaminsky
0cd81c31b4
last RTL
2017-12-27 13:17:14 +01:00
AndyScherzinger
88df7842e5
fixes #1877 - click checkbox image should also check list item
2017-12-27 12:55:57 +01:00
AndyScherzinger
abcf14ec4a
fix lint: remove sdk<14 check
2017-12-27 12:53:48 +01:00
AndyScherzinger
73cba5519c
fixes after rebase
2017-12-27 12:53:48 +01:00
AndyScherzinger
ae24c3c534
fix some lint issues
2017-12-27 12:53:47 +01:00
AndyScherzinger
b8260646da
add content description to activity icon
2017-12-27 12:53:47 +01:00
AndyScherzinger
ab575359f6
remove unused translation
2017-12-27 12:53:46 +01:00
AndyScherzinger
c42f2d4d61
extract theming method
2017-12-27 12:53:46 +01:00
Tobias Kaminsky
adf12d2222
Update SendShareDialog.java
...
fix c&p mistake
2017-12-27 12:53:45 +01:00
AndyScherzinger
1d3c5421ca
extract logic into separate methods
2017-12-27 12:53:45 +01:00
AndyScherzinger
0d864eed96
uses dimens values
2017-12-27 12:53:44 +01:00
tobiaskaminsky
114f4c9e80
reformat
2017-12-27 12:53:44 +01:00
tobiaskaminsky
c023b932ca
rename tag
2017-12-27 12:53:43 +01:00
AndyScherzinger
89ac5a0843
optimized share layout
2017-12-27 12:53:42 +01:00
tobiaskaminsky
a199abb381
hide dialog if not needed
2017-12-27 12:53:42 +01:00
tobiaskaminsky
3a692e65f6
removed extra translation
2017-12-27 12:53:41 +01:00
tobiaskaminsky
12f837e205
- correctly tint white, black theme
...
- moved link image a bit to the right
2017-12-27 12:53:41 +01:00
tobiaskaminsky
e08049341c
Tint round buttons
2017-12-27 12:53:40 +01:00
AndyScherzinger
672c0a1509
circular background
2017-12-27 12:53:40 +01:00
tobiaskaminsky
3debd2f0f1
align both icon
2017-12-27 12:53:39 +01:00
tobiasKaminsky
2168e5a344
- make image & text clickable
...
- show snackbar correctly if resharing is not allowed, then also grey out image&text if not folder
2017-12-27 12:53:39 +01:00
tobiaskaminsky
dc2d7edc56
combine send/share
2017-12-27 12:53:35 +01:00
AndyScherzinger
31e2c4901b
codacy: Avoid empty catch blocks
2017-12-27 09:07:10 +01:00
AndyScherzinger
096ff43004
codacy: remove unused code, fix java warnings
2017-12-27 09:07:00 +01:00
tobiasKaminsky
e2c5bf4170
length is -1 (unknown) or 0 (null)
2017-12-27 07:54:58 +01:00
Nextcloud bot
f4707f5e20
[tx-robot] updated from transifex
2017-12-27 01:28:47 +00:00
Nextcloud bot
9311864157
[tx-robot] updated from transifex
2017-12-25 01:29:08 +00:00
Nextcloud bot
2d3f45d17c
[tx-robot] updated from transifex
2017-12-23 01:29:16 +00:00
Nextcloud bot
76c60064f3
[tx-robot] updated from transifex
2017-12-22 01:30:10 +00:00
tobiasKaminsky
1fa3bfbdba
mimetype lookup assumes to have lowercase mimetypes
2017-12-21 11:20:35 +01:00
Abhishek Tiwari
4a0ad491ec
Merge branch 'master' of https://github.com/nextcloud/android
2017-12-21 13:13:32 +05:30
Nextcloud bot
ca73d82c42
[tx-robot] updated from transifex
2017-12-21 01:29:04 +00:00
Abhishek Tiwari
4a09b3d9c5
Merge branch 'master' of https://github.com/nextcloud/android
2017-12-20 18:45:30 +05:30
Abhishek Tiwari
a8b1566264
changed resouce directory of values-en-rGB to value-b+en+001
2017-12-20 18:45:00 +05:30
Nextcloud bot
ab805b1888
[tx-robot] updated from transifex
2017-12-20 01:29:23 +00:00
Abhishek Tiwari
7eb148342f
renaming values-es-rUS to values-b+es+419
2017-12-19 16:31:34 +05:30
Nextcloud bot
c059ab7465
[tx-robot] updated from transifex
2017-12-19 09:31:47 +00:00
AndyScherzinger
1ccb8bebb8
fix Spanish translation directory name
2017-12-19 10:00:14 +01:00
Allan Nordhøy
2b249045e7
most recent, log out, reworked dev version strings
2017-12-19 05:01:21 +01:00
Nextcloud bot
b21f5a6700
[tx-robot] updated from transifex
2017-12-19 01:30:54 +00:00
tobiasKaminsky
8fe2b9b82c
moved spanish for 419/us to values-es-rUS
2017-12-18 07:52:45 +01:00
Nextcloud bot
2c12c901ee
[tx-robot] updated from transifex
2017-12-18 01:28:36 +00:00
Nextcloud bot
bf1b7caa46
[tx-robot] updated from transifex
2017-12-17 01:29:17 +00:00
Nextcloud bot
c0dd7bcbef
[tx-robot] updated from transifex
2017-12-15 11:41:50 +00:00
tobiaskaminsky
6c78627c3f
further rtl support
2017-12-13 08:06:43 +01:00
AndyScherzinger
3a7a82238e
fix cr comments and replace anonymous listeners with lambdas
2017-12-12 09:48:03 +01:00
AndyScherzinger
bc9eac9b43
run sync visualization on UI thread
2017-12-12 09:31:39 +01:00
AndyScherzinger
7d6e50f6a3
adapt refresh animation to standard animation for refresh of file lists within the app
2017-12-12 09:31:39 +01:00
AndyScherzinger
7d4669a71f
don't clear list when adding next page of activities to make it an endless scrolling list
2017-12-12 09:31:39 +01:00
Joas Schilling
e58042d6aa
Load more activities when reaching the end of the stream
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-12-12 09:31:30 +01:00
tobiaskaminsky
aed532d408
get rid of gallery API and use internal one
2017-12-11 23:03:45 +01:00
tobiaskaminsky
297c6024bc
- replace Toast with Snackbar
...
- remove not used code
2017-12-11 21:57:54 +01:00
tobiaskaminsky
e93eb51ffe
"set picture as" with resized images
2017-12-11 21:57:51 +01:00
tobiaskaminsky
acdd470c95
proper handling when switching to an account with disabled external links
2017-12-11 21:47:02 +01:00
Mario Đanić
f04220e6af
Merge pull request #1815 from nextcloud/oldLoginTimeout
...
revert timeout to 60s
2017-12-11 19:47:32 +01:00
Mario Đanić
ee5e2843d2
Merge pull request #1826 from nextcloud/shareViaLinkUseDisplayName
...
Share via link use display name
2017-12-11 19:46:25 +01:00
Mario Đanić
3e7f1fd68a
Merge pull request #1828 from nextcloud/devVersionChangelog
...
Change changelog for dev version to master commits as we do not have …
2017-12-11 19:45:47 +01:00
Mario Đanić
2f222f168e
Merge pull request #1847 from nextcloud/alwaysLint
...
always push lint results
2017-12-11 19:40:59 +01:00
tobiaskaminsky
e7ad1ddb4b
further hardening of Content Provider
2017-12-11 19:17:17 +01:00
tobiaskaminsky
3fab8fa913
change changelog for dev version to master commits as we do not have any special changelog anylonger
2017-12-11 19:04:47 +01:00
Mario Đanić
b11a77c44e
Merge pull request #1834 from nextcloud/sqlBugfix
...
File content provider: if selection and selectionArgs are null, let them pass
2017-12-11 16:27:25 +01:00
tobiasKaminsky
28579d5a0e
reduce one warning to have an updated master
2017-12-11 15:43:09 +01:00