Vincent Petry
8d866dfba4
Merge pull request #25314 from owncloud/files_external-backends-config
...
show configuration options for authentication backends
2016-07-04 16:10:03 +02:00
Morris Jobke
2e5e0c157d
adjust padding of text preview
2016-07-04 15:38:16 +02:00
Joas Schilling
411515ba0e
Change nickvergessen mailmap entry ( #25349 )
2016-07-04 15:19:47 +02:00
felixboehm
e901ec4941
check if renamed user is still valid by reapplying the ldap filter ( #25338 )
2016-07-04 14:20:08 +02:00
Jörn Friedrich Dreyer
d2d2a75529
Cap LDAP user cache ( #25323 )
2016-07-04 13:57:15 +02:00
Lukas Reschke
be847398b4
Merge pull request #296 from ayamshanov/add_fb2_mimetype
...
Add mimetype for fb2-extension
2016-07-04 13:54:11 +02:00
Lukas Reschke
77082c20a7
Merge pull request #305 from Faldon/master
...
Changing name of default logfile
2016-07-04 13:25:00 +02:00
Robin Appelman
a4d75a60a9
Add large sidebar previews for text files
2016-07-04 12:54:12 +02:00
Morris Jobke
2f475a9f1e
Merge pull request #284 from nextcloud/cleanup-after-sync
...
we don't need to check permissions twice
2016-07-04 12:23:41 +02:00
Thomas Pulzer
bca4f42e14
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-04 12:06:52 +02:00
Robin Appelman
860b7c36ec
Factor out handling sidebar previews
2016-07-04 12:04:32 +02:00
Morris Jobke
b3fbf8b3f3
Merge pull request #303 from nextcloud/collapse-logs-in-github-issue-template
...
Collapse logs and lists with HTML5 support of github
2016-07-04 11:57:43 +02:00
Morris Jobke
55ad79a97f
Fix summary
2016-07-04 11:56:38 +02:00
Thomas Pulzer
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
Morris Jobke
152c1d414e
Merge pull request #299 from nextcloud/master-use-parameterized-query
...
[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager
2016-07-04 11:49:40 +02:00
Bjoern Schiessle
4a4cac611f
we don't need to check permissions twice
2016-07-04 10:48:15 +02:00
Joas Schilling
8e0e7937f5
Collapse logs and lists with HTML5 support of github
2016-07-04 10:40:13 +02:00
Morris Jobke
978ab660f7
Merge pull request #290 from nextcloud/update-transifex-link
...
We have our own Transifex org now ;)
2016-07-04 08:07:22 +02:00
Jenkins for ownCloud
9e0d8fcf41
[tx-robot] updated from transifex
2016-07-04 01:56:34 -04:00
Lukas Reschke
dc5fea504b
[master] Use paramterized parameter for \OC\SystemTag\SystemTagManager
...
$nameSearchPattern was passed in and directly appended to the SQL query. Luckily the code path isn't reached anywhere in Nextcloud or the included apps.
2016-07-03 16:54:41 +02:00
Alexander Yamshanov
ee790ec6ac
Add mimetype for fb2-extension
2016-07-03 15:13:08 +06:00
Jenkins for ownCloud
cea84cf7a8
[tx-robot] updated from transifex
2016-07-03 01:54:52 -04:00
Marius Blüm
a8abb35ea0
We have our own Transifex org now ;)
2016-07-02 14:21:01 +02:00
Jenkins for ownCloud
dea7b5be35
[tx-robot] updated from transifex
2016-07-02 01:54:53 -04:00
Björn Schießle
5b4cea4b36
Merge pull request #275 from nextcloud/master-sync-upstream
...
[Master] Sync upstream
2016-07-01 18:31:51 +02:00
Björn Schießle
1d96fc9f78
Merge pull request #281 from nextcloud/update-3rdparty-master
...
update to 3rdparty master
2016-07-01 18:31:15 +02:00
Björn Schießle
c33b5046e0
Merge pull request #278 from nextcloud/master-traversal-directory-js
...
Do not allow directory traversal using "../"
2016-07-01 18:30:27 +02:00
Hendrik Leppelsack
61e604c2d9
adjusts tests to removal of svg fallback
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
c47833718f
remove svg classes
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
11be3d6276
remove png references in core
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
769deaee2f
remove png actions, fileicons, etc
2016-07-01 16:36:37 +02:00
Hendrik Leppelsack
bc5c89e9c0
remove javascript png fallback for svg
2016-07-01 16:36:37 +02:00
Vincent Petry
ba95297c5c
Merge pull request #25262 from owncloud/fed-sharing-error
...
Only save federated share after remote server is notified
2016-07-01 16:20:39 +02:00
Vincent Petry
6f92aef265
Merge pull request #25276 from owncloud/delete-own-session-token
...
prevent users from deleting their own session token
2016-07-01 16:15:31 +02:00
Morris Jobke
f12d0a2c2f
update to 3rdparty master
2016-07-01 15:28:13 +02:00
Lukas Reschke
76c73d5ec3
Match on 405
2016-07-01 15:19:21 +02:00
Lukas Reschke
4ac9eaab03
Match for /../
2016-07-01 15:01:48 +02:00
Thomas Citharel
7d95cde37d
Add all properties while creating a subscription ( #25318 )
...
Fixes #24469
2016-07-01 13:42:35 +02:00
Lukas Reschke
5b65591d84
Do not allow directory traversal using "../"
...
We should not allow directory traversals using "../" here.
To test access the following URL once with and then without this patch:
http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
2016-07-01 13:36:05 +02:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Vincent Petry
4acb06923d
Filelist change dir auto-prepend slash
...
Prepend a slash to directories in case it was missing since many places
assume that it's there.
2016-07-01 11:10:37 +02:00
Jenkins for ownCloud
2d2d2267f7
[tx-robot] updated from transifex
2016-07-01 01:57:04 -04:00
Vincent Petry
8f90259b02
Merge pull request #25304 from owncloud/local-karma
...
Always use local karma
2016-06-30 17:29:56 +02:00
Vincent Petry
22746990e6
Merge pull request #25310 from owncloud/search-preventinfiniteloop
...
Prevent infinite loop in search auto-nextpage
2016-06-30 17:20:25 +02:00
Robin Appelman
9fb92b56ec
show configuration options for authentication backends while listing storage
...
Fixes #22447
2016-06-30 15:50:14 +02:00
Robin Appelman
f982d104f3
hide hidden parameters from list backend/auth parameters
2016-06-30 15:44:42 +02:00
Björn Schießle
8e002b6155
Merge pull request #255 from nextcloud/dav-permission-check
...
add some additonal permission checks to the webdav backend
2016-06-30 14:41:23 +02:00
Marius Blüm
2cdee70305
Merge pull request #258 from nextcloud/set-disposition
...
Set content-type to "application/octet-stream"
2016-06-30 14:27:43 +02:00
Bjoern Schiessle
26e14529be
fix error message
2016-06-30 13:50:31 +02:00
Lukas Reschke
149218ead9
Fix tests
2016-06-30 13:46:08 +02:00