mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
50,822 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

50822 Commits

Author SHA1 Message Date
Nextcloud bot 46de79cfe8
[tx-robot] updated from transifex 2019-10-13 02:15:58 +00:00
Nextcloud bot 844e7a74cd
[tx-robot] updated from transifex 2019-10-12 02:15:17 +00:00
Nextcloud bot 22e14e39cf
[tx-robot] updated from transifex 2019-10-11 02:14:50 +00:00
Roeland Jago Douma ebbfd7da4e
Merge pull request #17493 from nextcloud/fix/tooltips/hide-on-sidebar-close 
Force hide tooltips on sidebar close
 2019-10-09 21:28:49 +02:00
John Molakvoæ (skjnldsv) 79473bdfdf Force hide tooltips on sidebar close 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-09 15:31:47 +00:00
Nextcloud bot 32d12bc533
[tx-robot] updated from transifex 2019-10-09 02:15:14 +00:00
Roeland Jago Douma ef837cfde1
Merge pull request #17457 from nextcloud/backport/17454/stable17 
[stable17] Kill ui-regression ci job
 2019-10-08 10:06:38 +02:00
Roeland Jago Douma f9431137de Kill ui-regression ci job 
Since we do not use it at the moment anyway it seems like a waste of
resources to actually run it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 07:36:17 +00:00
John Molakvoæ 6a84b1a73c
Build stable17 JS (#17452) 
Build stable17 JS
 2019-10-08 08:20:53 +02:00
Roeland Jago Douma 0e2a403a21
Merge pull request #17444 from nextcloud/backport/17359/stable17 
[stable17] Don't call basename on null
 2019-10-08 08:07:06 +02:00
Roeland Jago Douma 2195d79122
Merge pull request #17438 from nextcloud/backport/17411/stable17 
[stable17] Fix oauth client redirect
 2019-10-08 08:06:52 +02:00
Roeland Jago Douma d3c4c76654
Build stable17 JS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 07:41:56 +02:00
Nextcloud bot 0e85ca8ee3
[tx-robot] updated from transifex 2019-10-08 02:15:08 +00:00
Joas Schilling 2efd0207a6 Don't call basename on null 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-10-07 12:34:14 +00:00
Sergej Nikolaev 907660e05c fix oauth client redirect 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-07 10:05:03 +00:00
Roeland Jago Douma ca490dff2b
Merge pull request #17418 from nextcloud/backport/17387/stable17 
[stable17] Allow removing federated shares of locally reshared files
 2019-10-07 09:43:19 +02:00
Nextcloud bot 2f4145e757
[tx-robot] updated from transifex 2019-10-07 02:14:49 +00:00
Nextcloud bot 107639b12f
[tx-robot] updated from transifex 2019-10-06 02:15:20 +00:00
Roeland Jago Douma bbf36b4879 Allow removing federated shares of locally reshared files 
* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-05 13:19:44 +00:00
Roeland Jago Douma cf0376f81d
Merge pull request #17415 from nextcloud/backport/17397/stable17 
[stable17] Fix updating and deleting authtokens
 2019-10-05 14:14:48 +02:00
Sergej Nikolaev 5c5d658b0e fix updating and deleting authtokens 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-05 10:35:46 +00:00
Nextcloud bot b5ad2f9cb5
[tx-robot] updated from transifex 2019-10-05 02:15:13 +00:00
John Molakvoæ 2809ffa5fe
[stable17] Append / to data(path) for folder content request (#17311) 
[stable17] Append / to data(path) for folder content request
 2019-10-04 18:09:44 +02:00
Roeland Jago Douma 16ba526982
Merge pull request #17351 from nextcloud/backport/17001/stable17 
[stable17] reduce adressbook change events and handling
 2019-10-04 11:34:16 +02:00
John Molakvoæ 56d61ab9f0
[stable17] Don't use an undefined index if not needed (#17393) 
[stable17] Don't use an undefined index if not needed
 2019-10-04 06:40:10 +02:00
Nextcloud bot 7ba3e95100
[tx-robot] updated from transifex 2019-10-04 02:15:34 +00:00
Roeland Jago Douma 566ef25d0e Don't use an undefined index if not needed 
It is not set. And not used. Just some copy paste leftover.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-03 17:12:59 +00:00
John Molakvoæ 5df6570bbc
[stable17] Don't process known avatars from LDAP (#17372) 
[stable17] Don't process known avatars from LDAP
 2019-10-03 08:39:15 +02:00
Nextcloud bot 32df7f7cdd
[tx-robot] updated from transifex 2019-10-03 02:14:32 +00:00
Arthur Schiwon 845e7f733f Don't process known avatars from LDAP 
* avoids useless FS operation
* avoids useless DB writes
* avoids useless addressbook updates
* addendum to #17001

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-02 14:33:42 +00:00
Nextcloud bot 9bfe715106
[tx-robot] updated from transifex 2019-10-02 02:15:17 +00:00
Roeland Jago Douma 6be8a077e0
Merge pull request #17358 from nextcloud/backport/17353/stable17 
[stable17] Fix typo in "which"
 2019-10-01 19:26:06 +02:00
Joas Schilling 6670a2c51c Fix typo in "which" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-10-01 14:16:51 +00:00
Nextcloud bot 3db8553eb2
[tx-robot] updated from transifex 2019-10-01 12:42:01 +00:00
Arthur Schiwon 55229d05ff adjust test expectations 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-01 10:18:20 +00:00
Arthur Schiwon eb191af518 reduce adressbook change events and handling 
... from four to one on avatar updates

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-01 10:18:20 +00:00
Roeland Jago Douma 20ffc551d8
Merge pull request #17298 from nextcloud/backport/17258/stable17 
[stable17] add (hidden) option to configure smb timeout
 2019-10-01 12:10:59 +02:00
Roeland Jago Douma 95ea467c88
Merge pull request #17348 from nextcloud/backport/stable17fix/hbs-compile-script 
[stable17] Use handlebars from node_modules (on CI)
 2019-10-01 11:59:31 +02:00
Christoph Wurst 5d98f3fc0f
Use handlebars from node_modules (on CI) 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-10-01 08:00:00 +02:00
Roeland Jago Douma 7cceb667e9
Merge pull request #17295 from nextcloud/backport/17286/stable17 
[stable17] Correctly detect the mimetype from uploads
 2019-09-30 17:11:29 +02:00
Roeland Jago Douma 028568c4b8
Merge pull request #17273 from nextcloud/backport/14913/stable17 
[stable17] Fix directory detection for s3
 2019-09-30 17:10:02 +02:00
John Molakvoæ e9b27b2e98
Revert "[stable17] Bring the default font size up to 15px" (#17330) 
Revert "[stable17] Bring the default font size up to 15px"
 2019-09-30 15:43:34 +02:00
John Molakvoæ 3207bdd293
Revert "[stable17] Bring the default font size up to 15px" 2019-09-30 11:03:29 +02:00
John Molakvoæ ea1d40ff6f
Merge pull request #17309 from nextcloud/backport/17228/stable17 
[stable17] Bring the default font size up to 15px
 2019-09-28 19:24:51 +02:00
Marco Ambrosini 477af8a913 Bring the default font size up to 15px 
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
 2019-09-28 15:27:37 +00:00
John Molakvoæ (skjnldsv) da33d47e69
Append / to data(path) for folder content request 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-09-28 17:25:08 +02:00
Nextcloud bot 55c94b2d77
[tx-robot] updated from transifex 2019-09-28 02:14:59 +00:00
Robin Appelman 70ab6b93d8 Update apps/files_external/lib/Lib/Backend/SMB.php 
Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-09-27 10:30:45 +00:00
Robin Appelman 14a1bdb6e1 add (hidden) option to configure smb timeout 
hidden from ui to prevent clutter

```occ files_external:config <mount> timeout 30```

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-09-27 10:30:45 +00:00
Roeland Jago Douma 4f54d12ff9
Merge pull request #17277 from nextcloud/backport/17264/stable17 
[stable17] handle moveFromStorage within the same storage even when storage wrap…
 2019-09-27 12:28:40 +02:00