be847398b4
Merge pull request #296 from ayamshanov/add_fb2_mimetype
...
Add mimetype for fb2-extension
2016-07-04 13:54:11 +02:00
77082c20a7
Merge pull request #305 from Faldon/master
...
Changing name of default logfile
2016-07-04 13:25:00 +02:00
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
bca4f42e14
Merge branch 'master' of https://github.com/nextcloud/server
2016-07-04 12:06:52 +02:00
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
55ad79a97f
Fix summary
2016-07-04 11:56:38 +02:00
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
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
4a4cac611f
we don't need to check permissions twice
2016-07-04 10:48:15 +02:00
8e0e7937f5
Collapse logs and lists with HTML5 support of github
2016-07-04 10:40:13 +02:00
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
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
ee790ec6ac
Add mimetype for fb2-extension
2016-07-03 15:13:08 +06:00
a8abb35ea0
We have our own Transifex org now ;)
2016-07-02 14:21:01 +02:00
5b4cea4b36
Merge pull request #275 from nextcloud/master-sync-upstream
...
[Master] Sync upstream
2016-07-01 18:31:51 +02:00
1d96fc9f78
Merge pull request #281 from nextcloud/update-3rdparty-master
...
update to 3rdparty master
2016-07-01 18:31:15 +02:00
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
f12d0a2c2f
update to 3rdparty master
2016-07-01 15:28:13 +02:00
76c73d5ec3
Match on 405
2016-07-01 15:19:21 +02:00
4ac9eaab03
Match for /../
2016-07-01 15:01:48 +02:00
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
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
2d2d2267f7
[tx-robot] updated from transifex
2016-07-01 01:57:04 -04:00
8f90259b02
Merge pull request #25304 from owncloud/local-karma
...
Always use local karma
2016-06-30 17:29:56 +02:00
22746990e6
Merge pull request #25310 from owncloud/search-preventinfiniteloop
...
Prevent infinite loop in search auto-nextpage
2016-06-30 17:20:25 +02:00
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
2cdee70305
Merge pull request #258 from nextcloud/set-disposition
...
Set content-type to "application/octet-stream"
2016-06-30 14:27:43 +02:00
26e14529be
fix error message
2016-06-30 13:50:31 +02:00
149218ead9
Fix tests
2016-06-30 13:46:08 +02:00
5d0f5f175b
Merge pull request #253 from nextcloud/fix-versions
...
check permissions before rollback
2016-06-30 13:42:45 +02:00
c771368c4e
Add proper throws PHP docs
2016-06-30 13:19:50 +02:00
1e7f0f7341
Add required $message parameter
2016-06-30 13:17:53 +02:00
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
b32b296ed7
Add integration tests
2016-06-30 12:21:01 +02:00
1b74cf72fb
check permissions before rollback
2016-06-30 11:27:25 +02:00
3571207bd9
add some additonal permission checks to the webdav backend
2016-06-30 11:16:49 +02:00
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
f7a69c765a
Merge pull request #247 from nextcloud/l10n-fixes
...
Fix update notification text
2016-06-30 09:11:54 +02:00
3acdc1339d
Merge pull request #206 from nextcloud/ci-mysql
...
Add mysql job to CI
2016-06-30 09:06:19 +02:00
1b9fa4dd5f
[tx-robot] updated from transifex
2016-06-30 01:55:56 -04:00
1369535d03
always use local karma
2016-06-29 18:45:13 +02:00
83a046a0fb
Merge pull request #248 from nextcloud/tx-fixes
...
Update transifex config
2016-06-29 16:41:45 +02:00
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
409672d981
Fix update notification text
...
* thanks to ungesundes_halbwissen @ transifex
2016-06-29 16:05:51 +02:00
01829e8d7c
mysql only works with 3 byte UTF-8
2016-06-29 15:53:23 +02:00
c3b600b934
fix version string
2016-06-29 15:11:48 +02:00
4a43fbfb5e
9.1.0 RC 1
2016-06-29 15:09:40 +02:00
b55ab6d22a
Various database migration fixes ( #25209 )
...
* String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating
* Adding schema migration tests to prevent unnecessary and non-sense migration steps
Fix Oracle autoincrement and unsigned handling
* Fix sqlite integer type for autoincrement
* Use lower case table names - fixes pg
* Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine
2016-06-29 14:54:41 +02:00
c1d990d547
Update transifex config
2016-06-29 14:36:30 +02:00
c8fbe39801
Merge pull request #25288 from owncloud/fix-versionrevertperms
...
Hide revert button when no permission to revert
2016-06-29 12:51:39 +02:00
Lukas Reschke
Morris Jobke
Thomas Pulzer
Bjoern Schiessle
Joas Schilling
Lukas Reschke
Alexander Yamshanov
Marius Blüm
Jenkins for ownCloud
Vincent Petry
Hendrik Leppelsack
Daniel Molkentin
Thomas Müller