| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #9077 from nextcloud/fix-callForSeenUsers-stable13 | Morris Jobke | 2018-04-05 | 1 | -1/+2 |
| |\ | | | | | [stable13] Move on with the next user if we found the user on one user back-end | ||||
| | * | Move on with the next user if we found the user on one user back-end | Bjoern Schiessle | 2018-04-04 | 1 | -1/+2 |
| | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-05 | 26 | -2/+48 |
| |/ | |||||
| * | Merge pull request #9017 from nextcloud/smb-2.0.5-13 | Roeland Jago Douma | 2018-04-04 | 10 | -24/+44 |
| |\ | | | | | [13] update icewind/smb to 2.0.5 | ||||
| | * | update icewind/smb to 2.0.5 | Robin Appelman | 2018-03-28 | 10 | -24/+44 |
| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | Merge pull request #9072 from nextcloud/backport/8891/fix_8890-13 | Morris Jobke | 2018-04-04 | 2 | -12/+11 |
| |\ \ | | | | | | | [stable13] Fix proper permissions for multiple file access | ||||
| | * | | Fix test | Roeland Jago Douma | 2018-04-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | Fix proper permissions for multiple file access | Roeland Jago Douma | 2018-04-04 | 1 | -11/+10 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8890 In case you have access to a file via multiple ways, for example: 1. the file is shared with you with permission read only 2. the folder containing the file is shared with your read/write Requesting the getById function on the userFolder would give back two entries but both with the same permissions. Depending on the node you picked this is not right. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Merge pull request #9064 from nextcloud/fix-copy-encrypted-files-stable13 | Roeland Jago Douma | 2018-04-04 | 2 | -8/+9 |
| |\ \ | | | | | | | [stable13] reset encryptionVersion to '1' if a file was stream copied | ||||
| | * | | reset encryptionVersion to '1' if a file was stream copied, because this ↵ | Bjoern Schiessle | 2018-04-03 | 2 | -8/+9 |
| | | | | | | | | | | | | | | | | | | | means that we basically write the file from scratch Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-04 | 4 | -2/+88 |
| |/ / | |||||
| * | | Merge pull request #9019 from nextcloud/stable13-8939 | Morris Jobke | 2018-04-03 | 1 | -0/+1 |
| |\ \ | | | | | | | [stable13] Fix search text overlapping close button | ||||
| | * | | Fix search text overlapping clode button | Julius Härtl | 2018-03-28 | 1 | -0/+1 |
| | |/ | | | | | | | | | | | fixes #8701 Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | Merge pull request #9015 from nextcloud/backport-apps-versions | Morris Jobke | 2018-04-03 | 2 | -18/+45 |
| |\ \ | | | | | | | [stable13] Use app version to generate scss filename | ||||
| | * | | Use app version to generate scss filename | John Molakvoæ (skjnldsv) | 2018-03-28 | 2 | -18/+45 |
| | | | | | | | | | | | | | | | | | | | Fixed scsscacher tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
| * | | | Merge pull request #9020 from nextcloud/stable13-8983 | Morris Jobke | 2018-04-03 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | [stable13] Clear any theming prefixed cache on cache buster increase | ||||
| | * | | | Fix tests | Julius Härtl | 2018-03-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| | * | | | Clear any theming prefixed cache on cache buster increase | Julius Härtl | 2018-03-28 | 1 | -1/+1 |
| | | |/ | |/| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-03 | 14 | -16/+150 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-02 | 12 | -32/+126 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-01 | 4 | -4/+4 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-31 | 32 | -4/+66 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-30 | 2 | -0/+2 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-29 | 14 | -4/+46 |
| |/ / | |||||
| * | | Revert "update icewind/smb to 2.0.5" | Robin Appelman | 2018-03-28 | 10 | -44/+24 |
| | | | | | | | | | | | | | accidental push to wrong branch This reverts commit 3b35cd07493a3ae05b7106808dcec41a8899deec. | ||||
| * | | update icewind/smb to 2.0.5 | Robin Appelman | 2018-03-28 | 10 | -24/+44 |
| |/ | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-28 | 122 | -116/+366 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-27 | 4 | -0/+6 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-26 | 12 | -0/+18 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-25 | 20 | -10/+154 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-24 | 16 | -0/+22 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-23 | 34 | -10/+48 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-22 | 128 | -354/+566 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-21 | 136 | -392/+412 |
| | | |||||
| * | Merge pull request #8905 from ↵ | Roeland Jago Douma | 2018-03-20 | 3 | -4/+12 |
| |\ | | | | | | | | | nextcloud/stable13-8843-set-share-with-field-to-the-id-of-the-circle [stable13] Set "share with" field to the ID of the circle | ||||
| | * | Use the display name in the avatar for a circle share | Daniel Calviño Sánchez | 2018-03-20 | 2 | -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 circle | Daniel Calviño Sánchez | 2018-03-20 | 1 | -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 #8900 from nextcloud/backport/8822/stable13 | Roeland Jago Douma | 2018-03-20 | 1 | -5/+11 |
| |\ \ | |/ |/| | [stable13] the FN is optional, carrying the displayname if present | ||||
| | * | the FN is optional, carrying the displayname if present | Arthur Schiwon | 2018-03-20 | 1 | -5/+11 |
| |/ | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-20 | 22 | -42/+160 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-19 | 2 | -40/+120 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-18 | 6 | -6/+8 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-17 | 42 | -4/+60 |
| | | |||||
| * | Merge pull request #8849 from nextcloud/backport/8835/stable13 | Roeland Jago Douma | 2018-03-16 | 1 | -1/+2 |
| |\ | | | | | [stable13] group existence check works without attribute (like with users) | ||||
| | * | existence check works without attribute (like with users) | Arthur Schiwon | 2018-03-16 | 1 | -1/+2 |
| |/ | | | | | | cn is not necessarily given everywhere Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-16 | 8 | -12/+36 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-15 | 156 | -224/+252 |
| | | |||||
| * | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-14 | 152 | -758/+848 |
| | | |||||
| * | Merge pull request #8807 from nextcloud/final-13.0.1v13.0.1 | Morris Jobke | 2018-03-13 | 1 | -2/+2 |
| |\ | | | | | [stable13] 13.0.1 | ||||
| | * | 13.0.1 | Morris Jobke | 2018-03-13 | 1 | -2/+2 |
| |/ | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |