summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9731 from nextcloud/version/noid/13.0.3RC2v13.0.3RC2Morris Jobke2018-06-041-2/+2
|\
| * 13.0.3 RC 2Morris Jobke2018-06-041-2/+2
|/
* Merge pull request #9732 from nextcloud/stable13-fix-contacts-menu-local-null...Morris Jobke2018-06-041-1/+2
|\
| * Fix syntax for php5.6Christoph Wurst2018-06-041-1/+1
| * Fix local users check in contacts menuChristoph Wurst2018-06-041-1/+2
|/
* Merge pull request #9727 from nextcloud/nav-fixMorris Jobke2018-06-041-1/+1
|\
| * [stable13] Fix header navJohn Molakvoæ (skjnldsv)2018-06-041-1/+1
|/
* [tx-robot] updated from transifexNextcloud bot2018-06-0414-36/+38
* [tx-robot] updated from transifexNextcloud bot2018-06-0310-18/+20
* [tx-robot] updated from transifexNextcloud bot2018-06-026-146/+156
* Merge pull request #9700 from nextcloud/version/noid/13.0.3RC1v13.0.3RC1Morris Jobke2018-06-011-2/+2
|\
| * 13.0.3 RC 1Morris Jobke2018-06-011-2/+2
|/
* Merge pull request #9712 from nextcloud/backport/9711/stable13Morris Jobke2018-06-012-0/+4
|\
| * Fix the master unit testsRoeland Jago Douma2018-06-012-0/+4
|/
* Merge pull request #9610 from nextcloud/bugfix-stable13/3830/invitations_for_...Morris Jobke2018-06-011-0/+67
|\
| * send invitations for shared calendarsGeorg Ehrke2018-05-251-0/+67
* | Merge pull request #9694 from nextcloud/backport/9692/stable13Morris Jobke2018-06-011-1/+9
|\ \
| * | Make sure the log doesn't try to read from PUT if it can'tRoeland Jago Douma2018-05-301-1/+9
* | | Merge pull request #9707 from nextcloud/bugfix-stable13/noid/override_freebus...Morris Jobke2018-06-016-87/+168
|\ \ \
| * | | allow admins to override FreeBusy capabilities without modifying ShareAPI cap...Georg Ehrke2018-05-316-87/+168
* | | | [tx-robot] updated from transifexNextcloud bot2018-06-0134-12/+146
* | | | Merge pull request #9655 from nextcloud/backport/9268/stable13Roeland Jago Douma2018-05-3114-38/+252
|\ \ \ \ | |/ / / |/| | |
| * | | Remove not needed changeMorris Jobke2018-05-311-3/+1
| * | | Remove type hints for PHP 5.6Morris Jobke2018-05-314-4/+3
| * | | Move repairstep to a custom commandRoeland Jago Douma2018-05-306-39/+24
| * | | Fix testsRoeland Jago Douma2018-05-302-2/+16
| * | | Adding repair step which cleans shares of invalid principalsRoeland Jago Douma2018-05-306-11/+188
| * | | CalDAV and CardDAV plugins need to be registered for the principals collectio...Roeland Jago Douma2018-05-302-13/+29
| * | | When sharing calendars and addressbooks the principal has to be verified to b...Roeland Jago Douma2018-05-304-5/+18
| * | | Do not load calendar/addressbook plugins if not neededRoeland Jago Douma2018-05-301-16/+28
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2018-05-3134-166/+138
|/ /
* | Merge pull request #9654 from nextcloud/backport/9360/stable13Morris Jobke2018-05-302-6/+6
|\ \
| * | adjust unit tests for \"Invalid argument supplied for foreach()\" fixRoger Szabo2018-05-291-4/+4
| * | Fix "Invalid argument supplied for foreach()"Roger Szabo2018-05-291-2/+2
* | | Merge pull request #9668 from nextcloud/backport/9666/stable13Morris Jobke2018-05-302-0/+26
|\ \ \
| * | | Make sure the file is readable before attempting to create a previewRoeland Jago Douma2018-05-292-0/+26
* | | | Merge pull request #9662 from nextcloud/backport/9640/stable13Morris Jobke2018-05-302-7/+56
|\ \ \ \
| * | | | check user state when fetching to avoid dealing with offline objectsArthur Schiwon2018-05-292-7/+56
* | | | | Merge pull request #9657 from nextcloud/backport/9256/stable13Morris Jobke2018-05-306-89/+25
|\ \ \ \ \
| * | | | | improve error reporting and move format parameter to the optionsBjoern Schiessle2018-05-296-89/+25
| | |_|/ / | |/| | |
* | | | | Merge pull request #9672 from nextcloud/drone-mysqlmb4-fix-stable13Morris Jobke2018-05-301-1/+1
|\ \ \ \ \
| * | | | | Fix drone mysqlmb4 testsJohn Molakvoæ (skjnldsv)2018-05-301-1/+1
| |/ / / /
* | | / / [tx-robot] updated from transifexNextcloud bot2018-05-3064-14/+106
| |_|/ / |/| | |
* | | | Merge pull request #9650 from nextcloud/backport/8842/stable13Morris Jobke2018-05-291-8/+10
|\ \ \ \
| * | | | fix(AmazonS3): fix loop $result['Contents'] errorenoch2018-05-291-8/+10
| |/ / /
* | | | Merge pull request #9661 from nextcloud/backport/9288/stable13Roeland Jago Douma2018-05-292-11/+126
|\ \ \ \
| * | | | Remove unneeded semicolon and parenthesesRoger Szabo2018-05-291-1/+1
| * | | | css indent alignmentRoger Szabo2018-05-291-70/+87
| * | | | adjust css to nc13 core changesRoger Szabo2018-05-291-5/+107
| * | | | remove reset password linkRoger Szabo2018-05-291-5/+1
| |/ / /