Commit Graph

43095 Commits

Author SHA1 Message Date
Morris Jobke 63bc633d89
Merge pull request #8857 from nextcloud/swift-verify-cached-token
verify cached swift token
2018-03-19 10:10:04 +01:00
Nextcloud bot 2fab6b2620
[tx-robot] updated from transifex 2018-03-19 01:11:34 +00:00
Nextcloud bot d6bfc98df1
[tx-robot] updated from transifex 2018-03-18 01:11:46 +00:00
John Molakvoæ (skjnldsv) ccd57ce1b1
Allow empty emails provisionning api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-17 12:18:22 +01:00
Nextcloud bot 3cac7911d5
[tx-robot] updated from transifex 2018-03-17 01:11:30 +00:00
Morris Jobke 9aced256c2
Merge pull request #8853 from nextcloud/remove-resolve-reshare
Remove unused resolveReshare of old sharing code
2018-03-16 20:23:01 +01:00
rakekniven b2ceb29484
Update ThemingController.php
Changed wording according to discussion at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491259?issue=yes
Aligned ending of error messages
2018-03-16 18:45:20 +01:00
blizzz e56759917b
Merge pull request #8843 from nextcloud/set-share-with-field-to-the-id-of-the-circle
Set "share with" field to the ID of the circle
2018-03-16 16:42:31 +01:00
John Molakvoæ (skjnldsv) 2493e9426d
Check if groups is array, return empty do not throw
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 15:32:36 +01:00
Robin Appelman 41954d2903
verify cached swift token
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-16 15:20:16 +01:00
Morris Jobke ade05f40ec
Remove unused resolveReshare of old sharing code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-16 12:26:38 +01:00
John Molakvoæ (skjnldsv) f5137fef6c
Fixed tests and improved code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 11:44:20 +01:00
John Molakvoæ (skjnldsv) aa1e8713fb
Fixed throw error on unreachable users
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 09:38:09 +01:00
Morris Jobke f83aa58d1f
Merge pull request #8835 from nextcloud/fix/noid/ldap_existence_check
group existence check works without attribute (like with users)
2018-03-16 09:31:49 +01:00
John Molakvoæ (skjnldsv) ce625bbad5
Add userdetails to ocs api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 09:19:47 +01:00
Daniel Calviño Sánchez ed4b4458eb Use the display name in the avatar for a circle share
Before, the avatar for a circle share was generated using the
"share_with" field as the seed for "imageplaceholder". Due to this, when
the "share_with" field is set to the circle ID the character shown in
the avatar was just a random character instead of the first character of
the display name. Now the "share_with" is still used as the seed for the
colour, but the display name is used as the text of the avatar.

This adds support for "share_with" fields set to the circle ID while
being backwards compatible with "share_with" fields set to the circle
name.

Note that when "share_with" fields is set to the circle name the colour
of the avatar is different in the list of suggested sharees and in the
list of current sharees, but that also happened before these changes
(due to a different seed being used in each place).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-16 04:58:25 +01:00
Daniel Calviño Sánchez 2c073dc53d Set "share_with" field to the ID of the circle
When a share is shared with a circle the "share_with" field returned by
the API endpoint was always set to the name of the circle. However, the
name is not enough to identify a circle. The Circles app now provides
the ID of the circle in the "shared with" field of a Share, so this
commit modifies the API endpoint to set the "share_with" field to the ID
of the circle when provided by the Circles app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-16 04:58:00 +01:00
Nextcloud bot b7e7ae5d6d
[tx-robot] updated from transifex 2018-03-16 01:11:31 +00:00
Arthur Schiwon cbf60f2e91
existence check works without attribute (like with users)
cn is not necessarily given everywhere

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-15 15:47:44 +01:00
Roeland Jago Douma fa886ef4eb
Merge pull request #8830 from nextcloud/node_emit_read
Emit read for nodes
2018-03-15 14:04:14 +01:00
blizzz 208e38e84e
Merge pull request #8255 from nextcloud/bugfix/noid/group-display-name
Full implement group display names
2018-03-15 12:07:30 +01:00
Roeland Jago Douma d6b326650b
Emit read for nodes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-15 11:18:39 +01:00
Roeland Jago Douma fde08a9619
Merge pull request #8793 from nextcloud/swift-config
Swift uses `containter` not `bucket`
2018-03-15 08:34:58 +01:00
Roeland Jago Douma f2b93f5246
Merge pull request #8828 from nextcloud/fix-configuration-values-matched-in-user-searches
Fix configuration values matched in user searches
2018-03-15 08:34:21 +01:00
Morris Jobke b01b3454e6
Provide a description of the update channels inline
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-15 07:11:50 +01:00
Nextcloud bot 055d15e305
[tx-robot] updated from transifex 2018-03-15 01:11:41 +00:00
Daniel Calviño Sánchez 0b96a71a68 Fix configuration values matched in user searches
Due to a misplaced closing parenthesis the condition of the left join
clause was just "userid = uid"; the other conditions were passed as
additional parameters to "leftJoin", and thus they were ignored.
Therefore, the result set contained every preference of each user
instead of only the email, so the "WHERE configvalue LIKE XXX" matched
any configuration value of the user.

