summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-12-0620-6/+88
* Merge pull request #7391 from nextcloud/config-sampleJohn Molakvoæ2017-12-051-3/+2
|\
| * Fix typos in config.sample.phpMorris Jobke2017-12-041-3/+2
* | [tx-robot] updated from transifexNextcloud bot2017-12-058-42/+66
* | Merge pull request #7319 from nextcloud/remove-svg-shadowsMorris Jobke2017-12-043-12/+36
|\ \ | |/ |/|
| * Fix syntax errorMorris Jobke2017-12-041-0/+1
| * Define icon-shadow only in context of icon-whiteMarin Treselj2017-11-301-7/+2
| * Revert removing of deprecated iconsMarin Treselj2017-11-2813-0/+13
| * Remove deprecated white, shaded iconsMarin Treselj2017-11-2813-13/+0
| * Add new .icon-white and .icon-shadow classes, add toggle-background iconMarin Treselj2017-11-283-11/+39
* | [tx-robot] updated from transifexNextcloud bot2017-12-0410-0/+26
* | Merge pull request #7370 from nextcloud/fix-php-docRoeland Jago Douma2017-12-032-2/+2
|\ \
| * | Fix PHP doc for API docsMorris Jobke2017-12-032-2/+2
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-12-034-0/+16
* | [tx-robot] updated from transifexNextcloud bot2017-12-0214-10/+100
* | Merge pull request #7361 from nextcloud/cheap-check-firstMorris Jobke2017-12-011-1/+1
|\ \
| * | check userExists later, saves lookups for appData_INSTANCEID useridsArthur Schiwon2017-12-011-1/+1
* | | Merge pull request #7347 from nextcloud/fix-3245Morris Jobke2017-12-012-1/+16
|\ \ \ | |/ / |/| |
| * | Allow to skip data dir permission checks by configArthur Schiwon2017-11-302-1/+16
* | | [tx-robot] updated from transifexNextcloud bot2017-12-01202-0/+1282
* | | Merge pull request #7346 from nextcloud/fix-federation-scope-menu-l10nJoas Schilling2017-11-301-6/+6
|\ \ \ | |/ / |/| |
| * | Fix translation of federation scope menuMorris Jobke2017-11-301-6/+6
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-11-3030-38/+128
* | Merge pull request #7343 from nextcloud/fix_exception_on_unreachable_server_t...Morris Jobke2017-11-294-0/+78
|\ \
| * | Actually set the status so we don't cause another exceptionRoeland Jago Douma2017-11-294-0/+78
|/ /
* | Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_serverRoeland Jago Douma2017-11-292-0/+6
|\ \
| * | Do not log Exception if a connection error occuredRoeland Jago Douma2017-11-292-0/+6
* | | Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7...Roeland Jago Douma2017-11-291-3/+3
|\ \ \
| * | | Fix silent conflicts due to merging #7256 after #7251Daniel Calviño Sánchez2017-11-281-3/+3
* | | | Merge pull request #7333 from nextcloud/mario-readme-patchRoeland Jago Douma2017-11-291-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Update README.mdMario Đanić2017-11-291-1/+1
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-11-2924-0/+186
* | | Merge pull request #7327 from nextcloud/bugfix/7325/access-list-regression-fo...blizzz2017-11-282-3/+120
|\ \ \ | |_|/ |/| |
| * | Only in case of $currentAccess the array uses the id as indexJoas Schilling2017-11-281-1/+7
| * | Fix current access list test and add one for $currentAccess === falseJoas Schilling2017-11-281-2/+113
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-11-28314-1958/+1066
|/
* Merge pull request #7303 from nextcloud/fix-contact-menuMorris Jobke2017-11-271-0/+1
|\
| * Fix contacts menu height for SafariMorris Jobke2017-11-271-0/+1
* | Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_errorMorris Jobke2017-11-276-5/+44
|\ \
| * | catch errors when parsing calendar data for calendar query requestsGeorg Ehrke2017-11-276-5/+44
* | | Merge pull request #7305 from nextcloud/log-level-for-log-extendingMorris Jobke2017-11-272-4/+5
|\ \ \
| * | | Pass log level to log reportersMorris Jobke2017-11-272-4/+5
* | | | Merge pull request #7292 from Neraste/fix/4789_disabled_usersLukas Reschke2017-11-271-3/+3
|\ \ \ \
| * | | | Fix #4789: Group admins cannot see disabled usersNeraste2017-11-271-3/+3
* | | | | Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncTokenMorris Jobke2017-11-271-0/+3
|\ \ \ \ \
| * | | | | Log InvalidSyncToken on DAV in debug levelMorris Jobke2017-11-271-0/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #7307 from nextcloud/do-not-log-not-implemented-davLukas Reschke2017-11-271-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Log NotImplementedException on DAV in debug levelMorris Jobke2017-11-271-0/+4
| |/ / /
* | | | Merge pull request #7222 from nextcloud/fix-filerow-avatarsblizzz2017-11-277-145/+241
|\ \ \ \
| * | | | fix sorting test on phantomjsArthur Schiwon2017-11-241-15/+29