summaryrefslogtreecommitdiffstats
Commit message (Collapse)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.php
| * Fix typos in config.sample.phpMorris Jobke2017-12-041-3/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-12-058-42/+66
| |
* | Merge pull request #7319 from nextcloud/remove-svg-shadowsMorris Jobke2017-12-043-12/+36
|\ \ | |/ |/| Remove svg shadows
| * Fix syntax errorMorris Jobke2017-12-041-0/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Define icon-shadow only in context of icon-whiteMarin Treselj2017-11-301-7/+2
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * Revert removing of deprecated iconsMarin Treselj2017-11-2813-0/+13
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * Remove deprecated white, shaded iconsMarin Treselj2017-11-2813-13/+0
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * Add new .icon-white and .icon-shadow classes, add toggle-background iconMarin Treselj2017-11-283-11/+39
| | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | [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 docs
| * | Fix PHP doc for API docsMorris Jobke2017-12-032-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [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 userids
| * | check userExists later, saves lookups for appData_INSTANCEID useridsArthur Schiwon2017-12-011-1/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7347 from nextcloud/fix-3245Morris Jobke2017-12-012-1/+16
|\ \ \ | |/ / |/| | Allow to skip data dir permission checks by config
| * | Allow to skip data dir permission checks by configArthur Schiwon2017-11-302-1/+16
| | | | | | | | | | | | | | | | | | | | | Enables installation on services that don't allow/support permission changes. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [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 menu
| * | Fix translation of federation scope menuMorris Jobke2017-11-301-6/+6
|/ / | | | | | | | | | | | | | | * l10n in Nextcloud works by extracting the values only passed on their location and not based on the first parameter * we need to change the translation pool from `core` to `settings` then * fixes #7345 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2017-11-3030-38/+128
| |
* | Merge pull request #7343 from ↵Morris Jobke2017-11-294-0/+78
|\ \ | | | | | | | | | | | | nextcloud/fix_exception_on_unreachable_server_take2 Actually set the status so we don't cause another exception
| * | Actually set the status so we don't cause another exceptionRoeland Jago Douma2017-11-294-0/+78
|/ / | | | | | | | | | | * And add tests so I don't mess up again Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | 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 occured
| * | Do not log Exception if a connection error occuredRoeland Jago Douma2017-11-292-0/+6
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #7316 from ↵Roeland Jago Douma2017-11-291-3/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 Fix silent conflicts due to merging #7256 after #7251
| * | | Fix silent conflicts due to merging #7256 after #7251Daniel Calviño Sánchez2017-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although #7256 was merged cleanly some of the changes really conflicted with those introduced by the last commit of #7251, and this broke the appearance of the author row of comments. This commit fixes those silent conflicts and restores the appearance of the author row. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #7333 from nextcloud/mario-readme-patchRoeland Jago Douma2017-11-291-1/+1
|\ \ \ \ | |_|/ / |/| | | Update README.md
| * | | Update README.mdMario Đanić2017-11-291-1/+1
|/ / / | | | | | | authentification is not a real word :)
* | | [tx-robot] updated from transifexNextcloud bot2017-11-2924-0/+186
| | |
* | | Merge pull request #7327 from ↵blizzz2017-11-282-3/+120
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/bugfix/7325/access-list-regression-for-not-current-accesss Only in case of $currentAccess the array uses the user id as index
| * | Only in case of $currentAccess the array uses the id as indexJoas Schilling2017-11-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise its a normal string[] with the user ids, in that case the array_merge did it's job just fine, apart from it not being deduplicated. The array+array is only needed when the user id is the key, so integer only user ids are kept as they are instead of being reindexed. Regression from 3820d6883dffcaa49deb1054ae0f32ab3d3e39b1 Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix current access list test and add one for $currentAccess === falseJoas Schilling2017-11-281-2/+113
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / [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 Safari
| * Fix contacts menu height for SafariMorris Jobke2017-11-271-0/+1
| | | | | | | | | | | | | | * fixes #5119 * in Safari the input field was 38px in height and not 34px like in all other browsers Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | 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 requests
| * | catch errors when parsing calendar data for calendar query requestsGeorg Ehrke2017-11-276-5/+44
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #7305 from nextcloud/log-level-for-log-extendingMorris Jobke2017-11-272-4/+5
|\ \ \ | | | | | | | | Pass log level to log reporters
| * | | Pass log level to log reportersMorris Jobke2017-11-272-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7292 from Neraste/fix/4789_disabled_usersLukas Reschke2017-11-271-3/+3
|\ \ \ \ | | | | | | | | | | Fix #4789: Group admins cannot see disabled users
| * | | | 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 level
| * | | | | Log InvalidSyncToken on DAV in debug levelMorris Jobke2017-11-271-0/+3
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7307 from nextcloud/do-not-log-not-implemented-davLukas Reschke2017-11-271-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Log NotImplementedException on DAV in debug level
| * | | | Log NotImplementedException on DAV in debug levelMorris Jobke2017-11-271-0/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7222 from nextcloud/fix-filerow-avatarsblizzz2017-11-277-145/+241
|\ \ \ \ | | | | | | | | | | Fix filerow avatars
| * | | | fix sorting test on phantomjsArthur Schiwon2017-11-241-15/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-01 23:42:59 +0000