summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-2422-116/+144
|
* Merge pull request #5517 from nextcloud/enhanced-failure-loggingMorris Jobke2017-06-231-1/+1
|\ | | | | Enhance the logging if the part file can not be renamed
| * Enhance the logging if the part file can not be renamedMorris Jobke2017-06-221-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5518 from nextcloud/deprecate-old-logMorris Jobke2017-06-232-0/+2
|\ \ | | | | | | Deprecate static writeLog() method
| * | Deprecate static writeLog() methodMorris Jobke2017-06-232-0/+2
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #5508 from nextcloud/no-activity-before-loginblizzz2017-06-231-3/+6
|\ \ | | | | | | Don't create activities for email and password change before login
| * | Don't create activities for email and password change before loginJoas Schilling2017-06-221-3/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-23142-126/+190
| | |
* | | Merge pull request #5498 from nextcloud/allow-to-force-a-languageMorris Jobke2017-06-2212-288/+319
|\ \ \ | |_|/ |/| | Allow to force a language and set it via the ocs api
| * | Update autoloaderMorris Jobke2017-06-212-2/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add unit tests for the new codeJoas Schilling2017-06-211-0/+180
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to force a language and set it via the ocs apiJoas Schilling2017-06-2110-286/+139
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5491 from ↵blizzz2017-06-221-0/+13
|\ \ | | | | | | | | | | | | nextcloud/issue-5457-create-users-in-non-default-backends Create users in non default backends first
| * | Create users in non default backends firstJoas Schilling2017-06-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the time, when people have multiple backends or add a custom backend, they want to create the users there and not in the default backend. But since that is registered first, users were always created there. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-2256-210/+212
| | |
* | | 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