summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7225 from nextcloud/12.0.4RC-versionv12.0.4RC1Roeland Jago Douma2017-11-201-2/+2
|\ | | | | 12.0.4 RC
| * 12.0.4 RCMorris Jobke2017-11-201-2/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #7170 from kyrofa/backport/6028/app_path_realpathRoeland Jago Douma2017-11-204-0/+304
|\ \ | |/ |/| [stable12] {J,CS}SResourceLocator: account for symlinks in app path
| * {J,CS}SResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-144-0/+304
| | | | | | | | | | | | | | | | | | | | | | | | Currently, if the app path includes a symlink, the calculated webDir will be incorrect when generating CSS and URLs will be pointing to the wrong place, breaking CSS. Use realpath when retrieving app path, and these issues go away. Fix #6028 Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | [tx-robot] updated from transifexNextcloud bot2017-11-2022-42/+134
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-1918-12/+52
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-1810-0/+16
| |
* | Merge pull request #7207 from nextcloud/fix-object-storage-touch-12Björn Schießle2017-11-171-14/+13
|\ \ | | | | | | [stable12] touch opertation on object storage, don't create the file cache entry to early
| * | only create the file cache entry after the empty file was created ↵Bjoern Schiessle2017-11-171-14/+13
|/ / | | | | | | | | | | successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #7186 from nextcloud/s3-download-stream-fix-12Björn Schießle2017-11-172-3/+9
|\ \ | | | | | | [12] Fix s3 download and touch
| * | Use non empty files for object store touchRobin Appelman2017-11-151-2/+2
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | Fix contructing headers for s3 downloadRobin Appelman2017-11-151-1/+7
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-11-1730-2/+104
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-11-1628-4/+154
|/ /
* / [tx-robot] updated from transifexNextcloud bot2017-11-15120-228/+242
|/
* [tx-robot] updated from transifexNextcloud bot2017-11-1432-2/+398
|
* [tx-robot] updated from transifexNextcloud bot2017-11-138-0/+14
|
* [tx-robot] updated from transifexNextcloud bot2017-11-1274-372/+544
|
* [tx-robot] updated from transifexNextcloud bot2017-11-11390-580/+22656
|
* Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12blizzz2017-11-1011-17/+17
|\ | | | | [stable12] Improve text: 'you have now' -> 'you now have'
| * Fix welcome text for better grammar in themed instancesMorris Jobke2017-11-0911-17/+17
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Improve text: 'you have now' -> 'you now have'Leon Klingele2017-09-1211-17/+17
| | | | | | | | Signed-off-by: Leon Klingele <leon@struktur.de>
* | [tx-robot] updated from transifexNextcloud bot2017-11-10286-26/+23014
| |
* | Merge pull request #7120 from nextcloud/12-6988Morris Jobke2017-11-091-1/+5
|\ \ | | | | | | [stable12] Improve performance of UserMountCache with external storage folders
| * | Improve performance of UserMountCache with external storage foldersDariusz Olszewski2017-11-091-1/+5
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7116 from nextcloud/12-fix-6033Roeland Jago Douma2017-11-091-1/+1
|\ \ \ | | | | | | | | [stable12] Fix icon for security settings
| * | | Fix icon for security settingsMorris Jobke2017-11-091-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7118 from nextcloud/12-7109Roeland Jago Douma2017-11-091-0/+4
|\ \ \ \ | | | | | | | | | | [stable12] If for some reason the json can't be decoded it is not cached
| * | | | If for some reason the json can't be decoded it is not cachedRoeland Jago Douma2017-11-091-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | Should fix #6898 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / | | [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>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 20:05:31 +0000