1f1643b35f
Merge pull request #12995 from owncloud/tbelau666-master
...
Use Doctrines filter by table name
2015-01-09 14:17:14 +01:00
d2ca9e9c0f
Merge pull request #13191 from owncloud/fix-rename-field
...
fix rename field position, fix #12927
2015-01-09 13:16:37 +01:00
720fe858a3
fix rename field position, fix #12927
2015-01-09 13:05:22 +01:00
a5099b01f9
Merge pull request #12984 from owncloud/ldap-user-cleanup-master
...
Ldap user cleanup master
2015-01-09 10:47:02 +01:00
b4606ec24f
Merge pull request #13184 from owncloud/fix-key
...
Verify existence of $_GET key
2015-01-09 10:39:22 +01:00
d4fc2f555b
[tx-robot] updated from transifex
2015-01-09 01:55:22 -05:00
199276bcbb
Verify existence of $_GET key
...
Otherwise when the file without any specified mimetype was accessed the error log was flooded with entries such as "Undefined index: mime", there can be multiple issues found about this in the forum and our bugtracker.
To test this access `/index.php/apps/files/ajax/mimeicon.php` with and without `$_GET['mime']`.
Fixes itself.
2015-01-09 02:31:59 +01:00
6c59253978
Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files
...
Verify whether type is correct
2015-01-09 02:27:51 +01:00
6a5f12beca
Merge pull request #12988 from owncloud/logfile_download
...
Logfile download
2015-01-09 00:33:22 +01:00
ceaaab6295
Verify whether type is correct
...
`$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
2015-01-08 18:38:17 +01:00
c1a79d24c5
fix order of initalizing instance properties, and paremeter order in a method call
2015-01-08 17:45:07 +01:00
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
c7f273040e
fix table name for getList
2015-01-08 14:21:40 +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
f579f2bd94
add Download logfile button to admin settings
...
add logSettingsController
add download logfile button
move getEntries to LogSettingsController
move set log level to logsettingscontroller.php
add warning if logfile is bigger than 100MB
add unit test for set log level
fix typecasting, add new line at EoF
show log and logfile download only if log_type is set to owncloud
add unit test for getFilenameForDownload
2015-01-07 14:55:53 +01:00
9668405ec7
doc fixes and removal of unnecessary use statements
2015-01-07 13:28:56 +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
6c335ee6fc
add test for mapping's getList method
2015-01-07 12:39:29 +01:00
ae9c9a46b8
inject and use user manager to delete command instead of using old static oc_user way
2015-01-07 12:21:28 +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
b9235e2a24
inject DB Connection to user manager
2015-01-07 00:52:18 +01:00
64f0b055e6
inject IDateTimeFormatter to show-remnants command
2015-01-06 23:40:00 +01:00
40ecd30fba
inject oc config to User_LDAP
2015-01-06 23:28:49 +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
Thomas Müller
Morris Jobke
Jan-Christoph Borchardt
Lukas Reschke
Jenkins for ownCloud
Arthur Schiwon
Vincent Petry
Christopher Bunn
Martin
Bjoern Schiessle
Joas Schilling
Georg Ehrke
Robin Appelman