29c551c88f
Merge pull request #8847 from nextcloud/ocs-api-userdetails
...
Add userdetails to ocs api
2018-03-20 18:12:25 +01:00
64feb3f391
Merge pull request #8861 from nextcloud/rakekniven-patch-1
...
Update ThemingController.php
2018-03-20 13:45:20 +01:00
99abe3bc8e
Merge pull request #8864 from nextcloud/ocs-allow-empty-email-displayname
...
Allow empty emails provisioning api
2018-03-20 09:44:38 +01:00
16ae91330c
Merge pull request #8887 from nextcloud/fix-appmenu-min-width
...
Add min width of two icons to the app menu
2018-03-20 08:03:52 +01:00
615258ba26
[tx-robot] updated from transifex
2018-03-20 01:11:33 +00:00
7ae42f1f5d
Merge pull request #8822 from nextcloud/fix/8641/undefined-index
...
the FN is optional, carrying the displayname if present
2018-03-19 17:57:12 +01:00
1699b119dd
Add min width of two icons to the app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-19 17:12:59 +01:00
24659342f5
fixup! Check if groups is array, return empty do not throw
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-19 15:12:32 +01:00
789221a0fc
Update ThemingControllerTest.php
...
Adjusted test
2018-03-19 15:07:49 +01:00
d88db9b496
Update ThemingController.php
...
Changed file according to discussion on PR.
2018-03-19 15:00:27 +01:00
734cddfa97
Merge pull request #8880 from nextcloud/delete_unused_download
...
Remove unused download.php
2018-03-19 14:18:51 +01:00
1c1608cddb
Merge pull request #8871 from nextcloud/3rdparty-bump-openstack-3-0-5
...
[3rdparty] Bump php-opencloud/openstack to 3.0.5
2018-03-19 14:18:27 +01:00
ce0c896d8f
Merge pull request #8881 from nextcloud/setUserValue_opt
...
Store setUserValue as string in cache
2018-03-19 14:17:59 +01:00
431750828e
Store setUserValue as string in cache
...
We cache the values we set in the setUserValue function.
However since the values are strings in the database we check if a value
is equal with string comparison
Now if the function was called with a $value of int or float. It would
be stored in the DB (and thus converted to string) and in the cache (not
converted thus as int/float).
Now if another call comes in that sets it to the same value (I'm looking
at you LDAP!). The check would fail since we would be comparing
int/float to string which fails by definition.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 12:57:48 +01:00
9834f33d56
Merge pull request #8878 from nextcloud/remove_tmpfile
...
Remove deprecated tmpFile/tmpFolder
2018-03-19 12:29:08 +01:00
0929e048f8
Merge pull request #8879 from nextcloud/dep_json
...
Remove unused deprecated functions from OCP\JSON
2018-03-19 12:28:23 +01:00
1d6a2a7019
Remove unused download.php
...
There were two routes apps/files/ajax/download.php but apparently also
apps/files/download.php I could not find any use of it.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 11:45:48 +01:00
68871caf3c
Remove unused private function
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 11:32:10 +01:00
d984c8d633
Remove unused deprecated functions from OCP\JSON
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 11:30:35 +01:00
05203e3fc0
Merge pull request #8877 from nextcloud/deprecated_bgj_delete
...
Remove old deprecated function from the BackgroundJob
2018-03-19 11:25:45 +01:00
17bfa1c74e
Merge pull request #8815 from nextcloud/channel-description
...
Provide a description of the update channels inline
2018-03-19 11:25:15 +01:00
1088068c60
Remove \OCP\Files::tmpFolder
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:54:39 +01:00
47a3008141
Remove \OCP\Files::tmpFile
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:52:35 +01:00
d304f4bebb
Remove old deprecated function from the BackgroundJob
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:47:31 +01:00
ba611594b7
[3rdparty] Bump php-opencloud/openstack to 3.0.5
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-19 10:28:33 +01:00
63bc633d89
Merge pull request #8857 from nextcloud/swift-verify-cached-token
...
verify cached swift token
2018-03-19 10:10:04 +01:00
2fab6b2620
[tx-robot] updated from transifex
2018-03-19 01:11:34 +00:00
d6bfc98df1
[tx-robot] updated from transifex
2018-03-18 01:11:46 +00:00
ccd57ce1b1
Allow empty emails provisionning api
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-17 12:18:22 +01:00
3cac7911d5
[tx-robot] updated from transifex
2018-03-17 01:11:30 +00:00
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
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
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
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
41954d2903
verify cached swift token
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-16 15:20:16 +01:00
ade05f40ec
Remove unused resolveReshare of old sharing code
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-16 12:26:38 +01:00
f5137fef6c
Fixed tests and improved code
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 11:44:20 +01:00
aa1e8713fb
Fixed throw error on unreachable users
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 09:38:09 +01:00
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
ce625bbad5
Add userdetails to ocs api
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 09:19:47 +01:00
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
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
b7e7ae5d6d
[tx-robot] updated from transifex
2018-03-16 01:11:31 +00:00
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
fa886ef4eb
Merge pull request #8830 from nextcloud/node_emit_read
...
Emit read for nodes
2018-03-15 14:04:14 +01:00
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
d6b326650b
Emit read for nodes
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-15 11:18:39 +01:00
fde08a9619
Merge pull request #8793 from nextcloud/swift-config
...
Swift uses `containter` not `bucket`
2018-03-15 08:34:58 +01:00
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
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
Morris Jobke
Joas Schilling
Roeland Jago Douma
Nextcloud bot
blizzz
Julius Härtl
John Molakvoæ (skjnldsv)
rakekniven
Roeland Jago Douma
Robin Appelman
Daniel Calviño Sánchez