5311d92c5c
Merge pull request #13148 from owncloud/self-destroying-notifications
...
Add timeout for notifications
2015-01-08 15:50:47 +01:00
6b0ae34de6
Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootleadingslash
...
Fix source path when share is a mount point
2015-01-08 15:02:16 +01:00
bdfb039e05
Merge pull request #13165 from mypetyak/typos-in-external-storage-xml
...
Minor typo updates to External Storage description
2015-01-08 14:00:00 +01:00
af269258d3
Merge pull request #13172 from owncloud/addCheckForOldRewriteRulesToMakeOurCrappyIntegrationWorking
...
Add version to .htaccess
2015-01-08 13:48:48 +01:00
8e1904386f
Add timeout for notifications
...
* options for timeout in seconds and if it contains HTML
* if timeout is 0 it will show the message permanently
* removes the notification after a given (default: 5 seconds) timeframe
* based on work by @brantje
* provide JS unit tests for notifications
2015-01-08 13:06:45 +01:00
7fbb7f4dc4
Add version to .htaccess
...
Currently if a user does not replace the .htaccess file with the new update this can lead to serious problems in case Apache is used as webserver.
This commit adds the version to the .htaccess file and the update routine fails in case not the newest version is specified in there. This obviously means that every release has to update the version specified in .htaccess as well. But I see no better solution for it.
Conflicts:
lib/private/updater.php
2015-01-08 12:49:02 +01:00
01c83158bb
Fix source path when share is a mount point
...
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.
This fix removes the bogus leading slash in such situation.
2015-01-08 11:46:11 +01:00
14e534e933
Merge pull request #13166 from owncloud/support-setup-in-php-dev-server
...
check for working htaccess will result in a dead lock because the server...
2015-01-08 11:08:24 +01:00
296a852063
check for working htaccess will result in a dead lock because the server is blocking the request to itself - fixes #13153
2015-01-08 09:13:18 +01:00
6bda95037f
[tx-robot] updated from transifex
2015-01-08 01:56:00 -05:00
0f715708dc
Minor typo updates to External Storage description
...
This text is visible to admin users when they read the description of
the External Storage app.
2015-01-07 22:37:20 -06:00
8b95494073
Merge #13074 from branch 'mmattel-smb_rename_text_root_to_subfolder'
2015-01-07 20:54:25 +01:00
edcba11a91
smb: rename textfield from root to subfolder
...
"root" or "subfolder" -> "Remote subfolder" on selected storages
missed ftp...
2015-01-07 20:54:05 +01:00
bfb6e350d5
Merge pull request #13016 from owncloud/sharing_fixes
...
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 18:14:53 +01:00
e9e7ee67d3
shareType and permissions are integers
2015-01-07 16:36:13 +01:00
b6f63e9b3d
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 16:36:13 +01:00
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
70dcebbf92
Correctly return false when translating a foreign activity
2015-01-07 15:02:25 +01:00
5ce295907f
Merge pull request #12687 from owncloud/auto-escape-t-placeholders
...
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
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
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
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
fd57820708
Merge pull request #13132 from aptivate/improve_debug_logging_messages
...
Improve debugging for ServiceUnavailable exceptions
2015-01-07 10:36:27 +01:00
fb37b3c687
Extend Test\TestCase and do not use uniqid()
2015-01-07 10:34:42 +01:00
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
3d997e8c62
Fix incorrect warning about setting the overwrite.cli.url
2015-01-07 09:02:33 +01:00
2daf90dae6
[tx-robot] updated from transifex
2015-01-07 01:55:42 -05:00
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
a014997ded
Merge pull request #13126 from owncloud/update-jquery-strengthify
...
Update jquery strengthify
2015-01-06 19:47:28 +01:00
c740f4a4e4
Merge pull request #13129 from owncloud/group-select-fix-autocomplete
...
Fix group select autocomplete
2015-01-06 18:37:32 +01:00
7528a1a475
Merge pull request #13130 from owncloud/getstoragestats-error-handling
...
Add error handling to getstoragestats.php
2015-01-06 18:35:09 +01:00
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
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
3356308594
Prevent leaking db connection info in the stacktrace
2015-01-06 16:54:41 +01:00
fe4592937a
Merge pull request #12653 from owncloud/full_content_search_results
...
Full content width search results
2015-01-06 16:44:58 +01:00
64e3ebae74
Add error handling to getstoragestats.php
2015-01-06 15:56:06 +01:00
b2124d8d4f
Fix group select autocomplete
2015-01-06 15:48:15 +01:00
5f6da758b7
Fix check if a path argument is passed to occ files:scan
2015-01-06 15:27:03 +01:00
04e2f59f5d
use cancelable timeout, on scroll only fetch next page if last query had any results
2015-01-06 15:18:41 +01:00
698e47a7af
bower update for jquery.strengthify 0.4.1
2015-01-06 14:46:15 +01:00
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
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
20886d8151
Merge pull request #13116 from owncloud/fix_assets
...
Fix JS asset generation
2015-01-06 14:36:51 +01:00
357fbd88be
use class for no results div instead of id. the elements are not unique.
2015-01-06 14:34:35 +01:00
926737fdb7
clear search when navigating via breadcrumbs
2015-01-06 13:55:51 +01:00
1b2e60b53d
bump jquery.strengthify to 0.4.1
2015-01-06 13:48:58 +01:00
4ffe7ddb75
degraded logging policy for server container in AppFramework
2015-01-06 13:43:40 +01:00
fc38d4cc81
fixing wrong usage of license vs licence
2015-01-06 13:07:17 +01:00
6a3f69c2d0
[tx-robot] updated from transifex
2015-01-06 01:54:59 -05:00
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
Morris Jobke
Thomas Müller
Lukas Reschke
Vincent Petry
Jenkins for ownCloud
Christopher Bunn
Martin
Bjoern Schiessle
Joas Schilling
Robin Appelman
Chris Wilson
Robin Appelman
Jörn Friedrich Dreyer
Adam Williamson