Morris Jobke
cb69571cda
Fix docker image naming issue for CI
...
* wrongly named PHP7 - it is PHP 5.6
* moved integration tests at the very end
2016-07-06 13:25:13 +02:00
Joas Schilling
fcf25864d6
Merge pull request #311 from Bugsbane/master
...
Update system tags icon
2016-07-05 13:52:17 +02:00
Bugsbane
29ffe0b790
Replace tag svg with optimized version
...
Replace the system tags tag icon svg with a version that has been optimized by the optimization script (running scour)
2016-07-05 06:52:10 -04:00
Bugsbane
01149c9e97
Clean the svg with inkscapes clean document function
2016-07-05 06:18:02 -04:00
Bugsbane
515df6db59
Update system tags icon
...
Change system tags icon from a magnifying glass to a newly created tag icon. Updates both the png and it's original source SVG.
2016-07-05 06:16:25 -04:00
Björn Schießle
3ffe424985
Merge pull request #309 from Faldon/master
...
Changed the creation of the update notification link
2016-07-05 10:27:48 +02:00
Thomas Pulzer
cf7afabf62
Added escaping html code when building link to documentation.
2016-07-05 06:59:11 +02:00
Thomas Pulzer
52336b2038
Changed the creation of the update notification link to generate the js object from concated string.
2016-07-04 22:57:10 +02:00
Marius Blüm
0481a3eadf
Merge pull request #306 from nextcloud/sidebar-preview-text
...
Add large sidebar previews for text files
2016-07-04 21:36:51 +02:00
Morris Jobke
dd337597b3
for text use max-height to trim whitespace
2016-07-04 17:38:26 +02:00
Morris Jobke
2e5e0c157d
adjust padding of text preview
2016-07-04 15:38:16 +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
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
Marius Blüm
a8abb35ea0
We have our own Transifex org now ;)
2016-07-02 14:21:01 +02: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
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
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
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
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