Besides the closing parenthesis this commit also fixes the literal
values. Although "Literal" objects represent literal values they must be
created through "IExpressionBuilder::literal()" to be properly quoted;
otherwise it is just a plain string, which is treated as a column name.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-14 23:31:42 +01:00
Arthur Schiwon f42c29ebac
the FN is optional, carrying the displayname if present
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-03-14 14:30:45 +01:00
Roeland Jago Douma d3e7996e80
Fix bucket and container usage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-14 13:57:14 +01:00
Roeland Jago Douma 23a02eaf14
Merge pull request #8818 from nextcloud/remove-alternative-logins-title
Remove "Alternative logins" title on login page
2018-03-14 13:52:35 +01:00
Morris Jobke 990ca145d7
Remove "Alternative logins" title on login page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-14 11:38:57 +01:00
Morris Jobke 8e47f10714
Merge pull request #8816 from nextcloud/cleanup-ocp-contacts
Remove deprecated OCP\Contacts
2018-03-14 11:21:49 +01:00
Morris Jobke 8d4b76c0e2
Remove deprecated OCP\Contacts
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-14 10:47:09 +01:00
Roeland Jago Douma 2d5febd0b9
Merge pull request #8811 from nextcloud/remove_dep_util_link
Remove deprecated URL functions for OCP\Util
2018-03-14 09:49:51 +01:00
Roeland Jago Douma 0e48afafed
Merge pull request #8804 from nextcloud/remove_httphelper
Remove deprecated HTTPHelper
2018-03-14 09:49:24 +01:00
Nextcloud bot 7f00de841b
[tx-robot] updated from transifex 2018-03-14 01:11:29 +00:00
Roeland Jago Douma b93d26a209
Replace ContactsManager
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 22:18:38 +01:00
Roeland Jago Douma 83873e3da1
Remove deprecated URL functions for OCP\Util
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 22:04:08 +01:00
Roeland Jago Douma 7785c3752f
Remove deprecated HTTPHelper
* Remove the HTTP Helper
* Remove from Server Containter
* Removed legacy share tests that use it

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 21:54:56 +01:00
blizzz 76d23a1600
Merge pull request #8806 from nextcloud/add-local-memcache-check
Properly provide local memcache check to ICacheFactory
2018-03-13 21:27:24 +01:00
Morris Jobke dde5353f98
Properly provide local memcache check to ICacheFactory
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-13 18:18:04 +01:00
Morris Jobke ede723f1b1
Merge pull request #8796 from nextcloud/varadic_qb
Make QueryBuilder varadic
2018-03-13 14:11:19 +01:00
Morris Jobke 274106b80b
Merge pull request #8800 from nextcloud/getstoragestats_to_controller
Move storagestats endpoint to proper controller
2018-03-13 14:08:30 +01:00
Roeland Jago Douma f52ba44edb
Move storagestats endpoint to proper controller
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 12:44:48 +01:00
Morris Jobke 58599e0360
Merge pull request #8781 from nextcloud/cleanup-old-federation-code
Remove old code to be compatible with Nextcloud 9 and before
2018-03-13 11:53:21 +01:00
Morris Jobke 45895de531
Merge pull request #8794 from nextcloud/swift-v3-cache-token
Properly cache swift v3 token
2018-03-13 11:35:38 +01:00
Morris Jobke a827160cfa
Merge pull request #8797 from nextcloud/inject-public-igroupmanager-instead-of-private-groupmanager
Inject public IGroupManager instead of private GroupManager
2018-03-13 10:42:10 +01:00
Daniel Calviño Sánchez 044d5a8d01 Inject public IGroupManager instead of private GroupManager
The public "IGroupManager" service returned by the dependency injection
system is automatically initialized with an "OC\Group\Database" backend.
However, no backend is automatically set in private "GroupManager"
instances. Therefore, a private "GroupManager" instance does not work as
expected when initialized through the dependency injection system.

Due to that this commit reverts a previous change in which the public
"IGroupManager" was replaced by a private "GroupManager" instance. That
change was needed when strict types were set, as "getSubAdmin()" is not
part of "IGroupManager" API, so the type had to be changed to
"GroupManager". Until a better solution is found strict types are
disabled again to be able to inject "IGroupManager" and also use
"getSubAdmin()".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-03-13 09:52:27 +01:00
Morris Jobke 7488218535
Merge pull request #8792 from nextcloud/cleanup-oc_response
Remove unused methods of OC_Response
2018-03-13 09:47:29 +01:00
Roeland Jago Douma 46c195b58b
Made IExpressionBuilder varadic
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-13 09:35:09 +01:00