summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5474 from nextcloud/wording-4925Morris Jobke2017-06-215-45/+45
|\ | | | | Improve wording of various error messages
| * Improve wording of various error messagesJan-Christoph Borchardt2017-06-215-45/+45
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #5252 from derkostka/masterMorris Jobke2017-06-212-2/+2
|\ \ | | | | | | Use realpath to obtain the webroot.
| * | Squashed the webroot fixSebastian Kostka2017-06-202-2/+2
| | | | | | | | | | | | Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-2118-2/+354
| | |
* | | Merge pull request #5479 from nextcloud/pr-5459-follow-upMorris Jobke2017-06-201-10/+8
|\ \ \ | | | | | | | | Also allow group admins to toogle the storage location
| * | | Also allow group admins to toogle the storage locationJoas Schilling2017-06-201-10/+8
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | / [tx-robot] updated from transifexNextcloud bot2017-06-2030-58/+78
| |/ |/|
* | Merge pull request #5459 from ↵Morris Jobke2017-06-191-8/+24
|\ \ | | | | | | | | | | | | nextcloud/issue-5399-dont-reload-on-subadmin-setting-change Don't try to save the setting when its not an admin
| * | Don't try to save the setting when its not an adminJoas Schilling2017-06-191-8/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5450 from nextcloud/fix-appmenu-more-themingMorris Jobke2017-06-191-0/+3
|\ \ \ | | | | | | | | Fix more icon in apps menu on bright backgrounds
| * | | Fix more icon in apps menu on bright backgroundsJulius Härtl2017-06-171-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #5091 from nextcloud/shared-cache-during-initRobin Appelman2017-06-191-1/+8
|\ \ \ \ | | | | | | | | | | dont die if we try to access the shared cache while setting up the shared storage
| * | | | dont die if we try to access the shared cache while setting up the shared ↵Robin Appelman2017-05-241-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #5447 from nextcloud/calendar-icon-whiteJan-Christoph Borchardt2017-06-199-7/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | Add white version of the calendar.svg icon
| * | | | Add CSS class for icon-calendarMarin Treselj2017-06-171-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | Add viewport to all core/img/places/* icons.Marin Treselj2017-06-179-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed some unneeded style declarations. Signed-off-by: Marin Treselj <marin@pixelipo.com>
| * | | | Add white version of the calendar.svg iconMarin Treselj2017-06-162-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason for not including it and it is needed for Deck app. Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | | | Merge pull request #5429 from nextcloud/cache-baseurlMorris Jobke2017-06-186-66/+133
|\ \ \ \ \ | | | | | | | | | | | | Use base url for cache prefix and SCSS caching
| * | | | | Fix testsJulius Härtl2017-06-161-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Fix theming app to also use the prefixJulius Härtl2017-06-161-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Add tests and inject IRequestJulius Härtl2017-06-163-32/+65
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Do not open version file againJulius Härtl2017-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Make cache and scss caching depend on the baseUrlJulius Härtl2017-06-154-15/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | [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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 03:25:33 +0000