wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41548 commits 157 branches 562 tags 714 MiB
Commit graph

14696 commits

Author SHA1 Message Date
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
Robin Appelman
c566b2854b
Use non empty files for object store touch 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:51:02 +01:00
Robin Appelman
70a4860ccb
Fix contructing headers for s3 download 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-08 17:50:46 +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
Kyle Fazzari
06ba1a8a02
JSResourceLocator: account for symlinks in app path 
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
 2017-11-07 14:54:21 -08: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
Kyle Fazzari
b0d296639c
CSSResourceLocator: account for symlinks in app path 
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>
 2017-11-03 23:52:09 -07: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
Piotr Mrowczynski
6a51c1bc4f
Add foreign key support to OC 2017-10-30 18:57:19 +01:00
Jörn Friedrich Dreyer
d081a1a5ad
quote index columns on oracle, handle all index changes, minor phpdoc cleanup 2017-10-30 18:54:31 +01:00
Georg Ehrke
c8323f822d
Merge pull request #6867 from nextcloud/imessage-attachments 
Add attachment support to emails
 2017-10-30 18:33:50 +01:00
Roeland Jago Douma
73aef992c6
Merge pull request #6932 from nextcloud/constants-for-talk-useragents 
Define constants for the talk user agents
 2017-10-30 17:57:28 +01:00
Morris Jobke
d18a60de39
Merge pull request #6992 from nextcloud/2-lines-for-better-code 
Use ::class and fix missing doc
 2017-10-30 16:18:28 +01:00
Arthur Schiwon
d5f1cef642
fix comment sorter 
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-30 15:59:43 +01:00
Johannes Schlichenmaier
bde78decc2 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-29 23:46:59 +01:00
Nextcloud bot
267991b154
[tx-robot] updated from transifex 2017-10-29 00:08:31 +00:00
Joas Schilling
94f3fc63bc
Use ::class and fix missing doc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-28 11:49:36 +02:00
Robin Appelman
3f0cb13042
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 14:35:34 +02:00
Robin Appelman
f9a7294807
use fopen directly when reading objects from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 12:58:19 +02:00
Morris Jobke
de912385e0
Fix seeking on object storage 
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>
 2017-10-27 12:16:28 +02:00
Joas Schilling
7a4c0c668b Merge pull request #6977 from Fiech/master 
Added additional methods for removal of sensitive info
 2017-10-27 11:46:31 +02:00
Johannes Schlichenmaier
4ae7275aeb Added additional methods for removal of sensitive info 
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-27 10:36:58 +02:00
Nextcloud bot
65621141fd
[tx-robot] updated from transifex 2017-10-27 00:08:29 +00:00
Morris Jobke
405bbc1c61
Improve mimetype detection for object storages 
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>
 2017-10-26 16:31:59 +02:00
Arthur Schiwon
7f58c41015
fix sorting 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-26 16:23:41 +02:00
Roeland Jago Douma
a9f78856b5 Merge pull request #6949 from nextcloud/cachingrouter_local 
Use local cache for the CachingRouter
 2017-10-26 11:42:30 +02:00
Nextcloud bot
37bedbc10d
[tx-robot] updated from transifex 2017-10-26 00:08:39 +00:00
Roeland Jago Douma
88cba6d882
Use local cache for the CachingRouter 
There is no need to cache routes distributed. It even has the downside
that the router might return different routes then the ones in the local
routes.php files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-25 19:23:46 +02:00
Joas Schilling
43b92b8e06
Add unit tests for SearchResult 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-25 11:21:05 +02:00
Joas Schilling
42c84b6309
Correctly search for existing collaboration results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-25 10:38:26 +02:00
Joas Schilling
6a035bd0a0
Move attachment creators to mailer class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-25 09:26:57 +02:00
Nextcloud bot
c85deacddb
[tx-robot] updated from transifex 2017-10-25 00:08:45 +00:00
Roeland Jago Douma
a82b56b1c7 Merge pull request #6918 from nextcloud/rotate_job_by_default 
Add logrote as a default background job
 2017-10-24 20:38:40 +02:00
Roeland Jago Douma
b88db3a389 Merge pull request #6921 from nextcloud/appmanager-securitymiddleware 
Use proper DI for security middleware for app enabled check
 2017-10-24 19:58:24 +02:00
Morris Jobke
f368481c23 Merge pull request #6928 from nextcloud/remove-unneeded-method 
Remove unused method of OC_App
 2017-10-24 17:50:43 +02:00
Morris Jobke
ce0c45a4ea
Use proper DI for security middleware for app enabled check 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 15:36:28 +02:00
Joas Schilling
2b425960b8
Define constants for the talk user agents 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-24 15:10:35 +02:00
Morris Jobke
7b7bf73670
Deprecate OC_App:isEnabled 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 14:05:46 +02:00
Morris Jobke
df85b13296
Remove unused method of OC_App 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 14:04:09 +02:00
Morris Jobke
3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage 
Use appmanager instead of OC_App for check for enabled app
 2017-10-24 13:53:17 +02:00
Roeland Jago Douma
80e4d48db9
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 08:28:07 +02:00
Roeland Jago Douma
e2139d4b56
Add logrote as a default background job 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 08:28:06 +02:00
Nextcloud bot
1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke
f884e762bc
Use appmanager instead of OC_App for check for enabled app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:31:17 +02:00
Julius Härtl
b3c025fd08
Revert copyright changes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-23 23:23:56 +02:00
Julius Härtl
4cfa1c66b8
Doc: Fix phpDoc issues 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-23 23:23:56 +02:00
Arthur Schiwon
8f0a9ae51f
split walking the tree from operating on it 
so walking it is reusable

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:37 +02:00
Arthur Schiwon
fd6daf8d19
AutoCompletion backend 
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:32 +02:00
Nextcloud bot
2b31b82891
[tx-robot] updated from transifex 2017-10-22 00:08:36 +00:00
Nextcloud bot
3709d3eeae
[tx-robot] updated from transifex 2017-10-21 00:08:26 +00:00
Nextcloud bot
a94976bfc8
[tx-robot] updated from transifex 2017-10-20 00:08:34 +00:00
Markus Staab
db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02:00
Lukas Reschke
3f352d5f3b Merge pull request #6825 from nextcloud/no-filecache-update 
No automatic filecache update
 2017-10-19 11:30:56 +02:00
Joas Schilling
65e938c4fd
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:18:21 +02:00
Joas Schilling
dcb322a6b3
Extend the API with teh parameters from Swift 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:05:47 +02:00
Lukas Reschke
f6f7b50cf0 Merge pull request #6853 from nextcloud/apps_autoloader 
Allow apps to have their own autoloader
 2017-10-19 11:05:23 +02:00
Nextcloud bot
07b6e234bd
[tx-robot] updated from transifex 2017-10-19 00:08:27 +00:00
Joas Schilling
ce27e8cf34
Add attachment support to emails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:44:19 +02:00
Joas Schilling
cc798fd65f
Fix autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:16 +02:00