summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-1920-2/+30
|
* Merge pull request #5423 from nextcloud/better-svg-optimizationMorris Jobke2017-06-171-1/+1
|\ | | | | Remove XML header and line breaks in SVG files.
| * Remove XML heared and line breaks in SVG files.Marin Treselj2017-06-151-1/+1
| | | | | | | | | | | | My suggestion for further SVG optimiztion - as mentioned in #5229 Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | Merge pull request #5436 from jplitza/patch-1Lukas Reschke2017-06-171-1/+1
|\ \ | | | | | | Fix 500 Internal Server Error on writing
| * | Fix 500 Internal Server Error on writingJan-Philipp Litza2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some not yet completely determined configurations, the following error could occur while writing a file: Error: Call to a member function getUsers() on null /var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true) /var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true) /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File)) /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user') /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by') /var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file') /var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array) /var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array) /var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true) /var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...') /var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...') [...] Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-1770-84/+194
| | |
* | | Merge pull request #5177 from Bekcpear/masterRobin Appelman2017-06-161-13/+15
|\ \ \ | |/ / |/| | Fix upload remaining time
| * | update core.jsBekcpear2017-06-161-1/+1
| | | | | | | | | | | | Signed-off-by: Yaojin Qian <i@ume.ink>
| * | Fix uploadrate value of 'original-title' attributeBekcpear2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | The unit of `data.bitrate` is bit, but the argument unit of `humanFileSize` function is byte, so it should be divided by 8. Signed-off-by: Yaojin Qian <i@ume.ink>
| * | Fix upload remaining timeBekcpear2017-06-161-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upload remaining time is always 'a few second' whatever a big or a small file uploading. This commit fixes it. The `new Date().getMilliseconds()` only return a three digits number. When time arrived the next second, the millisecond start from ZERO again. So `new Date().getTime()` is the righe choice. And remaining time variables shoule be initialized when the file starts uploading, otherwise the remaining time of a new upload will always be 'Infinity years' until you refresh the page. Signed-off-by: Yaojin Qian <i@ume.ink>
* | | Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-itemsJoas Schilling2017-06-162-4/+11
|\ \ \ | | | | | | | | Allow dir-listing also when one child is blocked by access control
| * | | Fix unit testJoas Schilling2017-06-071-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow dir-listing also when one child is blocked by access controlJoas Schilling2017-05-261-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-1676-52/+176
| | | |
* | | | Merge pull request #5421 from nextcloud/5190-masterMorris Jobke2017-06-151-9/+32
|\ \ \ \ | | | | | | | | | | [master] Treat PHP Errors on User session regenerate
| * | | | Forward port of #5190 to masterArthur Schiwon2017-06-151-9/+32
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Treat PHP Errors on User session regenerate Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> remove unnecessary lines… Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> change PHP errors to ErrorException in the session (PHP >=7) Otherwise it might be that authentication apps are being disabled on during operation while in fact the session handler has hiccup. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #5396 from nextcloud/gpx-mimetypeblizzz2017-06-155-1/+32
|\ \ \ \ | |/ / / |/| | | add gpx mimetype
| * | | bycatch, x-ldif entry was missingArthur Schiwon2017-06-142-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | add location filetype iconArthur Schiwon2017-06-142-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | added kml, kmz, tcx types as well while at itArthur Schiwon2017-06-143-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | add geospatial mime types repair stepArthur Schiwon2017-06-141-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | add gpx mimetypeArthur Schiwon2017-06-142-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #5298 from ↵Morris Jobke2017-06-145-0/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/4885/calendar_shares_url_special_char_issue urldecode group principals in Cal- and CardDAV backend
| * | | | urldecode group principals in Cal- and CardDAV backendGeorg Ehrke2017-06-125-0/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #5300 from ↵Morris Jobke2017-06-142-0/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/fix_proppatch_requests_to_groupshares allow users to send PropPatch request when calendar is group-shared with them
| * | | | | allow users to send PropPatch request when calendar is group-shared with themGeorg Ehrke2017-06-082-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #5375 from nextcloud/share-folder-for-remote-sharesMorris Jobke2017-06-141-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use the share_folder config for remote shares
| * | | | | | Use the share_folder config for remote sharesJoas Schilling2017-06-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-15170-432/+652
| | | | | | |
* | | | | | | Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-emailMorris Jobke2017-06-142-7/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow to find local users by their email address
| * | | | | | | Add unit testJoas Schilling2017-06-141-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Make sure to only add system users onceJoas Schilling2017-06-141-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Allow to find local users by their email addressJoas Schilling2017-06-131-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | | Merge pull request #5244 from nextcloud/dynamic-percentual-appmenu-limitMorris Jobke2017-06-141-2/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Now using dynamic percentual appmenu limit
| * | | | | | | | Show at least 8 icons, don't use percentage on mobileJulius Härtl2017-06-141-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | | Decimal percentage, dynamic appIcon widthPatrik Kernstock2017-06-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
| * | | | | | | | Now using dynamic percentual appmenu limitPatrik Kernstock2017-06-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Patrik Kernstock <info@pkern.at>
* | | | | | | | | Merge pull request #4993 from michaelletzgus/emit_css-tagsMorris Jobke2017-06-144-19/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Emit css tags
| * | | | | | | | | Streamline templates, more DRYMichael Letzgus2017-05-254-19/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use Unified function to emit <link> tags for css loading, obey "Don't Repeat Yourself" ;-) (Next step might by to combine this with the emit <script> function (even more DRY?) AND move all this to a better place?) Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
* | | | | | | | | | Merge pull request #5409 from nextcloud/1param2muchJoas Schilling2017-06-141-2/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | a parameter too much
| * | | | | | | | | | a parameter too muchArthur Schiwon2017-06-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | | | Merge pull request #5400 from nextcloud/fix/contactsmenu-l10n-search-placeholderJoas Schilling2017-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Localize contacts menu search input placeholder
| * | | | | | | | | | Localize contacts menu search input placeholderChristoph Wurst2017-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | | | Merge pull request #5013 from nextcloud/update-integration-tests-composer-cacheLukas Reschke2017-06-141-30/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update integration tests composer cache
| * | | | | | | | | | | Update integration tests composer cacheMorris Jobke2017-06-141-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | | | Merge pull request #5392 from nextcloud/maintenance-mode-styleLukas Reschke2017-06-142-10/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Use the guest.css for the maintenance page as well
| * | | | | | | | | | | | Use the guest.css for the maintenance page as wellMorris Jobke2017-06-132-10/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | | | Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-checkblizzz2017-06-142-9/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | remove check, user_webdavauth is not an app anymore for long
| * | | | | | | | | | | remove check, user_webdavauth is not an app anymore for longArthur Schiwon2017-06-012-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | | | | | | | Merge pull request #5361 from ↵Lukas Reschke2017-06-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/exclude-files-external-dir-from-encryption don't try to encrypt/decrypt the certificate bundle