summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove deprecated and unused method OCP\User::getDisplayNamesMorris Jobke2018-03-211-14/+0
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7904 from nextcloud/fix_7224Morris Jobke2018-03-214-33/+38
|\ | | | | Add Cache-control: immutable
| * Add Cache-control: immutableRoeland Jago Douma2018-03-194-33/+38
| | | | | | | | | | | | | | | | Cache generated CSS forever! Also cache combined JS forever Fix tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-03-21136-392/+412
| |
* | Merge pull request #8821 from nextcloud/feature/noid/show-eol-warningMorris Jobke2018-03-209-0/+26
|\ \ | | | | | | Show EOL warning in the update section
| * | Show EOL warning in the update sectionJoas Schilling2018-03-209-0/+26
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8847 from nextcloud/ocs-api-userdetailsMorris Jobke2018-03-203-73/+169
|\ \ \ | |/ / |/| | Add userdetails to ocs api
| * | fixup! Check if groups is array, return empty do not throwJohn Molakvoæ (skjnldsv)2018-03-192-37/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Check if groups is array, return empty do not throwJohn Molakvoæ (skjnldsv)2018-03-161-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed tests and improved codeJohn Molakvoæ (skjnldsv)2018-03-162-61/+117
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fixed throw error on unreachable usersJohn Molakvoæ (skjnldsv)2018-03-161-7/+11
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Add userdetails to ocs apiJohn Molakvoæ (skjnldsv)2018-03-162-3/+71
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #8861 from nextcloud/rakekniven-patch-1Joas Schilling2018-03-202-5/+5
|\ \ \ | | | | | | | | Update ThemingController.php
| * | | Update ThemingControllerTest.phprakekniven2018-03-191-2/+2
| | | | | | | | | | | | Adjusted test
| * | | Update ThemingController.phprakekniven2018-03-191-1/+1
| | | | | | | | | | | | Changed file according to discussion on PR.
| * | | Update ThemingController.phprakekniven2018-03-161-3/+3
| | | | | | | | | | | | | | | | Changed wording according to discussion at Transifex. See https://www.transifex.com/nextcloud/nextcloud/translate/#de/$/121491259?issue=yes Aligned ending of error messages
* | | | Merge pull request #8864 from nextcloud/ocs-allow-empty-email-displaynameRoeland Jago Douma2018-03-201-1/+1
|\ \ \ \ | | | | | | | | | | Allow empty emails provisioning api
| * | | | Allow empty emails provisionning apiJohn Molakvoæ (skjnldsv)2018-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #8887 from nextcloud/fix-appmenu-min-widthRoeland Jago Douma2018-03-201-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Add min width of two icons to the app menu
| * | | | | Add min width of two icons to the app menuJulius Härtl2018-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-2022-42/+160
| | | | | |
* | | | | | Merge pull request #8822 from nextcloud/fix/8641/undefined-indexblizzz2018-03-191-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | the FN is optional, carrying the displayname if present
| * | | | | | the FN is optional, carrying the displayname if presentArthur Schiwon2018-03-141-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | Merge pull request #8880 from nextcloud/delete_unused_downloadRoeland Jago Douma2018-03-192-55/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused download.php
| * | | | | | | Remove unused download.phpRoeland Jago Douma2018-03-192-55/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | Merge pull request #8871 from nextcloud/3rdparty-bump-openstack-3-0-5Roeland Jago Douma2018-03-191-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [3rdparty] Bump php-opencloud/openstack to 3.0.5
| * | | | | | | | [3rdparty] Bump php-opencloud/openstack to 3.0.5Roeland Jago Douma2018-03-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | Merge pull request #8881 from nextcloud/setUserValue_optRoeland Jago Douma2018-03-191-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Store setUserValue as string in cache
| * | | | | | | | Store setUserValue as string in cacheRoeland Jago Douma2018-03-191-2/+2
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | | Merge pull request #8878 from nextcloud/remove_tmpfileRoeland Jago Douma2018-03-1912-42/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove deprecated tmpFile/tmpFolder
| * | | | | | | | Remove \OCP\Files::tmpFolderRoeland Jago Douma2018-03-194-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Remove \OCP\Files::tmpFileRoeland Jago Douma2018-03-1911-24/+11
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #8879 from nextcloud/dep_jsonRoeland Jago Douma2018-03-192-47/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Remove unused deprecated functions from OCP\JSON
| * | | | | | | Remove unused private functionRoeland Jago Douma2018-03-191-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Remove unused deprecated functions from OCP\JSONRoeland Jago Douma2018-03-191-32/+0
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #8877 from nextcloud/deprecated_bgj_deleteRoeland Jago Douma2018-03-191-7/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove old deprecated function from the BackgroundJob
| * | | | | | | Remove old deprecated function from the BackgroundJobRoeland Jago Douma2018-03-191-7/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #8815 from nextcloud/channel-descriptionRoeland Jago Douma2018-03-193-0/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Provide a description of the update channels inline
| * | | | | | Provide a description of the update channels inlineMorris Jobke2018-03-153-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #8857 from nextcloud/swift-verify-cached-tokenMorris Jobke2018-03-193-13/+29
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | verify cached swift token
| * | | | | | verify cached swift tokenRobin Appelman2018-03-163-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-192-40/+120
| | | | | | |
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-186-6/+8
| |_|_|/ / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-1742-4/+60
| | | | | |
* | | | | | Merge pull request #8853 from nextcloud/remove-resolve-reshareMorris Jobke2018-03-162-33/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Remove unused resolveReshare of old sharing code
| * | | | | Remove unused resolveReshare of old sharing codeMorris Jobke2018-03-162-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #8843 from ↵blizzz2018-03-163-4/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/set-share-with-field-to-the-id-of-the-circle Set "share with" field to the ID of the circle
| * | | | | Use the display name in the avatar for a circle shareDaniel Calviño Sánchez2018-03-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | Set "share_with" field to the ID of the circleDaniel Calviño Sánchez2018-03-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | Merge pull request #8835 from nextcloud/fix/noid/ldap_existence_checkMorris Jobke2018-03-161-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | group existence check works without attribute (like with users)
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 01:36:08 +0000