Commit graph

12778 commits

Author SHA1 Message Date
Andy Scherzinger
4ab17b5b7c
Merge pull request #3325 from nextcloud/codeFormatting
Export code style
2019-03-22 08:38:06 +01:00
Andy Scherzinger
5dc3faae90
Merge pull request #3768 from nextcloud/furtherHardening
further hardening of SSO
2019-03-22 08:32:30 +01:00
Tobias Kaminsky
32cad19a56
Merge pull request #3758 from nextcloud/ezaquarii/integrate-dagger-2
Integrate Dagger 2
2019-03-22 08:08:40 +01:00
tobiasKaminsky
65d8129971
removed two not-needed initializations for appPreferences
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-22 07:50:15 +01:00
nextcloud-android-bot
719012ff81
Drone: update FindBugs results to reflect reduced error/warning count [skip ci]
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2019-03-22 07:50:15 +01:00
Chris Narkiewicz
8fbe2ee38e
Integrate Dagger 2
Closes #3751

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-22 07:50:15 +01:00
Tobias Kaminsky
d26d56a853
Merge pull request #3778 from nextcloud/NC12minimumSupported
Increase minimum server version
2019-03-22 07:42:49 +01:00
tobiasKaminsky
96f4ba8c5a
use N12 for minimum
warn if older than NC14

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-22 07:30:36 +01:00
Nextcloud bot
6be7876c05
[tx-robot] updated from transifex 2019-03-22 01:46:44 +00:00
Andy Scherzinger
e2ae6298f1
Merge pull request #3779 from nextcloud/uploadAfterFolderCreation
ReceiveExternalFiles: fix no upload possible after creation new folder
2019-03-21 19:39:06 +01:00
tobiasKaminsky
f99c7f2ddd
ReceiveExternalFiles:
- fix no upload possible after creation new folder
- obey canWrite permission for folder creation

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-21 15:04:39 +01:00
Tobias Kaminsky
dbad1aa991
Merge pull request #3777 from nextcloud/allowStateLoss
Allowing state loss when closing dialog while stopping activity
2019-03-21 10:39:16 +01:00
Andy Scherzinger
86abe6f18d
Fixes #3776 - allowing state loss when closing dialog while stopping activity
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-03-21 10:01:40 +01:00
Andy Scherzinger
4cb11f4ccf
Merge pull request #3772 from nextcloud/check500charLimit
Check for 500 char limit
2019-03-21 08:44:00 +01:00
Andy Scherzinger
60c7c3b24a
Merge pull request #3773 from nextcloud/consistentDelete
Also favorited files can be deleted locally
2019-03-21 07:52:33 +01:00
tobiasKaminsky
3de3904ea0
check for 500 char limit
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-21 07:44:22 +01:00
Tobias Kaminsky
2e9b2c9dd6 daily dev 20190321 2019-03-21 03:33:20 +01:00
Nextcloud bot
92eecb8069
[tx-robot] updated from transifex 2019-03-21 01:54:50 +00:00
tobiasKaminsky
fd45854d65
also favorited files can be deleted locally
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-20 11:00:32 +01:00
Andy Scherzinger
01acf6598d
Merge pull request #3121 from nextcloud/showNote
Show note
2019-03-20 10:01:33 +01:00
tobiasKaminsky
92bbcfb973
show notes on receiving shares
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-20 08:20:37 +01:00
Tobias Kaminsky
7c28461679 daily dev 20190320 2019-03-20 03:33:18 +01:00
Tobias Kaminsky
23c0ca50ef
Merge pull request #3756 from nextcloud/2806-lock
Rephrase term "Lock"
2019-03-19 08:45:18 +01:00
Tobias Kaminsky
bb6324ca97 daily dev 20190319 2019-03-19 03:34:16 +01:00
tobiasKaminsky
c52f9c842f
further hardening, include account name to check
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-18 12:33:40 +01:00
Andy Scherzinger
87328065b6
Merge pull request #3761 from nextcloud/dependabot/gradle/org.mockito-mockito-core-2.25.1
Bump mockito-core from 2.25.0 to 2.25.1
2019-03-18 08:57:33 +01:00
Andy Scherzinger
34863f87da
Merge pull request #3764 from nextcloud/changelog351
add 3.5.1 changelog
2019-03-18 08:56:24 +01:00
tobiasKaminsky
139ee24cea
add 3.5.1 changelog
removed old (unneeded) 3.2.1 changelog, as this is included in changelog.md

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-18 08:12:52 +01:00
dependabot[bot]
3c66847f14
Bump mockito-core from 2.25.0 to 2.25.1
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.25.0 to 2.25.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.25.0...v2.25.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18 02:14:13 +00:00
Nextcloud bot
3395ceb069
[tx-robot] updated from transifex 2019-03-18 01:52:10 +00:00
Nextcloud bot
a9e064d72b
[tx-robot] updated from transifex 2019-03-17 01:53:06 +00:00
Tobias Kaminsky
9c0f7b11b8 daily dev 20190316 2019-03-16 03:33:17 +01:00
Nextcloud bot
fbe49cbeb8
[tx-robot] updated from transifex 2019-03-16 01:52:40 +00:00
Andy Scherzinger
d427d3f0ff
Merge pull request #3749 from nextcloud/ezaquarii/refactor-legacy-migration-prefs
Move legacy free pref to AppPreferences
2019-03-15 20:01:57 +01:00
Daniel Bailey
b94c94d958 Rephrase term "Lock"
Rephrase term "Lock" to "App passcode" and update dialog to reflect
change.

