Commit Graph

14647 Commits

Author SHA1 Message Date
Nextcloud bot 6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Morris Jobke e6ad00b33d
Merge pull request #7117 from nextcloud/fix-welcome-string
Fix welcome text for better grammar in themed instances
2017-11-09 10:03:59 +01:00
Morris Jobke 5d8421135e
Merge pull request #7014 from nextcloud/rename-locks
Unlock files even if an exception occurs while renaming
2017-11-09 09:47:36 +01:00
Morris Jobke eab2b3b7ae
Merge pull request #7027 from nextcloud/Rello-patch-1
Rello patch 1
2017-11-09 09:41:01 +01:00
Morris Jobke a0aef6ab1b
Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:27:38 +01:00
Nextcloud bot aa525d89e8
[tx-robot] updated from transifex 2017-11-09 01:09:13 +00:00
Lukas Reschke 989a8a3668
Merge pull request #6220 from nextcloud/cached-mount-info-filepath
Allow getting the filepath when getting cached mounts by fileid
2017-11-09 00:04:25 +01:00
Morris Jobke e0784c66ed
Merge pull request #7109 from nextcloud/fix_6898
If for some reason the json can't be decoded it is not cached
2017-11-08 23:33:02 +01:00
Lukas Reschke 8c915baa34
Merge pull request #6788 from staabm/master
Prevent XSS in links which open a new browser window
2017-11-08 18:55:35 +01:00
Roeland Jago Douma 448fa4f59e
If for some reason the json can't be decoded it is not cached
Should fix #6898

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-08 12:37:35 +01:00
Morris Jobke 732c951ae1
Revert "Only allow colons in db host for IPv6 addresses"
This reverts commit 1287d6ddb3.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-08 10:47:35 +01:00
Morris Jobke 0913bc2157
Merge pull request #6552 from nextcloud/notifications-add-highlight-definition
Notifications: Add highlight type definition
2017-11-07 20:34:05 +01:00
Morris Jobke 19069f2b9c
Merge pull request #6988 from starypatyk/stable12-mount-cache-performance
Improve performance of UserMountCache with external storage folders
2017-11-07 17:32:06 +01:00
Roeland Jago Douma f55732a18f
Merge pull request #7075 from nextcloud/remove-unused-variables
Remove unused variables
2017-11-07 16:18:40 +01:00
Morris Jobke 4866314ce0
Run updated license header updater
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-07 13:47:42 +01:00
Morris Jobke f9e70c2ab6
Merge pull request #7020 from Fiech/master
Extended list of sensitive configuration values (2)
2017-11-07 10:27:53 +01:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke 31c5c2a592
Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke da6c2c9da1
Merge pull request #7083 from nextcloud/update-license-headers
Update license headers
2017-11-06 18:48:04 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Morris Jobke 5ed05219d7
Merge pull request #7076 from nextcloud/s3-valid-bucket-name
Better error message for invalid bucket names
2017-11-06 16:16:28 +01:00
Morris Jobke 5411d60b24
Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structure
Implement plugins infrastructure in User_LDAP
2017-11-06 16:07:31 +01:00
Morris Jobke 6c29ce4e02
Merge pull request #6402 from nextcloud/dav-email-customization
Enhance calendar invitation emails
2017-11-06 15:14:49 +01:00
Morris Jobke 8b763ea0f7
Better error message for invalid bucket names
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:48:41 +01:00
Morris Jobke 5445b1ff17
Remove unused variables
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 09:43:45 +01:00
Nextcloud bot 81ac1ec977
[tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
korelstar c7482402b8 Unlock files even if an exception occurs
Signed-off-by: Kristof Hamann <korelstar@users.noreply.github.com>
2017-11-03 18:29:04 +01:00
Vinicius Cubas Brand fa565750d1 User_LDAP plugins: smaller fixes
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:42:59 -02:00
Vinicius Cubas Brand 10ca793452 Plugins infrastructure in User_LDAP
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
2017-11-03 11:41:40 -02:00
Georg Ehrke e111da777a
Make L10N->l provide weekdayName
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-03 11:20:04 +01:00
Nextcloud bot 7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Roeland Jago Douma 687c92bfd3
Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorage
Fix seeking on object storage
2017-11-02 14:56:51 +01:00
Roeland Jago Douma a4ba4544de
Update autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-02 10:30:41 +01:00
Dariusz Olszewski 07016a1e5b Improve performance of UserMountCache with external storage folders 2017-11-01 21:11:39 +01:00
Arthur Schiwon e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Joas Schilling 3e0789aa94
Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-object-storage
Improve mimetype detection for object storages
2017-11-01 11:04:15 +01:00
Joas Schilling defc4bf6a8
Merge pull request #6975 from nextcloud/s3-read-object-fopen
use fopen directly when reading objects from s3
2017-11-01 10:57:56 +01:00
Nextcloud bot cc83052ca7
[tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Joas Schilling 6ddda3d7d4
Merge pull request #6952 from nextcloud/correctly-search-for-results
Correctly search for existing collaboration results
2017-10-31 14:49:01 +01:00
Joas Schilling ba6e5bcc05
Add the return which is being used
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-31 14:06:21 +01:00
Rello c5f76785ba
Mapping of m3u, m3u8, pls to audio streams
Signed-Off-By: Rello <Rello@users.noreply.github.com>
2017-10-31 14:05:24 +01:00
Joas Schilling a0dab90fd5
Merge pull request #7021 from nextcloud/fix-oracle-indexes
Fix oracle indexes
2017-10-31 13:55:14 +01:00
Arthur Schiwon bcfac75b06
simplify registration of manager in server container
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 13:55:03 +01:00
Nextcloud bot 299ef9aa78
[tx-robot] updated from transifex 2017-10-31 01:08:31 +00:00
Johannes S 936486413d
Merge branch 'master' into master 2017-10-31 01:34:46 +01:00
Johannes Schlichenmaier 84cc13f57b Extended list of sensitive configuration values
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
2017-10-31 01:30:50 +01:00
Roeland Jago Douma 5672f14fd1
Merge pull request #7004 from Fiech/master
Extended list of sensitive configuration values
2017-10-30 20:01:42 +01:00
Joas Schilling 218e2357c8
Rebuild autoloader
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-30 18:59:52 +01:00
Victor Dubiniuk 9f16468789
Die NoCheckMigrator 2017-10-30 18:59:24 +01:00