Commit graph

12571 commits

Author SHA1 Message Date
Andy Scherzinger
02e98f25a5
Merge pull request #3733 from nextcloud/remove-dead-code-from-preference-manager
Remove dead code from preference manager
2019-03-11 14:42:35 +01:00
Andy Scherzinger
67eec757fb
Merge pull request #3731 from nextcloud/ezaquarii/fix-button-disabled-state-in-folder-sync-preferences-2
Fix button disabled state in folder sync preferences
2019-03-11 14:25:04 +01:00
Chris Narkiewicz
f87349d9c0
Remove dead code from preference manager
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-11 12:36:55 +00:00
Andy Scherzinger
38559be8fd
Merge pull request #3713 from nextcloud/ezaquarii/refactor-sort-order-preferences
Move sort order preferences to AppPreferences interface
2019-03-11 13:15:33 +01:00
tobiasKaminsky
d6fbe864a1
use primary color on primary button
swipe container without margin

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-11 12:00:44 +01:00
Nextcloud bot
1a5beb4328
[tx-robot] updated from transifex 2019-03-11 01:45:06 +00:00
Tobias Kaminsky
df8cfbe387 daily dev 20190310 2019-03-10 03:33:16 +01:00
Nextcloud bot
84c2dfb5e7
[tx-robot] updated from transifex 2019-03-10 01:47:13 +00:00
Chris Narkiewicz
e521d25d63
Move sort order preferences to AppPreferences interface
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-10 01:25:31 +00:00
Chris Narkiewicz
ef45b6f11d
Dim disabled Save button in custom folder sync prefs dialog
Fixes #3664

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-09 21:23:29 +00:00
Andy Scherzinger
215d51d170
Merge pull request #3730 from nextcloud/fix-npe-in-main-app-fix-storage-path
Fix uninitialized preferences in MainApp
2019-03-09 19:06:42 +01:00
Chris Narkiewicz
4429af9189
Fix uninitialized preferences in MainApp
Fixes #3728

Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-09 15:57:32 +00:00
Tobias Kaminsky
bde010b84b daily dev 20190309 2019-03-09 03:34:19 +01:00
Nextcloud bot
86eeff2843
[tx-robot] updated from transifex 2019-03-09 01:44:42 +00:00
Andy Scherzinger
d850108f6c
Merge pull request #3716 from nextcloud/ezaquarii/refactor-last-seen-preference
Move last seen version preference to AppPreferences interface
2019-03-08 21:08:34 +01:00
Chris Narkiewicz
f5b356cdf6
Move last seen version preference to AppPreferences interface
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-08 16:11:37 +00:00
Andy Scherzinger
62534afba7
Merge pull request #3725 from nextcloud/ssoDialog
make SSO dialog nicer
2019-03-08 13:24:21 +01:00
tobiasKaminsky
9667eb61a2
make SSO dialog nicer
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-08 11:16:39 +01:00
Tobias Kaminsky
5582a51520
Merge pull request #3719 from nextcloud/ezaquarii/refactor-auto-upload-preferences
Moved auto upload preferences to AppPreferences
2019-03-08 09:16:52 +01:00
Tobias Kaminsky
558fa2273a
Merge pull request #3717 from nextcloud/ezaquarii/refactor-lock-timestamp-preference
Move lock timestamp pref to AppPreferences
2019-03-08 09:14:32 +01:00
Tobias Kaminsky
6e9702ab1f daily dev 20190308 2019-03-08 03:34:16 +01:00
Nextcloud bot
4a7071562b
[tx-robot] updated from transifex 2019-03-08 01:46:36 +00:00
Chris Narkiewicz
44625a08e4
Move lock timestamp pref to AppPreferences
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-07 19:39:38 +00:00
Chris Narkiewicz
5a8f0f64a0
Moved auto upload preferences to AppPreferences
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-07 18:16:44 +00:00
Andy Scherzinger
63b057d7de
Merge pull request #3718 from nextcloud/ezaquarii/refactor-uploader-behavior-preference
Move uploader behavior pref to AppPreferences
2019-03-07 08:48:07 +01:00
Tobias Kaminsky
aef131e98c daily dev 20190307 2019-03-07 03:34:10 +01:00
Nextcloud bot
3b403fc094
[tx-robot] updated from transifex 2019-03-07 01:46:42 +00:00
Chris Narkiewicz
78833ef911
Move uploader behavior pref to AppPreferences
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-06 22:45:46 +00:00
Andy Scherzinger
599566363e
Merge pull request #3711 from nextcloud/ezaquarii/refactor-upload-preferences
Move upload preferences to AppPreferences interface
2019-03-06 22:15:32 +01:00
Chris Narkiewicz
5dabec67bf
Move upload preferences to AppPreferences interface
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-06 16:10:08 +00:00
Nextcloud bot
f2f5e64eba
[tx-robot] updated from transifex 2019-03-06 12:05:14 +00:00
Andy Scherzinger
bd3e065730
Merge pull request #3712 from nextcloud/dependabot/gradle/org.mockito-mockito-core-2.25.0
Bump mockito-core from 2.24.5 to 2.25.0
2019-03-06 08:20:42 +01:00
Tobias Kaminsky
7e1424a88c daily dev 20190306 2019-03-06 03:35:36 +01:00
dependabot[bot]
a623fc5094
Bump mockito-core from 2.24.5 to 2.25.0
Bumps [mockito-core](https://github.com/mockito/mockito) from 2.24.5 to 2.25.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v2.24.5...v2.25.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-06 02:16:27 +00:00
Andy Scherzinger
f8bc2a7a31
Merge pull request #3706 from nextcloud/fileDeleteWhileOffline
abort sync if reading remote file fails
2019-03-05 23:07:35 +01:00
Andy Scherzinger
0cdcf970c6
Merge pull request #3699 from nextcloud/ezaquarii/refactor-grid-columns-preference
Move grid columns to AppPreferences interface
2019-03-05 22:36:28 +01:00
Andy Scherzinger
41b365234a
improve findbugs score
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2019-03-05 17:04:46 +01:00
Chris Narkiewicz
087ed97e1a
Move grid columns to AppPreferences interface
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-05 17:04:41 +01:00
Andy Scherzinger
b16d996c87
Merge pull request #3707 from nextcloud/waitForServer
wait for server to get ready
2019-03-05 17:04:04 +01:00
tobiasKaminsky
711508ec29
wait for server to get ready
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-05 14:55:19 +01:00
Andy Scherzinger
2b169ef74b
Merge pull request #3697 from nextcloud/ezaquarii/refactor-show-media-scan-notifications-preference
Move show media scan notifications to AppPreferences interface
2019-03-05 14:16:07 +01:00
tobiasKaminsky
6542334c4e
abort sync if reading remote file fails
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-05 13:48:48 +01:00
Chris Narkiewicz
b5f357819f
Move show media scan notifications to AppPreferences interface
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-05 13:15:26 +01:00
Andy Scherzinger
ce14d3116c
Merge pull request #3705 from nextcloud/preferences
change Preferences to SettingsActivity
2019-03-05 12:38:55 +01:00
Tobias Kaminsky
f8601fc9db
Merge pull request #3704 from nextcloud/verboseError
Integration Tests: Show log in case of error
2019-03-05 12:01:44 +01:00
tobiasKaminsky
eb727d4f12
change Preferences to SettingsActivity
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-05 11:34:50 +01:00
tobiasKaminsky
6ecc023708
show info in case of error
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2019-03-05 11:18:18 +01:00
Andy Scherzinger
b784d84121
Merge pull request #3698 from nextcloud/ezaquarii/refactor-show-detailed-timestamp-preference
Move showDetailedTimestampPreference to AppPreferences interface
2019-03-05 10:25:13 +01:00
Chris Narkiewicz
79da94ad62
Move showDetailedTimestampPreference to AppPreferences interface
Signed-off-by: Chris Narkiewicz <hello@ezaquarii.com>
2019-03-05 08:49:05 +00:00
Andy Scherzinger
19761b2474
Merge pull request #3700 from nextcloud/dependabot/gradle/com.android.tools.build-gradle-3.3.2
Bump gradle from 3.3.1 to 3.3.2
2019-03-05 09:07:09 +01:00