Morris Jobke
ba16fd0d33
Merge branch 'master' into sync-master
2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438
Revert "[tx-robot] updated from transifex"
...
This reverts commit 3731b2a006
.
Revert "[tx-robot] updated from transifex"
This reverts commit 94d91113f1
.
Revert "[tx-robot] updated from transifex"
This reverts commit e7cc8bac1e
.
Revert "[tx-robot] updated from transifex"
This reverts commit 59fc3ff45a
.
Revert "[tx-robot] updated from transifex"
This reverts commit 6a89a63d2e
.
Revert "[tx-robot] updated from transifex"
This reverts commit b0bad03234
.
2016-07-07 11:04:08 +02:00
Jenkins for ownCloud
38718bf89e
[tx-robot] updated from transifex
2016-07-07 01:56:27 -04:00
Nextcloud bot
da2363a1dd
[tx-robot] updated from transifex
2016-07-06 13:28:06 +00:00
Vincent Petry
cf6fe95cbf
Merge pull request #25325 from owncloud/filelist-prependslash
...
Filelist change dir auto-prepend slash
2016-07-06 12:44:03 +02:00
Vincent Petry
1f9d728538
Ignore invalid paths in the JS file list ( #25368 )
2016-07-06 11:55:02 +02:00
Carlos Damken
d58e6b59d3
Upgrading the log level From Debug to INFO to be consistent with files_trashbin ( #25367 )
2016-07-06 10:33:31 +02:00
Jenkins for ownCloud
6103df97cc
[tx-robot] updated from transifex
2016-07-06 01:56:27 -04: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
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
Vincent Petry
b77fcc19d4
Merge pull request #25344 from owncloud/fix-ldap-check-user
...
check if renamed user is still valid by reapplying the ldap filter
2016-07-05 11:29:55 +02: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 Müller
d2d99a91a0
fix swift primary object store test ( #25281 )
...
* Wait for socket to be open
* Fix call on null
* Allow DB access for MountProviderTest
Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
2016-07-05 08:54:51 +02:00
Jenkins for ownCloud
34eec57262
[tx-robot] updated from transifex
2016-07-05 02:31:32 -04: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
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
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
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
Robin Appelman
860b7c36ec
Factor out handling sidebar previews
2016-07-04 12:04:32 +02:00
Thomas Pulzer
90b7f74da7
Changed name of default logfile from owncloud.log to nextcloud.log.
2016-07-04 11:50:32 +02:00
Bjoern Schiessle
4a4cac611f
we don't need to check permissions twice
2016-07-04 10:48:15 +02:00
Jenkins for ownCloud
9e0d8fcf41
[tx-robot] updated from transifex
2016-07-04 01:56:34 -04:00
Jenkins for ownCloud
cea84cf7a8
[tx-robot] updated from transifex
2016-07-03 01:54:52 -04: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
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
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
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
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
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
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
Jenkins for ownCloud
1b9fa4dd5f
[tx-robot] updated from transifex
2016-06-30 01:55:56 -04:00