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

43470 Commits

Author SHA1 Message Date
Nextcloud bot c8cb42fd26
[tx-robot] updated from transifex 2018-05-01 00:11:52 +00:00
John Molakvoæ 49f26d1221
Merge pull request #9348 from nextcloud/fix-js-tests 
Replace deprecated sinon reset() call with resetHistory()
 2018-04-30 14:54:34 +02:00
Julius Härtl 16865e59dd
Replace deprecated sinon reset() call with resetHistory() 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-30 13:52:58 +02:00
Nextcloud bot b87b0689c5
[tx-robot] updated from transifex 2018-04-30 00:11:48 +00:00
Nextcloud bot a546dcfcb3
[tx-robot] updated from transifex 2018-04-29 00:11:47 +00:00
Nextcloud bot 6ee00a8be5
[tx-robot] updated from transifex 2018-04-28 00:11:58 +00:00
Morris Jobke d8350c69ef
Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logic 
Do not add sharePermission logic in JS
 2018-04-27 14:01:40 +02:00
Morris Jobke 7102ddad50
Merge pull request #9325 from GitHubUser4234/ldap_cloned_connection_nc13fix 
Fix for unbound cloned LDAP connections
 2018-04-27 14:01:15 +02:00
Morris Jobke 7306d30708
Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_at_root 
Actually return the root folder when traversing up the tree
 2018-04-27 13:59:29 +02:00
Morris Jobke 21da3594f6
Merge pull request #9322 from nextcloud/bugfix/noid/swift_token_cache 
Better swift V3 token handling
 2018-04-27 13:51:44 +02:00
Roger Szabo 8637b90e15 unbound cloned connection fix 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-04-27 17:29:15 +08:00
Morris Jobke 7da1e968f9
Merge pull request #9319 from nextcloud/rakekniven-patch-1 
Fixed typo
 2018-04-27 09:15:21 +02:00
Nextcloud bot 9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
Roeland Jago Douma a0e038f912
generateTokenFromCache is only valid for V3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:51:05 +02:00
Roeland Jago Douma 7318882357
json_decode an associative array for the swift cached token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:47:47 +02:00
Roeland Jago Douma 235e3480e6
Actually return the root folder when traversing up the tree 
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:04:19 +02:00
rakekniven ace2063f21
Fixed typo 2018-04-26 18:12:21 +02:00
Roeland Jago Douma d379770cf2
Fix sharedfilelistSpec.js tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 16:34:24 +02:00
Morris Jobke bb82bfac6d
Merge pull request #9302 from nextcloud/update-phan-config 
Improve phan config
 2018-04-26 13:53:14 +02:00
Roeland Jago Douma 0771dad57f
Do not add sharePermission logic in JS 
We have a dedicated dav property. We should do all the magic in 1 place.
Not several.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 12:14:37 +02:00
Morris Jobke b7e8ab97e7
Merge pull request #9308 from nextcloud/proper-ocp-constants 
Move log constants to ILogger
 2018-04-26 11:53:21 +02:00
Lukas Reschke 3aaa2307e9
Improve phan config 
* exclude routes

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-26 11:51:05 +02:00
Arthur Schiwon 38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +02:00
Nextcloud bot 12c5db9032
[tx-robot] updated from transifex 2018-04-26 00:12:10 +00:00
Morris Jobke 9c64a203e3
Merge pull request #9256 from nextcloud/fed-sharing-improvements 
improve error reporting and move format parameter to the options
 2018-04-25 15:49:30 +02:00
Bjoern Schiessle 0e0cfa0fa1
improve error reporting and move format parameter to the options 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-04-25 13:53:56 +02:00
Morris Jobke 5a4a0add3c
Merge pull request #9296 from nextcloud/migrate-groups-fetch-to-ocs-api 
Migrate groups fetch to ocs api
 2018-04-25 13:45:35 +02:00
Morris Jobke c907b68842
Merge pull request #9284 from nextcloud/bugfix/9279/strict_sharee_api 
Make ShareesAPIController strict
 2018-04-25 11:53:52 +02:00
