summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix testsRoeland Jago Douma2017-09-251-1/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Add annotationRoeland Jago Douma2017-09-251-0/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* For images we have a preview for use the preview linkRoeland Jago Douma2017-09-252-1/+3
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Add direct preview link to single shared image filesRoeland Jago Douma2017-09-252-0/+54
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Allow requesting the max previewRoeland Jago Douma2017-09-251-0/+6
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #6630 from nextcloud/same_site_cookie_middlewareMorris Jobke2017-09-259-18/+313
|\ | | | | Handle SameSiteCookie check for index.php in AppFramework Middleware
| * Handle SameSiteCookie check for index.php in AppFramework MiddlewareRoeland Jago Douma2017-09-249-18/+313
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6633 from nextcloud/dav-remove-like-when-not-neededJoas Schilling2017-09-251-1/+5
|\ \ | | | | | | Don't add a LIKE condition when it's not needed
| * | Don't add a LIKE condition when it's not neededThomas Citharel2017-09-251-1/+5
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #6631 from nextcloud/fix_6170Morris Jobke2017-09-252-1/+51
|\ \ \ | |/ / |/| | Add indexes to cards and cards_properties tables
| * | Add indexes to cards and cards_properties tablesRoeland Jago Douma2017-09-252-1/+51
| |/ | | | | | | | | | | Fixes #6170 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / [tx-robot] updated from transifexNextcloud bot2017-09-252-2/+2
|/
* Merge pull request #6591 from ↵Roeland Jago Douma2017-09-242-4/+12
|\ | | | | | | | | nextcloud/unify-appearance-of-avatars-for-undefined-and-unknown-users Unify appearance of avatars for undefined and unknown users
| * Extract setting the avatar for the unknown user to its own functionDaniel Calviño Sánchez2017-09-201-4/+7
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Use "?" instead of user ID as seed for the image placeholderDaniel Calviño Sánchez2017-09-202-2/+2
| | | | | | | | | | | | | | | | | | | | The seed of the image placeholder is needed to generate the background color of the image, but as the background color is later overriden any seed could be used. When no text is explicitly given the seed is used as text too, so there is no need to pass the user ID and simply using "?" as seed is enough. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Unify appearance of avatars for undefined and unknown usersDaniel Calviño Sánchez2017-09-202-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling the jQuery avatar plugin with a user that did not exist (that is, users for which "/avatar/{user}/{size}" return a JSON response with an empty "displayname" value) "?" on a grey background was shown. However, if the jQuery avatar plugin was called with an undefined JavaScript value then "?" was shown on a bluish background. This commit unifies both cases to use the grey background. The unit tests were also modified to ensure that the grey background is used in both cases. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #6623 from nextcloud/fix-app-nav-imgRoeland Jago Douma2017-09-242-3/+3
|\ \ | | | | | | Fix app nav img margin
| * | fix width of editing & deleted formJohn Molakvoæ (skjnldsv)2017-09-231-0/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Img margin leftJohn Molakvoæ (skjnldsv)2017-09-231-0/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix settings navigationJohn Molakvoæ (skjnldsv)2017-09-232-3/+1
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-09-238-0/+22
| |
* | Merge pull request #6611 from nextcloud/fix-webroot-detectionRoeland Jago Douma2017-09-221-1/+1
|\ \ | | | | | | Fixed webroot detection
| * | Fixed webroot detectionJohn Molakvoæ (skjnldsv)2017-09-221-1/+1
|/ / | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2017-09-2226-8/+132
| |
* | Merge pull request #6605 from nextcloud/oc_ocs_response_is_depMorris Jobke2017-09-217-47/+19
|\ \ | | | | | | OC_OCS_Response is deprecated
| * | Fix commentMorris Jobke2017-09-211-1/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Remove private legacy OC_OCS_ResponseRoeland Jago Douma2017-09-211-28/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | OC_OCS_Response is deprecatedRoeland Jago Douma2017-09-215-18/+18
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #6399 from nextcloud/app-navigation-flexJohn Molakvoæ2017-09-219-225/+375
|\ \ \ | |/ / |/| | App navigation flex
| * | Fix testsRoeland Jago Douma2017-09-212-0/+16
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Avoid error undefined index classes in logJohn Molakvoæ (skjnldsv)2017-09-211-0/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | damn you firefox default valuesJohn Molakvoæ (skjnldsv)2017-09-211-1/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix editing field animationJohn Molakvoæ (skjnldsv)2017-09-211-3/+6
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Relative positionning to liJohn Molakvoæ (skjnldsv)2017-09-211-4/+7
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Quota icon by @jancborchardtJohn Molakvoæ (skjnldsv)2017-09-211-3/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix unit testsMorris Jobke2017-09-211-0/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | create special class forst first pinned class occurrenceJohn Molakvoæ (skjnldsv)2017-09-212-6/+8
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Quota.svgJohn Molakvoæ (skjnldsv)2017-09-211-0/+5
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | hack first class occurence .pinnedJohn Molakvoæ (skjnldsv)2017-09-211-3/+4
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix quota orderJohn Molakvoæ (skjnldsv)2017-09-212-9/+8
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Quota orderJohn Molakvoæ (skjnldsv)2017-09-211-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Unwanted css for trashbinJohn Molakvoæ (skjnldsv)2017-09-211-14/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Unwanted css for trashbinJohn Molakvoæ (skjnldsv)2017-09-211-5/+0
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Removed unwanted css and add quota iconJohn Molakvoæ (skjnldsv)2017-09-211-7/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Add possibility to pin nav entries at the bottomJohn Molakvoæ (skjnldsv)2017-09-211-0/+10
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Add pinned class to trashbinJohn Molakvoæ (skjnldsv)2017-09-211-0/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Allow custom classes on nav entriesJohn Molakvoæ (skjnldsv)2017-09-211-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Flex to menu itemsJohn Molakvoæ (skjnldsv)2017-09-211-0/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix entry edit buttons bordersJohn Molakvoæ (skjnldsv)2017-09-211-3/+7
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Align edit input with its corresponding link text and fix animationJohn Molakvoæ (skjnldsv)2017-09-211-7/+15
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>