Signed-off-by: Daniel Bailey <daniel.bailey@grappleIT.co.uk>
2019-03-15 11:47:19 +00:00
Nextcloud bot
6555842f3a
[tx-robot] updated from transifex 2019-03-15 01:55:11 +00:00
Andy Scherzinger
ac760261dd
add apply() to pref change
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-03-14 09:54:49 +01:00
Tobias Kaminsky
9f053b53e5 daily dev 20190314 2019-03-14 03:33:10 +01:00
Nextcloud bot
0f872f2218
[tx-robot] updated from transifex 2019-03-14 01:47:33 +00:00
Andy Scherzinger
d5cecd2c77
update due to constructor change
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-03-13 22:16:15 +01:00
Andy Scherzinger
8e1b864c4f
Merge pull request #3752 from nextcloud/generateThumbnailIfPreviewIsAvailable
Only use ifPreviewIsAvailable for thumbnail generation
2019-03-13 21:05:01 +01:00
tobiasKaminsky
c0ef6cc003
only use ifPreviewIsAvailable for thumbnail generation
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-13 20:51:29 +01:00
Chris Narkiewicz
ee99611546
Move legacy free pref to AppPreferences
Finally, the beast is dead...

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-13 17:49:16 +00:00
Andy Scherzinger
77ccba1ada
Merge pull request #3735 from nextcloud/refactor-push-token-preference
Move push token preference to AppPreferences
2019-03-13 16:22:21 +01:00
Tobias Kaminsky
b5931a385f daily dev 20190313 2019-03-13 03:33:13 +01:00
Nextcloud bot
b85f43552a
[tx-robot] updated from transifex 2019-03-13 01:47:29 +00:00
Andy Scherzinger
c1fe45749e
Merge pull request #3740 from nextcloud/ezaquarii/refactor-lock-prefs
Move lock prefs to AppPreferences
2019-03-12 22:16:54 +01:00
Chris Narkiewicz
1a7d6012f9
Move lock prefs to AppPreferences
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-12 18:54:04 +00:00
Chris Narkiewicz
293dae52d2 Move push token preference to AppPreferences
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-12 15:42:39 +00:00
Andy Scherzinger
31d7639d3b
Merge pull request #3736 from nextcloud/refactor-reinit-keys-preference
Move re-init keys pref to AppPreferences
2019-03-12 09:35:50 +01:00