Morris Jobke b3a0dec8d5
Merge pull request #8540 from nextcloud/theming-advanced 
Add option for header logo and favicon in theming app
 2018-04-25 08:47:14 +02:00
John Molakvoæ (skjnldsv) 8c845be11c
Workflow engine to ocs api 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-25 07:47:16 +02:00
John Molakvoæ (skjnldsv) d53193fd8e
Settings groups to ocs 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-25 07:37:20 +02:00
Nextcloud bot 3e14f21ae7
[tx-robot] updated from transifex 2018-04-25 00:11:50 +00:00
Roeland Jago Douma 0dc019370d
Merge pull request #9248 from nextcloud/fix-files-ellipsis 
Fix ellipsis in filename column
 2018-04-24 20:36:41 +02:00
Roeland Jago Douma d59791ab6f
Merge pull request #9292 from nextcloud/bugfix/9279/cast_db_backend_numeric 
Cast retrieved DB fields to string
 2018-04-24 20:04:38 +02:00
Roeland Jago Douma 81f71cb1f9
Numeric only uids are no fun 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 14:23:50 +02:00
Roeland Jago Douma 074a0e0665
Cast retrieved DB fields to string 
Fixes #9279

If a pure numerical user is in the DB the value might be casted to a int
when returned. Cast it all to a string so we don't break the strict
typing.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 12:48:52 +02:00
Joas Schilling 09398397b3
Merge pull request #9282 from nextcloud/bugfix/9279/scrit_type_share_api 
Make the ShareAPIController strict
 2018-04-24 11:57:52 +02:00
Roeland Jago Douma 1ceb081c9b
Merge pull request #9280 from nextcloud/bugfix/noid/swift-v3-scope 
Swift v3 requires setting a scope
 2018-04-24 09:49:27 +02:00
Roeland Jago Douma 4d5a2cce8d
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-24 08:07:25 +02:00
Nextcloud bot 9339c7d20f
[tx-robot] updated from transifex 2018-04-24 00:11:53 +00:00
Roeland Jago Douma 3b3ff39431
Make ShareesAPIController strict 
Fixes #9279

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 22:05:21 +02:00
Roeland Jago Douma 3b34a77c58
Make the ShareAPIController strict 
Fixes #9279

With types we can force php to not cast a full nummeric user to an int.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 20:31:57 +02:00
Roeland Jago Douma ba71918ad2
Swift v3 requires setting a scope 
Unscoped auth is not guaranteed to return a catalog. So require the
scope to be set properly.

See https://developer.openstack.org/api-ref/identity/v3/index.html#password-authentication-with-unscoped-authorization

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-23 19:34:09 +02:00
Morris Jobke 83b0ce0955
Merge pull request #9278 from nextcloud/bug/noid/ldap-wizard-newaccess 
Access needs UserManager, missed to add in #8833
 2018-04-23 17:49:07 +02:00
Daniel Calviño Sánchez 9b150001ff
Merge pull request #9272 from nextcloud/bugfix/noid/save-a-query-help-saving-the-world 
Only query last comment info, when there is one
 2018-04-23 16:43:09 +02:00
Morris Jobke 351255b216
Merge pull request #9276 from nextcloud/remove-unused-config-sample 
Remove unused config option
 2018-04-23 16:29:06 +02:00
Arthur Schiwon ed5f53bd49
Access needs UserManager, missed to add in #8833 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-23 15:58:50 +02:00
Joas Schilling 05a6b71a61
Merge pull request #9271 from nextcloud/fix-undefined-variable 
Fix undefined variable - found by Phan
 2018-04-23 15:51:15 +02:00
Roeland Jago Douma 000f41ba01
Merge pull request #9275 from nextcloud/group_backends 
Make the group backends also possible using interfaces
 2018-04-23 15:37:34 +02:00
Morris Jobke f2e18d496e
Remove unused config option 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-04-23 15:06:38 +02:00