summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6544 from nextcloud/fix/duplicate-session-tokenMorris Jobke2017-09-252-0/+9
|\
| * Fix duplicate session token after remembered loginChristoph Wurst2017-09-202-0/+9
* | Merge pull request #6372 from nextcloud/scss-normalizationJohn Molakvoæ2017-09-2520-1466/+1342
|\ \
| * | Fixed testsJohn Molakvoæ (skjnldsv)2017-09-251-8/+9
| * | Fix busy state loading animation in filesJohn Molakvoæ (skjnldsv)2017-09-232-5/+11
| * | Removed unused filter for opacity, fix #6408John Molakvoæ (skjnldsv)2017-09-2312-78/+0
| * | Settings button as nav entryJohn Molakvoæ (skjnldsv)2017-09-231-11/+15
| * | Replaced colours by variablesJohn Molakvoæ (skjnldsv)2017-09-238-109/+83
| * | Settings scssJohn Molakvoæ (skjnldsv)2017-09-232-1312/+1284
| * | Removed unneeded bgs and borders. Replaced hard coded colours byJohn Molakvoæ (skjnldsv)2017-09-237-33/+30
* | | Merge pull request #6632 from nextcloud/do_not_show_hyphenRoeland Jago Douma2017-09-253-3/+3
|\ \ \
| * | | expect call of getSlogan() exactly twiceStephan Müller2017-09-251-1/+1
| * | | do not show hyphen after instance name in emails if slogan does not existStephan Müller2017-09-252-2/+2
* | | | Merge pull request #6627 from nextcloud/icon-on-apps-settingsJoas Schilling2017-09-2514-6/+73
|\ \ \ \
| * | | | Fix typoJohn Molakvoæ (skjnldsv)2017-09-251-2/+2
| * | | | Icons & default classesJohn Molakvoæ (skjnldsv)2017-09-2414-7/+74
* | | | | Merge pull request #6630 from nextcloud/same_site_cookie_middlewareMorris Jobke2017-09-259-18/+313
|\ \ \ \ \
| * | | | | Handle SameSiteCookie check for index.php in AppFramework MiddlewareRoeland Jago Douma2017-09-249-18/+313
* | | | | | 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 neededThomas Citharel2017-09-251-1/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #6631 from nextcloud/fix_6170Morris Jobke2017-09-252-1/+51
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add indexes to cards and cards_properties tablesRoeland Jago Douma2017-09-252-1/+51
| |/ / / /
* / / / / [tx-robot] updated from transifexNextcloud bot2017-09-252-2/+2
|/ / / /
* | | | Merge pull request #6591 from nextcloud/unify-appearance-of-avatars-for-undef...Roeland Jago Douma2017-09-242-4/+12
|\ \ \ \
| * | | | Extract setting the avatar for the unknown user to its own functionDaniel Calviño Sánchez2017-09-201-4/+7
| * | | | Use "?" instead of user ID as seed for the image placeholderDaniel Calviño Sánchez2017-09-202-2/+2
| * | | | Unify appearance of avatars for undefined and unknown usersDaniel Calviño Sánchez2017-09-202-0/+5
* | | | | Merge pull request #6623 from nextcloud/fix-app-nav-imgRoeland Jago Douma2017-09-242-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix width of editing & deleted formJohn Molakvoæ (skjnldsv)2017-09-231-0/+1
| * | | | Img margin leftJohn Molakvoæ (skjnldsv)2017-09-231-0/+1
| * | | | Fix settings navigationJohn Molakvoæ (skjnldsv)2017-09-232-3/+1
|/ / / /
* | | | [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 detectionJohn Molakvoæ (skjnldsv)2017-09-221-1/+1
|/ / / /
* | | | [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
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix commentMorris Jobke2017-09-211-1/+1
| * | | Remove private legacy OC_OCS_ResponseRoeland Jago Douma2017-09-211-28/+0
| * | | OC_OCS_Response is deprecatedRoeland Jago Douma2017-09-215-18/+18
* | | | Merge pull request #6399 from nextcloud/app-navigation-flexJohn Molakvoæ2017-09-219-225/+375
|\ \ \ \ | |/ / / |/| | |
| * | | Fix testsRoeland Jago Douma2017-09-212-0/+16
| * | | Avoid error undefined index classes in logJohn Molakvoæ (skjnldsv)2017-09-211-0/+3
| * | | damn you firefox default valuesJohn Molakvoæ (skjnldsv)2017-09-211-1/+2
| * | | Fix editing field animationJohn Molakvoæ (skjnldsv)2017-09-211-3/+6
| * | | Relative positionning to liJohn Molakvoæ (skjnldsv)2017-09-211-4/+7
| * | | Quota icon by @jancborchardtJohn Molakvoæ (skjnldsv)2017-09-211-3/+2
| * | | Fix unit testsMorris Jobke2017-09-211-0/+1
| * | | create special class forst first pinned class occurrenceJohn Molakvoæ (skjnldsv)2017-09-212-6/+8
| * | | Quota.svgJohn Molakvoæ (skjnldsv)2017-09-211-0/+5
| * | | hack first class occurence .pinnedJohn Molakvoæ (skjnldsv)2017-09-211-3/+4