Commit graph

11568 commits

Author SHA1 Message Date
tobiasKaminsky
6978587ae1
show local size when switching to "on device" view
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-20 15:07:02 +02:00
Nextcloud bot
da1064fc37
[tx-robot] updated from transifex 2018-09-20 00:49:09 +00:00
Tobias Kaminsky
a41be3d3cb daily dev 20180920 2018-09-20 00:32:48 +02:00
Andy Scherzinger
798093ae19
Merge pull request #3059 from nextcloud/removeDuplicatedMimetype
Remove duplicated mimetype
2018-09-19 16:22:08 +02:00
tobiasKaminsky
929cb20149
fix #2684
remove duplicated mimetype

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-19 15:41:48 +02:00
Andy Scherzinger
2676cd88e5
Merge pull request #3052 from nextcloud/codacy
Codacy fixes
2018-09-19 15:11:19 +02:00
tobiasKaminsky
c40a912815
use chat bubble as fallback
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-19 14:18:37 +02:00
AndyScherzinger
6a177d3dee
remove unused return value from method signature 2018-09-19 14:12:40 +02:00
AndyScherzinger
79677f5281
codacy: useless parentheses 2018-09-19 14:12:39 +02:00
AndyScherzinger
7e17aca4ff
codacy: avoid instantiating new objects inside loops 2018-09-19 14:12:39 +02:00
AndyScherzinger
c78e05e873
codacy: avoid using redundant field initializer 2018-09-19 14:12:38 +02:00
AndyScherzinger
2e9d7ce028
codacy: useless qualified this usage in the same class. 2018-09-19 14:12:38 +02:00
AndyScherzinger
a4eafbf757
codacy: String.indexOf(char) is faster than String.indexOf(String). 2018-09-19 14:12:37 +02:00
AndyScherzinger
799c3a3163
codacy: all methods are static. Consider using a utility class instead. 2018-09-19 14:12:37 +02:00
AndyScherzinger
22e7f71e22
codacy: avoid unused imports 2018-09-19 14:12:36 +02:00
AndyScherzinger
0ae679f3b5
codacy: consider simply returning the value vs storing it in local variable 2018-09-19 14:12:36 +02:00
AndyScherzinger
13d602422e
codacy: avoid the use of value in annotations when its the only element 2018-09-19 14:12:36 +02:00
AndyScherzinger
ed95f486fc
codacy: avoid using Literals in Conditional Statements 2018-09-19 14:12:35 +02:00
AndyScherzinger
93ef48add6
codacy: field has the same name as a method 2018-09-19 14:12:31 +02:00
Andy Scherzinger
2c6bfc4c9e
Merge pull request #3057 from nextcloud/changelog330
Changelog 3.3.0
2018-09-19 11:15:03 +02:00
Andy Scherzinger
fd23d58cb9
release 3.3.0 2018-09-19 10:05:16 +02:00
Andy Scherzinger
d40a4a1731
Merge pull request #3055 from nextcloud/changeRCversion
change RC starting with 51
2018-09-19 09:16:02 +02:00
tobiasKaminsky
01edfe6491
change RC starting with 51
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-19 07:46:50 +02:00
Andy Scherzinger
ae94e219ba
Merge pull request #3054 from nextcloud/dependabot/gradle/org.jetbrains-annotations-16.0.3
Bump annotations from 16.0.2 to 16.0.3
2018-09-19 07:13:17 +02:00
dependabot[bot]
1958c06b87
Bump annotations from 16.0.2 to 16.0.3
Bumps [annotations](https://github.com/JetBrains/java-annotations) from 16.0.2 to 16.0.3.
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Commits](https://github.com/JetBrains/java-annotations/commits/16.0.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-19 01:12:56 +00:00
Tobias Kaminsky
c543846918 daily dev 20180919 2018-09-19 00:32:05 +02:00
Andy Scherzinger
6b0023a28a
Merge pull request #3048 from nextcloud/bumpDroneVersion
Bump drone version
2018-09-18 18:30:34 +02:00
tobiasKaminsky
bdef26f774
Use docker 40
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-18 14:51:51 +02:00
tobiasKaminsky
0efdf2bbac
Add room share type
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-18 14:48:29 +02:00
Andy Scherzinger
a6910a3d13
Merge pull request #3050 from nextcloud/fixCanvasTooLarge
Fix CanvasTooLargeException
2018-09-18 13:14:18 +02:00
tobiasKaminsky
6909794879
fix CanvasTooLargeException
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-18 11:11:21 +02:00
Nextcloud bot
3f3cef84b1
[tx-robot] updated from transifex 2018-09-18 08:41:48 +00:00
Nextcloud bot
6caa0b927b
[tx-robot] updated from transifex 2018-09-18 00:47:16 +00:00
Tobias Kaminsky
a1253ce117 daily dev 20180918 2018-09-18 00:32:01 +02:00
Andy Scherzinger
d9ce5b0228
Merge pull request #3044 from nextcloud/handlePermissions
Correct handle write protected folders
2018-09-17 08:12:59 +02:00
Nextcloud bot
df742e0712
[tx-robot] updated from transifex 2018-09-17 00:50:37 +00:00
Nextcloud bot
3d3980a67b
[tx-robot] updated from transifex 2018-09-16 00:49:33 +00:00
Nextcloud bot
785433108e
[tx-robot] updated from transifex 2018-09-15 00:48:36 +00:00
Tobias Kaminsky
1f8854769b daily dev 20180915 2018-09-15 00:32:34 +02:00
tobiasKaminsky
4da88c2acb
correct handle write protected folders
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-09-14 13:59:54 +02:00
Tobias Kaminsky
c99cea497d
Merge pull request #3031 from NilsGriebner/upload_filepicker_footer
Fix upload filepicker footer view
2018-09-14 11:40:25 +02:00
Nextcloud bot
521b1cda01
[tx-robot] updated from transifex 2018-09-14 07:47:37 +00:00
Andy Scherzinger
aa09934df1
fix string 2018-09-14 09:41:09 +02:00
Tobias Kaminsky
82ea0bcd68
Merge pull request #3027 from nextcloud/sso
add own sso token manager with custom dialog
2018-09-14 08:34:56 +02:00
Nextcloud bot
903b0802a0
[tx-robot] updated from transifex 2018-09-14 06:28:43 +00:00
Nextcloud bot
0e7e85fabf
[tx-robot] updated from transifex 2018-09-14 00:50:08 +00:00
Tobias Kaminsky
23a1a1f3b6 daily dev 20180914 2018-09-14 00:32:13 +02:00
AndyScherzinger
e46aacc9c8
fix codacy 2018-09-13 19:06:31 +02:00
AndyScherzinger
7a7c1100c3
polish SSO dialog 2018-09-13 18:49:12 +02:00
AndyScherzinger
e164da3beb
add license header and line break to xml file 2018-09-13 18:18:02 +02:00