Commit Graph

33349 Commits

Author SHA1 Message Date
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
Morris Jobke 5d0f5f175b Merge pull request #253 from nextcloud/fix-versions
check permissions before rollback
2016-06-30 13:42:45 +02:00
Lukas Reschke c771368c4e Add proper throws PHP docs 2016-06-30 13:19:50 +02:00
Lukas Reschke 1e7f0f7341 Add required $message parameter 2016-06-30 13:17:53 +02:00
Lukas Reschke 700a57d8b6 Set content-type to "application/octet-stream"
Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly.
2016-06-30 12:47:46 +02:00
Lukas Reschke b32b296ed7 Add integration tests 2016-06-30 12:21:01 +02:00
Bjoern Schiessle 1b74cf72fb check permissions before rollback 2016-06-30 11:27:25 +02:00
Bjoern Schiessle 3571207bd9 add some additonal permission checks to the webdav backend 2016-06-30 11:16:49 +02:00
Vincent Petry 5cfbb9624f Prevent infinite loop in search auto-nextpage
When loading the next page of search results, make sure that the loop
can end if there are no more elements in case the total doesn't match.

Also added a check to avoid recomputing the search results whenever the
setFilter() is called with the same value. This happens when navigating
away to another folder, the search field gets cleared automatically and
it calls FileList.setFilter('').
2016-06-30 11:10:48 +02:00
Morris Jobke f7a69c765a Merge pull request #247 from nextcloud/l10n-fixes
Fix update notification text
2016-06-30 09:11:54 +02:00
Morris Jobke 3acdc1339d Merge pull request #206 from nextcloud/ci-mysql
Add mysql job to CI
2016-06-30 09:06:19 +02:00
Jenkins for ownCloud 1b9fa4dd5f [tx-robot] updated from transifex 2016-06-30 01:55:56 -04:00
Hendrik Leppelsack 1369535d03 always use local karma 2016-06-29 18:45:13 +02:00
Morris Jobke 83a046a0fb Merge pull request #248 from nextcloud/tx-fixes
Update transifex config
2016-06-29 16:41:45 +02:00
Morris Jobke 9a1e393470 Merge pull request #245 from nextcloud/fix-243
targets 3rdparty submodule from Nc instead of oC
2016-06-29 16:34:29 +02:00