summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix copy paste errorsJoas Schilling2017-09-291-3/+3
* Restore the sequencial orderJoas Schilling2017-09-294-4/+4
* Migrate ids to bigint in the dav appJoas Schilling2017-09-291-0/+35
* Migrate the twofactor_backupcodes app to bigintJoas Schilling2017-09-292-1/+26
* Migrate all core id columns to bigintJoas Schilling2017-09-294-1/+45
* Add a base migration for easy updating to bigintsJoas Schilling2017-09-293-0/+68
* [tx-robot] updated from transifexNextcloud bot2017-09-2842-128/+788
* Merge pull request #6599 from nextcloud/fix_2523Morris Jobke2017-09-276-2/+69
|\
| * Only have direct preview urls for image filesRoeland Jago Douma2017-09-251-2/+5
| * Fix testsRoeland Jago Douma2017-09-251-1/+2
| * Add annotationRoeland Jago Douma2017-09-251-0/+1
| * For images we have a preview for use the preview linkRoeland Jago Douma2017-09-252-1/+3
| * Add direct preview link to single shared image filesRoeland Jago Douma2017-09-252-0/+54
| * Allow requesting the max previewRoeland Jago Douma2017-09-251-0/+6
* | Merge pull request #6653 from nextcloud/fix-cursor-on-user-settings-tableMorris Jobke2017-09-271-5/+8
|\ \
| * | Remove unneeded CSS rulesDaniel Calviño Sánchez2017-09-261-3/+3
| * | Remove "cursor: pointer" from quota cellDaniel Calviño Sánchez2017-09-261-1/+1
| * | Set "cursor: pointer" for email addressesDaniel Calviño Sánchez2017-09-261-2/+5
* | | Merge pull request #6666 from nextcloud/federation-menu-triangleJohn Molakvoæ2017-09-273-31/+30
|\ \ \
| * | | No js for popover positionningJohn Molakvoæ (skjnldsv)2017-09-272-11/+1
| * | | Fix style of federation scope menu triangles, simplify CSSJan-Christoph Borchardt2017-09-272-20/+29
|/ / /
* | | Merge pull request #6586 from nextcloud/fix/app-install-extract-checkRoeland Jago Douma2017-09-271-1/+8
|\ \ \
| * | | Check whether an app archive can be extractedChristoph Wurst2017-09-201-1/+8
* | | | Merge pull request #6645 from nextcloud/fix-6642-only-colons-for-ipv6Morris Jobke2017-09-271-48/+63
|\ \ \ \
| * | | | Code clean upJoas Schilling2017-09-261-48/+47
| * | | | Only allow colons in db host for IPv6 addressesJoas Schilling2017-09-261-0/+16
| | |/ / | |/| |
* | | | Merge pull request #6660 from nextcloud/remove_saml_hackMorris Jobke2017-09-271-16/+1
|\ \ \ \
| * | | | Remove SAML hack from base.phpRoeland Jago Douma2017-09-271-16/+1
* | | | | Merge pull request #6658 from nextcloud/fix_6618Morris Jobke2017-09-272-0/+10
|\ \ \ \ \
| * | | | | Don't show placeholder when we have loaded the avatar imageRoeland Jago Douma2017-09-262-0/+10
| |/ / / /
* / / / / [tx-robot] updated from transifexNextcloud bot2017-09-2716-4/+154
|/ / / /
* | | | Merge pull request #6646 from nextcloud/federation-activeRoeland Jago Douma2017-09-261-3/+5
|\ \ \ \
| * | | | Highlight active federation scope menu entry with bold headingJan-Christoph Borchardt2017-09-261-3/+5
| |/ / /
* | | | Merge pull request #6650 from nextcloud/tooltip-shadow-use-variableJan-Christoph Borchardt2017-09-261-1/+1
|\ \ \ \
| * | | | Fit the tooltip shadow to the default variableJohn Molakvoæ (skjnldsv)2017-09-261-1/+1
* | | | | Merge pull request #6647 from nextcloud/scss-no-take-only-throwJohn Molakvoæ2017-09-261-0/+2
|\ \ \ \ \
| * | | | | Do not stop on scss compilation failureJohn Molakvoæ (skjnldsv)2017-09-261-0/+2
| |/ / / /
* | | | | Merge pull request #6643 from nextcloud/improved-redis-warningMorris Jobke2017-09-262-1/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improve exception handlingMorris Jobke2017-09-262-1/+13
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-09-2614-4/+68
* | | | 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