aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-0958-56/+2
|
* Merge pull request #6847 from nextcloud/filelist-confict-path-12Morris Jobke2017-11-091-14/+17
|\ | | | | [12] still trigger conflict resolution for existing entries when the curre…
| * never show '/' as path for conflicting file namesRobin Appelman2017-11-071-1/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * still trigger conflict resolution for existing entries when the current ↵Robin Appelman2017-11-071-15/+16
| | | | | | | | | | | | entry doesn't need it Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-11-09314-1398/+2834
| |
* | Merge pull request #7114 from nextcloud/12-7110Morris Jobke2017-11-083-3/+3
|\ \ | | | | | | [stable12] theme flow redirection page
| * | Theming: theme flow redirection pageJulius Härtl2017-11-083-3/+3
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #7102 from ↵Morris Jobke2017-11-081-16/+0
|\ \ | | | | | | | | | | | | nextcloud/revert-6774-backport-6645-only-colons-for-ipv6 Revert "[stable12] Only allow colons in db host for IPv6 addresses"
| * | Revert "[stable12] Only allow colons in db host for IPv6 addresses"Morris Jobke2017-11-081-16/+0
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-11-0842-86/+2086
|/ /
* | Merge pull request #7096 from nextcloud/backport-stable12-7042Lukas Reschke2017-11-073-8/+115
|\ \ | |/ |/| [stable12] ensure uid for calendar objects is unique
| * ensure uid for calendar objects is uniqueGeorg Ehrke2017-11-073-8/+115
| | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #6699 from nextcloud/backport-6522-stable12Morris Jobke2017-11-0718-82/+121
|\ \ | | | | | | [stable12] fix LDAP User deletion (cleanup), fixes #3365
| * | Backport of #6522Arthur Schiwon2017-09-2918-82/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix LDAP User deletion (cleanup) discovered a bug in the integration test which lead to following a different code path and giving a false-positive success feedback. Also listens now to the evendispatcher instead of old hook system Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> fix test Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7095 from nextcloud/12-7059Morris Jobke2017-11-071-0/+2
|\ \ \ | |_|/ |/| | [stable12] hide spinner for initial install
| * | core: hide spinner for initial installKyle Fazzari2017-11-071-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | core/js/setup.js has logic to show the spinner upon form submission, but ever since v12 was released the spinner was never hidden in the first place. Modify core/css/guest.css to hide it, which allows core/js/setup.js to do its thing. Fix #5532 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | [tx-robot] updated from transifexNextcloud bot2017-11-0770-2/+6284
| |
* | Merge pull request #7082 from nextcloud/12-6974Morris Jobke2017-11-061-2/+22
|\ \ | | | | | | [stable12] Fix seeking on object storage
| * | Fix seeking on object storageMorris Jobke2017-11-061-2/+22
| | | | | | | | | | | | | | | | | | Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7081 from nextcloud/12-6958Morris Jobke2017-11-063-1/+15
|\ \ \ | | | | | | | | [stable12] Improve mimetype detection for object storages
| * | | Improve mimetype detection for object storagesMorris Jobke2017-11-063-1/+15
| |/ / | | | | | | | | | | | | | | | Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7079 from nextcloud/s3-read-object-fopen-stable12Morris Jobke2017-11-061-5/+8
|\ \ \ | |/ / |/| | use fopen directly when reading objects from s3
| * | use fopen directly when reading objects from s3Robin Appelman2017-11-061-5/+8
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-11-0616-110/+148
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-054-0/+8
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-0414-0/+30
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-03230-214/+7350
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-024-2/+12
| |
* | Merge pull request #7040 from nextcloud/7039_12Joas Schilling2017-11-011-2/+2
|\ \ | | | | | | [stable12] Translate Grant Access
| * | Translate Grant AccessRoeland Jago Douma2017-11-011-2/+2
|/ / | | | | | | | | | | Fixes #7038 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-11-0184-110/+310
| |
* | Merge pull request #7028 from nextcloud/stable12-login-readabilityJan-Christoph Borchardt2017-10-311-0/+2
|\ \ | | | | | | [stable12] Better readability for text on log in page which is directly on backgrounds
| * | Better readability for text on log in page which is directly on backgroundsJan-Christoph Borchardt2017-10-311-0/+2
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #6878 from nextcloud/allow-migrating-from-10.0.3.3Joas Schilling2017-10-311-0/+1
|\ \ \ | |/ / |/| | Allow to migrate from 10.0.3.3
| * | Allow to migrate from 10.0.3.3Joas Schilling2017-10-191-0/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-10-3122-34/+348
| | |
* | | Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changedMorris Jobke2017-10-303-1/+7
|\ \ \ | | | | | | | | #6307 fix page title not changed (stable12)
| * | | bugfix: set/change page title when switching to file tagsBernd Stellwag2017-10-271-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Bernd Stellwag <burned@zerties.org>
| * | | bugfix: set/change page title when switching to filelistBernd Stellwag2017-10-272-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Bernd Stellwag <burned@zerties.org>
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-306-8/+10
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-298-20/+38
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-10-2814-86/+122
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2017-10-2728-32/+128
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-10-26102-150/+226
| | |
* | | Merge pull request #6935 from nextcloud/12-5780Morris Jobke2017-10-253-11/+4
|\ \ \ | | | | | | | | Backport of translation string fixes
| * | | Merge vendor/core.jsMorris Jobke2017-10-251-7/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Add space between ellipsis and wordMorris Jobke2017-10-252-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Update file-upload.jsrakekniven2017-10-241-2/+2
| | | | | | | | | | | | Fixed tiny translation issues. Removed space before ellipsis.
| * | | Replace ... with …Morris Jobke2017-10-242-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6944 from nextcloud/12-6433Morris Jobke2017-10-251-2/+2
|\ \ \ \ | | | | | | | | | | [stable12] Fix uninitialized variable $this->params