Thomas Müller
5f171618fd
remove unused variable and fix undefined variable
2015-01-08 09:46:40 +01:00
Vincent Petry
2e57fe93e4
Disable part files for OC ext storage backend + s2s backend
...
When uploading files to an OC ext storage backend or when using server
to server sharing storage, part files aren't needed because the backend
already has its own part files and takes care of the final atomic rename
operation.
This also fixes issues when using two encrypted ownCloud instances where
one mounts the other either as external storage (ownCloud backend) or
through server to server sharing.
2015-01-07 21:21:51 +01:00
Morris Jobke
10505bdb0d
Merge pull request #13150 from owncloud/fix-sharing-activity-extension
...
Correctly return false when translating a foreign activity
2015-01-07 16:10:38 +01:00
Joas Schilling
70dcebbf92
Correctly return false when translating a foreign activity
2015-01-07 15:02:25 +01:00
Morris Jobke
5ce295907f
Merge pull request #12687 from owncloud/auto-escape-t-placeholders
...
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke
bfdf0db7c0
Autoescape of placeholders in t() and p() - for JS
...
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
2015-01-07 12:56:32 +01:00
Morris Jobke
a014b9ad9c
Merge pull request #13140 from owncloud/issue/13139-provisioning-api-tests
...
Extend Test\TestCase and do not use uniqid()
2015-01-07 12:09:26 +01:00
Lukas Reschke
8e13ee26fa
Merge pull request #13138 from owncloud/issue/13134-incorrect-admin-warning-overwrite-cli-url
...
Fix incorrect warning about setting the overwrite.cli.url
2015-01-07 10:39:07 +01:00
Morris Jobke
fd57820708
Merge pull request #13132 from aptivate/improve_debug_logging_messages
...
Improve debugging for ServiceUnavailable exceptions
2015-01-07 10:36:27 +01:00
Joas Schilling
fb37b3c687
Extend Test\TestCase and do not use uniqid()
2015-01-07 10:34:42 +01:00
Thomas Müller
4628e98cfc
Merge pull request #13063 from AdamWill/assets-relocate
...
allow css/js asset directory to be relocated ('assetdirectory')
2015-01-07 09:36:26 +01:00
Joas Schilling
3d997e8c62
Fix incorrect warning about setting the overwrite.cli.url
2015-01-07 09:02:33 +01:00
Jenkins for ownCloud
2daf90dae6
[tx-robot] updated from transifex
2015-01-07 01:55:42 -05:00
Morris Jobke
a8d82b7091
Merge pull request #13131 from owncloud/db-connect-stacktrace
...
Prevent leaking db connection info in the stacktrace
2015-01-07 01:17:27 +01:00
Thomas Müller
a014997ded
Merge pull request #13126 from owncloud/update-jquery-strengthify
...
Update jquery strengthify
2015-01-06 19:47:28 +01:00
Robin Appelman
c740f4a4e4
Merge pull request #13129 from owncloud/group-select-fix-autocomplete
...
Fix group select autocomplete
2015-01-06 18:37:32 +01:00
Lukas Reschke
7528a1a475
Merge pull request #13130 from owncloud/getstoragestats-error-handling
...
Add error handling to getstoragestats.php
2015-01-06 18:35:09 +01:00
Thomas Müller
47eb0c59e6
Merge pull request #13128 from owncloud/files-scan-path
...
Fix check if a path argument is passed to occ files:scan
2015-01-06 18:17:19 +01:00
Chris Wilson
402a3ed146
Improve debugging for ServiceUnavailable exceptions
...
I was getting a lot of these in my logs for no apparent reason, and file
uploads were failing:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"}
In order to debug it, I had to add unique messages to all the places where
this exception was thrown, to identify which one it was, and that made the
logs much more useful:
{"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
2015-01-06 15:59:38 +00:00
Robin Appelman
3356308594
Prevent leaking db connection info in the stacktrace
2015-01-06 16:54:41 +01:00
Morris Jobke
fe4592937a
Merge pull request #12653 from owncloud/full_content_search_results
...
Full content width search results
2015-01-06 16:44:58 +01:00
Robin Appelman
64e3ebae74
Add error handling to getstoragestats.php
2015-01-06 15:56:06 +01:00
Robin Appelman
b2124d8d4f
Fix group select autocomplete
2015-01-06 15:48:15 +01:00
Robin Appelman
5f6da758b7
Fix check if a path argument is passed to occ files:scan
2015-01-06 15:27:03 +01:00
Jörn Friedrich Dreyer
04e2f59f5d
use cancelable timeout, on scroll only fetch next page if last query had any results
2015-01-06 15:18:41 +01:00
Morris Jobke
698e47a7af
bower update for jquery.strengthify 0.4.1
2015-01-06 14:46:15 +01:00
Thomas Müller
622c4cf779
Merge pull request #13122 from owncloud/fix-licence-apps-management
...
fixing wrong usage of license vs licence
2015-01-06 14:40:51 +01:00
Thomas Müller
68efeba343
Merge pull request #13125 from owncloud/lower-deprecation-warning-level
...
degraded logging policy for server container in AppFramework
2015-01-06 14:38:50 +01:00
Thomas Müller
20886d8151
Merge pull request #13116 from owncloud/fix_assets
...
Fix JS asset generation
2015-01-06 14:36:51 +01:00
Jörn Friedrich Dreyer
357fbd88be
use class for no results div instead of id. the elements are not unique.
2015-01-06 14:34:35 +01:00
Jörn Friedrich Dreyer
926737fdb7
clear search when navigating via breadcrumbs
2015-01-06 13:55:51 +01:00
Morris Jobke
1b2e60b53d
bump jquery.strengthify to 0.4.1
2015-01-06 13:48:58 +01:00
Morris Jobke
4ffe7ddb75
degraded logging policy for server container in AppFramework
2015-01-06 13:43:40 +01:00
Thomas Müller
fc38d4cc81
fixing wrong usage of license vs licence
2015-01-06 13:07:17 +01:00
Jenkins for ownCloud
6a3f69c2d0
[tx-robot] updated from transifex
2015-01-06 01:54:59 -05:00
Adam Williamson
bb79aac78a
allow css/js asset directory to be relocated ( #13053 )
...
This allows the directory where CSS/JS asset collections are
written to be changed, in case SERVERROOT is not writeable. Note
it does *not* allow the expected URL to be changed: whatever
directory is used, the server must be configured to serve it
at WEBROOT/assets. It may be possible to add another config
parameter to allow the admin to specify a custom asset URL,
but I thought I'd keep the first implementation simple.
2015-01-05 15:24:23 -08:00
Thomas Müller
c0ad6e818b
Merge pull request #13101 from owncloud/variable-is-undefined-please-use-a-proper-ide-in-the-future-whoever-did-that
...
Fix undefined variable and write unit tests for OC_Principal connector
2015-01-05 20:09:10 +01:00
Jörn Friedrich Dreyer
7a812801db
correctly clear searchbox when switching filelists
2015-01-05 17:53:14 +01:00
Robin McCorkell
2c44bc1768
Fix JS asset generation
...
At some point SeparatorFilter should be included upstream
(kriswallsmith/assetic), then lib/private/assetic/separatorfilter.php can be
removed and the `use` in lib/private/templatelayout.php rewritten.
SeparatorFilter inserts a separator between assets, preventing issues when
files are incorrectly terminated. For JS this is a semicolon.
2015-01-05 15:48:04 +00:00
Jörn Friedrich Dreyer
10038640ae
fix onScroll breaking search, fix keyboard navigation, fix filter for files in other dirs
2015-01-05 14:28:09 +01:00
Jörn Friedrich Dreyer
ba931d2124
search with endless scrolling
2015-01-05 13:53:56 +01:00
Morris Jobke
0e17a00b62
Merge pull request #13103 from owncloud/fix-htaccess-regex
...
escape . in htaccess regex for CSS and JS HTTP headers
2015-01-05 13:26:56 +01:00
Morris Jobke
e5ea000aae
Merge pull request #13108 from owncloud/fix-public-link-mount-for-pre-oc7
...
Check for version before mounting a public link
2015-01-05 13:23:13 +01:00
Jörn Friedrich Dreyer
23900a5a39
filter trashbin and share views
2015-01-05 13:11:50 +01:00
Bernhard Posselt
a6d2019014
Merge pull request #13107 from owncloud/change-to-better-error-level
...
Use info instead of warning log level
2015-01-05 12:09:59 +01:00
Morris Jobke
28c8f5a0f9
Check for version before mounting a public link
...
* ownCloud 7.0.0 is needed - version of merge of server <-> server
sharing - https://github.com/owncloud/core/pull/8399
* adjust error message
2015-01-05 11:50:05 +01:00
Lukas Reschke
8689605999
Use info instead of warning log level
...
Otherwise the log is flooded as can be seen at https://github.com/owncloud/core/issues/13106
Fixes https://github.com/owncloud/core/issues/13106
2015-01-05 11:18:54 +01:00
Lukas Reschke
a0023974e3
Merge pull request #13099 from owncloud/fix-provisioning-api
...
Remove unnecessary setUp method from provisioning_api
2015-01-05 10:35:24 +01:00
Morris Jobke
e97219cf75
escape . in htaccess regex for CSS and JS HTTP headers
2015-01-05 10:23:24 +01:00
Lukas Reschke
3e324f87d0
Use proper test name
2015-01-05 09:54:14 +01:00