wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
23782 commits 157 branches 562 tags 714 MiB
Commit graph

9993 commits

Author SHA1 Message Date
Lukas Reschke
9904b30070 Ensure that passed argument is always a string 
Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour.

Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
 2015-02-13 12:49:34 +01:00
Roeland Jago Douma
bdd785f5e6 Always display max upload size in admin panel 2015-02-13 11:39:30 +01:00
Joas Schilling
b768a70616 Use filterNotificationTypes to filter the types and group the methods 2015-02-13 11:30:36 +01:00
Joas Schilling
9ccfbc14f6 Copy sharing related activity code to Files_Sharing activity extension 2015-02-13 11:16:43 +01:00
Jenkins for ownCloud
6b1ed4d688 [tx-robot] updated from transifex 2015-02-13 01:55:06 -05:00
Jenkins for ownCloud
e929d43bb6 [tx-robot] updated from transifex 2015-02-12 01:54:41 -05:00
Lukas Reschke
1c1bd058e4 Remove unused file 
This file is unused and has been last modified two years ago. Furthermore it won't evne work anymore properly because it uses things  like `CONFIG_DATEFORMAT` which are gone a long time ago...
 2015-02-11 23:26:48 +01:00
Jenkins for ownCloud
9baf7a0a3f [tx-robot] updated from transifex 2015-02-11 01:55:07 -05:00
Morris Jobke
60cadf5647 [files_external] ftp tests 2015-02-10 22:34:58 +01:00
Morris Jobke
64a3e6eb22 add rreadme for files external tests 2015-02-10 20:43:32 +01:00
Morris Jobke
10e91c6a48 [files_external] sftp tests 2015-02-10 19:53:01 +01:00
Vincent Petry
bd01ff135a Merge pull request #13190 from is-apps/master-sftp-key 
Add SFTP public key authentication support
 2015-02-10 16:44:29 +01:00
Morris Jobke
f7bbe081b3 [files_external] add SMB autotest 2015-02-10 10:30:10 +01:00
Jenkins for ownCloud
124e48aec0 [tx-robot] updated from transifex 2015-02-10 01:55:06 -05:00
Morris Jobke
1bb6de7c1b Merge pull request #13425 from owncloud/phpdoc_cleanup 
Cleanup of PHPDoc return types
 2015-02-10 01:14:00 +01:00
Morris Jobke
4a99849c6c Merge pull request #13663 from owncloud/issue/13624-notification-when-favorting-fails 
Only update favorite icon if the operation was successful
 2015-02-10 00:05:39 +01:00
blizzz
dc475ab3e0 Merge pull request #13925 from owncloud/fix-13898 
no fruitless count attempts, and notification should disappear
 2015-02-09 16:55:50 +01:00
Vincent Petry
2bb65dd9b1 Merge pull request #13364 from is-apps/files_external_cleanup 
Clean up files_external
 2015-02-09 13:20:42 +01:00
Jenkins for ownCloud
e2d4b3c123 [tx-robot] updated from transifex 2015-02-09 01:54:53 -05:00
Jenkins for ownCloud
60e771685e [tx-robot] updated from transifex 2015-02-08 01:54:53 -05:00
Morris Jobke
108f3327e6 Merge pull request #13502 from owncloud/streamline-authentication-in-newfile 
Streamline CSRF and login check
 2015-02-07 13:27:46 +01:00
Morris Jobke
77c0314503 Merge pull request #13655 from Sugaroverdose/fix_#13632 
Do not change color of 'new' button on hover and make new file menu more consistent with button
 2015-02-07 13:25:43 +01:00
Morris Jobke
57c1b499a1 Merge pull request #13848 from owncloud/ldap-warn 
Reduce log level of bind failed to WARN - fixes  #11624
 2015-02-07 13:24:11 +01:00
Morris Jobke
b2f6b8d62e Merge pull request #13889 from owncloud/catch-exception 
Catch exception properly
 2015-02-07 13:23:34 +01:00
Jenkins for ownCloud
4bf7b2c130 [tx-robot] updated from transifex 2015-02-07 01:54:35 -05:00
Morris Jobke
4e18b52527 Show message if upload of folder isn't allowed 
* current firefox doesn't throw an exception anymore
	* it just reads 0 bytes -> folder or empty file
* upload of folder or empty file isn't supported in every
  browser except Chrome
* fixes #13940
 2015-02-06 11:15:09 +01:00
Lukas Reschke
a67627140c Revert "Add OCS sharing info to capabilities" 2015-02-07 00:12:26 +01:00
Frank Karlitschek
0b421e821b Merge pull request #13692 from rullzer/capabilities 
Add OCS sharing info to capabilities
 2015-02-06 16:46:47 -05:00
Thomas Müller
b4b45a1a52 Merge pull request #13954 from owncloud/fix-enc-mig-user-retrieval 
Fix enc mig user retrieval
 2015-02-06 21:26:32 +01:00
Jenkins for ownCloud
988027fdca [tx-robot] updated from transifex 2015-02-06 15:26:04 -05:00
Arthur Schiwon
15b2d33599 always specify limit, except you do like questionable surprises 
always specify limit, except you do like questionable surprises, part 2
 2015-02-06 17:51:40 +01:00
Bjoern Schiessle
b2e13229fa don't check if we have a valid user 2015-02-06 17:31:15 +01:00
Roeland Jago Douma
fe2aca5aa8 Updated unit tests 2015-02-06 12:13:53 +01:00
Roeland Jago Douma
3be3e20c0f Bit better formatting when using json output 2015-02-06 10:55:33 +01:00
Roeland Jago Douma
d4e361db44 Updated sharing capabilities 
Moved to files_sharing
Added more capabilities.
Tried to order to capabilities more OO style
 2015-02-06 10:33:08 +01:00
Jenkins for ownCloud
bd60abbefc [tx-robot] updated from transifex 2015-02-06 01:57:07 -05:00
Arthur Schiwon
2bcb786214 no fruitless count attempts, and notification should disappear 2015-02-05 16:25:22 +01:00
Jenkins for ownCloud
9adff77040 [tx-robot] updated from transifex 2015-02-05 01:54:49 -05:00
Lukas Reschke
cc80ce70b4 Catch exception properly 
`\OCA\Files\Helper::buildFileStorageStatistics` might throw an exception from `OC_Helper::getStorageInfo`, previously this lead to a uncatched exception being thrown when invoking this methods.

This was user triggable by for example calling `/index.php/apps/files/ajax/delete.php` with a not existing dir (for example `dir=asdf/../&allfiles=true`)
 2015-02-04 15:58:16 +01:00
Roeland Jago Douma
bcae79a85a Split up unit tests 2015-02-04 15:49:20 +01:00
Roeland Jago Douma
083ebca812 Added unit test to test getCapabilities for files_sharing 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
0452fde212 Converted getCapabilities to non static function 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
4801d9c02a Use single quotes 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
ea1f726b7d Only return capabilities if they are set 2015-02-04 14:56:31 +01:00
Roeland Jago Douma
b3ea849a87 Added capabilities whether a server allows public links 
This fixes #13673.
It now lists link sharing, passwords enforced, and if public uploads are
allowed.
 2015-02-04 14:56:31 +01:00
blizzz
09216ef49b Merge pull request #13849 from owncloud/ldap-oc8-update 
no update routine needed from OC 7 to 8
 2015-02-04 14:19:58 +01:00
Jenkins for ownCloud
77e9c212ed [tx-robot] updated from transifex 2015-02-04 01:55:49 -05:00
Morris Jobke
166c4e266f Reduce log level of bind failed to WARN - fixes #11624 2015-02-03 11:44:28 +01:00
Arthur Schiwon
02a1cc01b6 no update routine needed from OC 7 to 8 2015-02-03 11:43:47 +01:00
Thomas Müller
a24d73aa0c Merge pull request #13837 from owncloud/endless-redirect 
Add callCheck to testremote.php
 2015-02-03 11:28:15 +01:00
Jenkins for ownCloud
6aef13fb07 [tx-robot] updated from transifex 2015-02-03 01:54:50 -05:00
Lukas Reschke
4270188252 Add callCheck to testremote.php 
Without CSRF check this file might be tricked into requesting itself which would result in an endless loop and thus potentially ending in a Denial of Service.
 2015-02-02 19:39:41 +01:00
Morris Jobke
1bb8d5978c Merge pull request #13817 from owncloud/core-apps-dependencies 
encryption requires openssl and user_ldap requires ldap 🙊
 2015-02-02 12:49:45 +01:00
Joas Schilling
12f835b198 toggle back when the action was not performed 2015-02-02 11:17:55 +01:00
Morris Jobke
8e2b99c3a9 fix response for tags and show error message 2015-02-02 11:17:54 +01:00
Joas Schilling
df75a6e5f3 Only update favorite icon if the operation was successful 
Also shows a notification in case an error occured on updating the tags
 2015-02-02 11:17:54 +01:00
Thomas Müller
c9543c9e8e encryption requires openssl and user_ldap requires ldap 🙊 2015-02-02 09:20:05 +01:00
Jenkins for ownCloud
800829d93d [tx-robot] updated from transifex 2015-02-02 01:54:32 -05:00
Jenkins for ownCloud
a3067b3b9f [tx-robot] updated from transifex 2015-02-01 01:54:33 -05:00
Lukas Reschke
012d06e8a2 Merge pull request #13797 from owncloud/fix_move_del_of_remote_shares 
make sure that we get the correct user from the path
 2015-01-31 08:52:07 +01:00
Jenkins for ownCloud
c877fbdac8 [tx-robot] updated from transifex 2015-01-31 01:54:39 -05:00
Bjoern Schiessle
9ef96e4dd5 no need to initialize the same view twice 2015-01-30 14:39:31 +01:00
Bjoern Schiessle
ed29c6ce86 get correct user for paths to the trash bin, needed for remote shares if the size of of trash gets calculated 2015-01-30 14:39:09 +01:00
Morris Jobke
e7900ba255 Merge pull request #13508 from owncloud/failed-delete-cache 
Dont remove a file from cache if the delete operation failed
 2015-01-30 14:08:44 +01:00
Jenkins for ownCloud
f4d20dc1f3 [tx-robot] updated from transifex 2015-01-30 01:55:06 -05:00
Morris Jobke
b1d8d88df8 Merge pull request #13760 from owncloud/create_enc_key_for_remote_shares 
make sure that we always create a public share key for remote shares
 2015-01-29 17:54:04 +01:00
Joas Schilling
333f4e7913 Fix intendation 2015-01-29 16:57:46 +01:00
Joas Schilling
4a5f626979 Fix more assertions 2015-01-29 16:54:27 +01:00
Joas Schilling
9a7dd57bc8 Fix 2 assertions 2015-01-29 16:09:35 +01:00
Thomas Müller
5c8e5e223d Merge pull request #13728 from owncloud/federated_cloud 
rename 'server-to-server sharing' to 'federated cloud'
 2015-01-29 15:54:19 +01:00
Robin Appelman
ce0aa02aac Dont do a cache rename if we cant delete the source file 2015-01-29 15:52:40 +01:00
Robin Appelman
215388f4e0 Make sure we delete the file when doing a cross storage trashbin move 2015-01-29 15:40:01 +01:00
Robin Appelman
d4c4e2a322 Detect failed deletes in the trashbin 2015-01-29 15:39:58 +01:00
Bjoern Schiessle
8a091629dc rename 'server-to-server sharing' to 'federated cloud' 2015-01-29 15:05:39 +01:00
Bjoern Schiessle
c78e3c4a7f make sure that we always create a public share key for remote shares 2015-01-29 14:23:14 +01:00
Thomas Müller
a25063a8ed Merge pull request #13746 from owncloud/no-groups-provisioning-api 
disallow provisioning api to be enabled for groups only
 2015-01-29 12:47:54 +01:00
Thomas Müller
099d43b1f9 Merge pull request #13604 from owncloud/encryption-key-migration-as-repair-step 
adding console command to migrate encryption keys - refs #13450
 2015-01-29 10:30:12 +01:00
Thomas Müller
f60406102f disallow provisioning api to be enabled for groups only 2015-01-29 10:00:54 +01:00
Jenkins for ownCloud
65871ffea3 [tx-robot] updated from transifex 2015-01-29 01:54:35 -05:00
Arthur Schiwon
73600cfdd8 and escape the search term 2015-01-29 00:27:05 +01:00
Arthur Schiwon
953a88785b 💄 2015-01-28 23:57:04 +01:00
Sugaroverdose
e57e273a40 Prevent 1px padding between button and dropdown in ie11 when zooming 2015-01-28 22:44:12 +03:00
Thomas Müller
659f958d01 Merge pull request #13401 from is-apps/amazon_s3_checkboxes 
Tidy formatting of Amazon S3 checkboxes
 2015-01-28 18:50:14 +01:00
Sugaroverdose
0418c9da3d Play with z-index to make proper dropdown overlap 2015-01-28 20:24:12 +03:00
Arthur Schiwon
31de757514 fix counting of users in primary group 2015-01-28 15:52:59 +01:00
Robin Appelman
a59612752e Fix trash error when deleting files with the same name at the same time (happens in unit tests) 2015-01-28 15:16:55 +01:00
Arthur Schiwon
323af55b50 inlcude AD primary group in user filter, if a group is selected. fixes #12190 2015-01-28 14:12:12 +01:00
Jenkins for ownCloud
55142186de [tx-robot] updated from transifex 2015-01-28 01:55:53 -05:00
Morris Jobke
87b39e8f03 Merge pull request #13525 from owncloud/s2s-fixscanfileforbrokenstorage 
Catch storage exception in scanner for remote shares
 2015-01-28 00:31:37 +01:00
Vincent Petry
acec40fe5a Merge pull request #13561 from owncloud/trash-finaldeletewhencrossstoragefix 
Call final unlink in trash wrapper's storage
 2015-01-27 17:05:38 +01:00
Vincent Petry
3764515365 Allow saving incomplete external storage config 
This is needed for Dropbox and others that need a token.
 2015-01-27 13:44:05 +01:00
Vincent Petry
c4b02176dc Fix mount config unit test failures 
Because setStorageId now instantiates storages, they might throw
exceptions if arguments are missing.

This fixes the unit test to not throw exceptions and have their default
config arguments set.
 2015-01-27 13:44:05 +01:00
Thomas Müller
1add2f3f58 Merge pull request #13679 from owncloud/public-disablesharejsplugin 
Disable JS plugin for sharing in public mode
 2015-01-27 09:33:38 +01:00
Thomas Müller
29f49ddc3d Merge pull request #13691 from owncloud/s2s-acceptsinglefile 
Only reload file list after remote share accept request returns
 2015-01-27 09:32:33 +01:00
Jenkins for ownCloud
c8f58054b0 [tx-robot] updated from transifex 2015-01-27 01:54:34 -05:00
Vincent Petry
182b1937bb Only reload file list after remote share accept request returns 
When accepting a remote share, an ajax request is sent to the server.
Only once this request returns should the file list be reloaded.
 2015-01-26 21:22:22 +01:00
Vincent Petry
efcd89cb18 Do not disclose share owner in public file list 2015-01-26 19:55:48 +01:00
Vincent Petry
86689ef400 Disable JS plugin for sharing in public mode 
This removes the logic that registers the share action and modifies the
rows. Share actions aren't needed in the public file list.
 2015-01-26 19:55:48 +01:00
Vincent Petry
bd888748bd Merge pull request #13490 from owncloud/fix_reshare_s2s_share 
use uid provided by setupfs hook to mount server2server shares
 2015-01-26 19:54:14 +01:00
Bjoern Schiessle
5ba19ba7fc certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages 2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a certificate manager only needs the user-id, no need to pass on the complete user object 2015-01-26 16:58:52 +01:00
Bjoern Schiessle
66f0db30b2 use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares 2015-01-26 16:54:50 +01:00
Vincent Petry
d5b61f9afe Prevent double slash in shareinfo request URL 2015-01-26 16:19:38 +01:00
Vincent Petry
5376b0b123 Add back exit() 2015-01-26 16:07:28 +01:00
Vincent Petry
f6e644b43f Catch storage exception in scanner for remote shares 
Whenever an exception occurs during scan of a remote share, the share is
checked for availability. If the storage is gone, it will be removed
automatically.

Also, getDirectoryContent() will now skip unavailable storages.
 2015-01-26 13:59:49 +01:00
Vincent Petry
02b9bad81b Fix bogus deletion on copy + unlink through rename 
Cross-storage rename would cause copy + unlink. That unlink operation
must not trigger the trashbin.
 2015-01-26 12:22:22 +01:00
Joas Schilling
d6939d67da Remove duplicated definition of APIController 2015-01-26 10:20:01 +01:00
Sugaroverdose
8605e84547 Fix #13632 and make new file menu more consistent with button 2015-01-25 20:15:08 +03:00
Jenkins for ownCloud
a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Lukas Reschke
b848062d88 Parse backslash as directory separator in breadcrumb 
This will parse backslashes as directory separators in breadcrumbs. Thus when accessing something like `/index.php/apps/files?dir=foo\foo` the breadcrumb will properly resolve this instead of showing `foo\foo`

Fixes https://github.com/owncloud/core/issues/13643
 2015-01-24 09:56:00 +01:00
Jenkins for ownCloud
b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Bjoern Schiessle
73a058e301 by default send mail for new server-to-server share 2015-01-23 21:59:07 +01:00
Vincent Petry
a1cc9eea56 Add trashbin storage wrapper unit test for versions 2015-01-23 18:39:21 +01:00
Vincent Petry
1f39a7aabe Simplify trash storage unit tests 
Needed to make it properly init the mount points
 2015-01-23 18:08:59 +01:00
Vincent Petry
1a06edd712 Unregister trashbin storage wrapper at the end of tests 
Some more tests that uses the storage wrapper now remove it afterwards
 2015-01-23 15:36:09 +01:00
Robin Appelman
87a1b2bdc4 Preserve mtime when doing cross storage move 2015-01-23 15:11:27 +01:00
Vincent Petry
2e8c70327a Remove storage wrapper for oc_trashbin in unit test 2015-01-23 14:55:38 +01:00
Robin Appelman
91f3952ac1 Only move files from the current user to the trashbin 2015-01-23 14:19:36 +01:00
Vincent Petry
67f1534e0f Call final unlink in trash wrapper's storage 
In the case of cross-storage delete, the files are copied to the trash,
then deleted. The final delete on the source storage would still reach
the trash wrapper.

This fix makes forwards that second call to the wrapped storage to make
the final delete work.

It fixes the issue with remote shares, local shares and external
storage.

Also, it uses a new function "renameRecursive" that renames the files
and preserves the mtimes (like "copy_recursive" did in the past))
 2015-01-23 12:20:54 +01:00
Joas Schilling
7e6d2c73d2 Ignore favorites that are not available when creating the favorites list 
Also correctly return the exception for all cases when adding/removing favos
 2015-01-23 10:11:14 +01:00
Jenkins for ownCloud
bc93a8f140 [tx-robot] updated from transifex 2015-01-23 01:55:06 -05:00
Arthur Schiwon
9c7cd702c3 user fs must be setup up, so that the real user folder is mounted on the username based path 2015-01-22 19:16:28 +01:00
Thomas Müller
fc1865449d adding console command to migrate encryption keys - refs #13450 2015-01-22 16:10:45 +01:00
Jenkins for ownCloud
5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00
Morris Jobke
c931eafc1f Merge pull request #13517 from owncloud/keymanager-storage 
Bypass the view when storing encryption keys
 2015-01-22 00:41:48 +01:00
Morris Jobke
4dac664002 Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins 
[ignore] delete all server-to-server shares if a user gets deleted
 2015-01-22 00:37:39 +01:00
Lukas Reschke
762949afd9 Make naming of encryption app consistent 
Fixes https://github.com/owncloud/core/issues/13580
 2015-01-21 23:29:09 +01:00
Bjoern Schiessle
7216983a08 delete all server-to-server shares if a user gets deleted 2015-01-21 17:11:34 +01:00
Thomas Müller
8ba42abbe4 Merge pull request #13432 from owncloud/animate_gifs_public_sharing 
show animated gifs on public sharing page
 2015-01-21 17:09:46 +01:00
Thomas Müller
9921308c62 Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog 
External share dialog must properly read entered password
 2015-01-21 16:51:56 +01:00
Vincent Petry
c48307027c Fixed external cache test namespace 2015-01-21 15:52:56 +01:00
Vincent Petry
9fbdd1072e Fix webdav mkdir for remote shares 2015-01-21 15:14:57 +01:00
Vincent Petry
f3d696599a Add unit test for external share JS dialog 
Moved external share JS code into a small plugin to make it testable.

Added unit test for the external share dialog logic + ajax calls.
 2015-01-21 11:26:54 +01:00
Vincent Petry
23ea45760f External share dialog must properly read entered password 2015-01-21 11:26:36 +01:00
Jenkins for ownCloud
b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Lukas Reschke
2ed2a7c7a8 Merge pull request #13520 from owncloud/fix-comparison-op 
this must be larger then (>), since buggy behaviour occurs when the para...
 2015-01-20 20:15:04 +01:00
Arthur Schiwon
9cb1ef5675 this must be larger then (>), since buggy behaviour occurs when the parameter is a small number 2015-01-20 17:50:53 +01:00
Robin Appelman
750cff0e3e Bypass the view when storing encryption keys 2015-01-20 16:20:49 +01:00
Thomas Müller
87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00
Lukas Reschke
3f5d4d82e4 Streamline auth and CSRF check in scan.php 
Furthermore a not logged-in user was able to access this page before which resulted in a Fatal PHP error since the filesystem could not get setup properly.
 2015-01-20 12:30:16 +01:00
Lukas Reschke
e25a0303f4 Streamline CSRF and login check 
Let's make this consistent with other pieces of the code to make it easier to auditable.
 2015-01-20 12:24:13 +01:00
Jenkins for ownCloud
2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Morris Jobke
870bc429b2 Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth 
Prioritise Basic Auth header over Cookie
 2015-01-19 22:23:02 +01:00
Ross Nicoll
1c2cbf6fc6 Align checkbox configuration in external files 
Modified CSS for files_external application to render labels around checkboxes at the same
width as other input elements, aligning them with other elements on the same page.
 2015-01-19 17:01:25 +00:00
Georg Ehrke
374ddbff55 show animated gifs on public sharing page 2015-01-19 16:20:06 +01:00
Morris Jobke
2229290cca fix typo of blog -> changed to block 
* fixes #13460
 2015-01-19 15:57:53 +01:00
Thomas Müller
1810ea2d33 Merge pull request #13461 from owncloud/remove-strip-slashes 
Remove stripslashes() from newfolder.php
 2015-01-19 14:47:34 +01:00
Lukas Reschke
003fc183a2 Remove stripslashes() from newfolder.php 2015-01-19 14:12:36 +01:00
Morris Jobke
cd4c7fd11f Merge pull request #13377 from owncloud/trashbin_storage_wrapper 
[trashbin] replace hook with storage wrapper
 2015-01-19 13:17:52 +01:00
Thomas Müller
d75af7ddd2 Merge pull request #13362 from owncloud/fix-11442 
LDAP Wizared: update user or group count only, when the multiselect is closed
 2015-01-19 12:22:24 +01:00
Bjoern Schiessle
15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud
3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Morris Jobke
aff22b3225 Merge pull request #13276 from Sugaroverdose/fix_#11348 
fix safari rename button positioning #11348
 2015-01-18 21:42:06 +01:00
Lukas Reschke
48126c3f54 Merge pull request #13433 from owncloud/favoritesl10n 
fix unlocalized favorites browser title and alttext
 2015-01-18 20:36:19 +01:00
Thomas Müller
3d6f4ac24e Merge pull request #13457 from owncloud/enc-skippartfiles 
Skip stray part files during initial encryption
 2015-01-19 14:40:21 +01:00
Vincent Petry
7a1ab3bb5e Add class attribute types in encryption Util class 2015-01-19 13:01:52 +01:00
Vincent Petry
7c3c26ab94 Skip stray part files during initial encryption 2015-01-19 13:01:37 +01:00
Jenkins for ownCloud
31cd5185f1 [tx-robot] updated from transifex 2015-01-18 01:54:34 -05:00
Volkan Gezer
d253ef51a5 fix unlocalized favorites browser title and alttext 2015-01-17 16:52:36 +01:00
Lukas Reschke
dfbc405a45 Prioritise Basic Auth header over Cookie 
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header.

This patch adds a workaround the following way:

1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF)
2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth

Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well.

This requires proper testing also considering LDAP / Shibboleth and whatever instances.
 2015-01-17 13:29:07 +01:00
Jenkins for ownCloud
60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Sugaroverdose
141908bd9c Add ie8 text-overflow: ellipsis support 
minimum browser window width ≈ 1280px
 2015-01-17 01:43:42 +03:00
Sugaroverdose
b2879d3a99 use some magic to make 'popular browsers' work 
as expected with inline-block span
 2015-01-16 23:36:35 +03:00
Robin McCorkell
2b99fc76ec Cleanup of PHPDoc return types 2015-01-16 20:30:43 +00:00
Morris Jobke
48ad4ba9a0 Fixes shifted rename field 2015-01-16 17:32:18 +01:00
Jan-Christoph Borchardt
b81c89d400 compress icons of LDAP and WebDAV-Auth 2015-01-16 14:43:27 +01:00
Jan-Christoph Borchardt
7624b395f2 add icon for Provisioning API 2015-01-16 14:43:14 +01:00
Morris Jobke
1c4668f808 Merge pull request #13399 from owncloud/trashbin-fixpreviewroute 
Fix preview route for trashbin
 2015-01-16 13:48:02 +01:00
Sergei Shuykov
4d2ae71bf2 fix_#11348 Safari rename button positioning 2015-01-16 14:43:34 +03:00
Jenkins for ownCloud
a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Vincent Petry
a76f0a0ba7 Fix preview route for trashbin 2015-01-15 18:45:24 +01:00
Vincent Petry
7f24e77cfc Disallow ctrl click to select when selection not allowed 2015-01-15 18:16:27 +01:00
Vincent Petry
d40301492d Auto-blur when clicking on file to download 2015-01-15 18:08:36 +01:00
Vincent Petry
7d81299014 Fixed thumbnal z-index for when no checkbox is there 
In file lists with no selection checkbox, the CSS selector is different.
The thumbnail also needs position:absolute and a z-index to be displayed
above the row's grey highlight.
 2015-01-15 17:53:23 +01:00
Arthur Schiwon
56ba07aa5c coding style 2015-01-15 12:25:36 +01:00
Thomas Müller
2fbe8bbcba Merge pull request #13370 from Sugaroverdose/fix_#13322 
Force browser to redraw favorite icon on src change
 2015-01-15 11:20:22 +01:00
Morris Jobke
9b7c1a0093 Merge pull request #13347 from owncloud/share-scanpermissionsfromsource 
Use source storage permissions when scanning shared storage
 2015-01-15 11:15:15 +01:00
Sugaroverdose
b2de3b3d8d Force browser to redraw favorite icon 
on src change
 2015-01-15 12:26:55 +03:00
Jenkins for ownCloud
4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Robin McCorkell
9d0915013b Merge pull request #13352 from owncloud/hhvm-array-key 
HHVM: Do not use key() on array as the result depends on the internal array pointer.
 2015-01-15 01:06:45 +00:00
Andreas Fischer
b4a52e889a Do not use key() on array as the result depends on the internal array pointer. 2015-01-15 00:48:10 +01:00
Ross Nicoll
7620af7550 Updated Dropbox and Google UI Javascript to create input elements instead of anchor. 2015-01-14 17:21:39 +00:00
Ross Nicoll
02c6b72e25 Change from array() to [] style in files_external application info. 2015-01-14 17:16:12 +00:00
Morris Jobke
455ad005a0 Merge pull request #13350 from owncloud/autoload-translations 
Autoload app's js translations
 2015-01-14 18:12:05 +01:00
Vincent Petry
a9f0582e3e Use source storage permissions when scanning shared storage 2015-01-14 18:11:23 +01:00
Ross Nicoll
64f4f8fc84 Add support for SFTP key authentication 
Add support for external files accessed via SFTP using public key exchange authentication.
Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised.
Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys.
Generated public keys are saved in user's data directory for easy retrieval by an external application.
Add controller for SFTP key generation AJAX
SFTP class initialisation no longer produces a warning if the password field is missing.
Add unit tests for SFTP with key authentication backend
 2015-01-14 17:00:34 +00:00
Arthur Schiwon
3d94aa8953 update user or group count only, when the multiselect is closed 2015-01-14 17:31:20 +01:00
Arthur Schiwon
672bc28715 allow to read again objectclasses and groups under certain conditions 2015-01-14 15:15:55 +01:00
Lukas Reschke
01304aa27e Merge pull request #13351 from owncloud/check-for-existence 
Check for existence of $_GET keys
 2015-01-14 15:00:25 +01:00
Vincent Petry
87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Lukas Reschke
96cd7c017a Check for existence of $_GET keys 
`$dir` may for example very well not get passed at well.
 2015-01-14 14:16:18 +01:00
Thomas Müller
25806346c2 remove deprecated code - fixes #13119 2015-01-14 13:56:49 +01:00
Morris Jobke
3a6d2fcc10 Merge pull request #13345 from owncloud/increase-files-external-versions 
Increase files_externals oC required version and its own version
 2015-01-14 13:24:08 +01:00
Thomas Müller
9b7421972b Merge pull request #13332 from oparoz/fix-download-button 
Download the current public folder only
 2015-01-14 12:24:06 +01:00
Joas Schilling
f031a479ad Increase files_externals oC required version and its own version 2015-01-14 12:21:47 +01:00
Björn Schießle
9a487f0445 Merge pull request #13286 from owncloud/sharing_upgrade 
update script for new server-to-server sharing
 2015-01-14 11:57:30 +01:00
Lukas Reschke
64ee942e7d Merge pull request #13288 from owncloud/enc_fix_public_download 
[encryption] fix download of public shared files
 2015-01-14 11:55:13 +01:00
Thomas Müller
e2a3547127 Merge pull request #13335 from owncloud/disable-rememberme-files-external 
The files_external app might need the password so autologin must be disabled
 2015-01-14 11:51:16 +01:00
Björn Schießle
5745b68fa9 Merge pull request #13311 from owncloud/fix_restore_keys 
adapt decrypt all to the new folder structure
 2015-01-14 11:40:22 +01:00
Olivier Paroz
356bfb36dc Download the current public folder only 
From within a shared/public directory, when drilling down folders, some
users want to be able to download what they're currently looking at, not
the whole shared folder. The whole archive is always a click away anyway
since a user can click on the home button.
 2015-01-14 11:28:36 +01:00
Joas Schilling
caaae1094f The files_external app might need the password so autologin must be disabled 2015-01-14 10:19:22 +01:00
Morris Jobke
65ee2b1de8 Merge pull request #13325 from owncloud/kill-strip-slashes 
Get rid of `stripslashes()`
 2015-01-14 08:27:42 +01:00
Jenkins for ownCloud
f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Arthur Schiwon
51d783ca6e JS cleanup 2015-01-13 18:39:37 +01:00
Lukas Reschke
3ff3f641d6 Get rid of stripslashes() 
This conversions are actually totally unneeded and probably left-overs from ages where the safe_mode was still a valid thing.
 2015-01-13 17:43:36 +01:00
Bjoern Schiessle
d50e70ba3a set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table 2015-01-13 17:24:00 +01:00
Lukas Reschke
4766dac6f4 Fix PHP doc and enforce type 2015-01-13 14:47:54 +01:00
Bjoern Schiessle
83574053a3 if we download a public shared file we need to retrieve the user from the path 2015-01-13 14:22:54 +01:00
Joas Schilling
6d73aff9ad Merge pull request #13277 from owncloud/pasteurl 
add https:// placeholder for From Link feature. closes #13255
 2015-01-13 12:51:58 +01:00
Bjoern Schiessle
89f17ef6fe adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8 2015-01-13 12:45:33 +01:00
Morris Jobke
c4aeb0b5b5 Merge pull request #13289 from owncloud/fav-keepfavoncancelrename 
Properly update internal file info with updated tags
 2015-01-13 08:28:30 +01:00
Jenkins for ownCloud
3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Thomas Müller
d20a1bbdbf Merge pull request #13154 from owncloud/fix13141 
don't show no files yet when mask is in place, fixes #13141
 2015-01-12 22:48:25 +01:00
Volkan Gezer
18b5966f3a add https:// placeholder for From Link feature. closes #13255 2015-01-12 20:11:45 +01:00
Joas Schilling
ec70246be2 Merge pull request #13272 from owncloud/fav-renamekeepfav 
Fixes issues when renaming favorite file
 2015-01-12 19:12:31 +01:00
Vincent Petry
8cc13031e9 Return path attribute for ajax rename operations 
This fixes an issue when renaming files from a flat list view like
"Favorites" or "Shared with you", in which case the path needs to be
present in the response to make sure the data-path attribute is properly
set in the JS side.
 2015-01-12 18:15:31 +01:00
Vincent Petry
dac7828480 Return tags after rename 
To make it possible for the web UI to correctly display the tag/favorite
information after a rename, this information is now returned in the
rename response
 2015-01-12 18:14:17 +01:00
Vincent Petry
ef1dd3ea0a Properly update internal file info with updated tags 
Whenever tags are updated, they need to be updated in the file list's
file info array as well.

This commit also adds unit tests and makes sure that whichever tags are
sent back by the server after update are used when updating
attributes/fileinfo.
 2015-01-12 17:58:57 +01:00
Morris Jobke
d36a2c8b04 Merge pull request #13285 from owncloud/fix-encryption-check-number-of-parts 
Check array size, before using the 3rd element from it
 2015-01-12 17:58:36 +01:00
Morris Jobke
2a03568623 Merge pull request #13279 from owncloud/upload-original-name 
Send the proper original name for uploaded files
 2015-01-12 17:48:12 +01:00
Morris Jobke
af4d60adb0 Merge pull request #13280 from owncloud/fix-12306 
fix retrieval of user groups
 2015-01-12 17:42:37 +01:00
Joas Schilling
5c03e2207b Check array size, before using the 3rd element from it 2015-01-12 17:05:51 +01:00
Morris Jobke
7a393abdbd Merge pull request #13210 from owncloud/use-isset 
Check for existence of $_GET keys
 2015-01-12 16:35:31 +01:00
Arthur Schiwon
f28235a7ef fix retrieval of user groups 2015-01-12 16:25:11 +01:00
Robin Appelman
6daedaf344 Send the proper original name for uploaded files 2015-01-12 15:30:47 +01:00
Lukas Reschke
5f7c115dfe Merge pull request #13268 from owncloud/dnd-files-container 
Allow dropping files on the table container
 2015-01-12 13:27:53 +01:00
Vincent Petry
512ba327f7 Allow dropping files on the table container 
Make it possible to drop files below the table even if the table is
smaller than the window height.

Added a check to make sure upload is not triggered on invisible lists.
 2015-01-12 12:29:26 +01:00
Björn Schießle
331d73c3a3 Merge pull request #13182 from owncloud/download_versions 
make versions of shared files downloadable
 2015-01-12 12:03:21 +01:00
Thomas Müller
ddf81c2ed9 Merge pull request #13254 from owncloud/fixsharel10n 
make Share/Download buttons localized again
 2015-01-12 09:31:35 +01:00
Jenkins for ownCloud
9e550ab844 [tx-robot] updated from transifex 2015-01-12 01:55:52 -05:00
Volkan Gezer
d8adc76125 l10n: delete permanently fix 2015-01-11 17:15:58 +01:00
Volkan Gezer
691fab8be3 make Share button localized again 
it seems we have forgotten to use named FileAction
 2015-01-11 15:57:45 +01:00
Volkan Gezer
f1aa8377fe Merge pull request #13251 from owncloud/spaceoutside 
keep spaces out of translation
 2015-01-11 15:29:21 +01:00
Volkan Gezer
8cd0962c6a suggestion by transifex translator 2015-01-11 13:47:37 +01:00
Volkan Gezer
2df331b6ed keep spaces out of translation 
otherwise translators cannot notice it on Transifex
 2015-01-11 13:43:43 +01:00
Jenkins for ownCloud
3425c73815 [tx-robot] updated from transifex 2015-01-11 01:54:32 -05:00
Volkan Gezer
33bb69e3e6 Merge pull request #13226 from owncloud/fix-encoding 
Don't double encode string
 2015-01-10 18:11:36 +01:00
Jenkins for ownCloud
22e5220c1f [tx-robot] updated from transifex 2015-01-10 01:54:35 -05:00
Lukas Reschke
e4840b5250 Don't double encode string 
We already use `.text()` here which automatically properly encodes the string. Thus the string will be double-encoded and look ugly. (i.e. when you search for ">" you will see "No results found for >")

Fixes itself.
 2015-01-10 01:19:37 +01:00
Vincent Petry
59a1d16d0f Merge pull request #13204 from owncloud/enc_fix_key_lost 
Encryption fix key lost if group share gets renamed
 2015-01-09 18:40:51 +01:00
Lukas Reschke
f65cf498f4 Check for existence of $_GET keys 
Otherwise PHP errors are thrown in the error log.
 2015-01-09 17:46:14 +01:00
Thomas Müller
b1031c6355 Merge pull request #13188 from owncloud/add-check-if-user-is-logged-in 
Add check if user is logged-in
 2015-01-09 16:45:53 +01:00
Bjoern Schiessle
0500d3a506 unit tests 2015-01-09 15:49:44 +01:00
Bjoern Schiessle
6cc40552b1 don't move encryption keys if a mount point was renamed 2015-01-09 15:39:36 +01:00
Jan-Christoph Borchardt
720fe858a3 fix rename field position, fix #12927 2015-01-09 13:05:22 +01:00
Bjoern Schiessle
d699d31518 make versions of shared files downloadable 2015-01-09 12:46:24 +01:00
Lukas Reschke
1cfcec8684 Add check if user is logged-in 
Otherwise a fatal PHP error is thrown since the filesystem is not setup:
```
( ! ) Fatal error: Call to a member function getOwner() on null in /Users/lreschke/Programming/core/lib/private/files/filesystem.php on line 817
Call Stack
1	0.0004	247792	{main}( )	../index.php:0
2	0.0946	5088776	OC::handleRequest( )	../index.php:28
3	0.1423	7491280	OC\Route\Router->match( )	../base.php:748
4	0.1664	8592152	call_user_func:{/Users/lreschke/Programming/core/lib/private/route/router.php:250} ( )	../router.php:250
5	0.1664	8592216	__lambda_func( )	../router.php:250
6	0.1665	8599064	require_once( '/Users/lreschke/Programming/core/apps/files_versions/ajax/getVersions.php' )	../route.php(135) : runtime-created function:1
7	0.1801	9061096	OCA\Files_Versions\Storage::getUidAndFilename( )	../getVersions.php:7
8	0.1801	9061144	OC\Files\Filesystem::getOwner( )	../storage.php:45
```

Furthermore this adds the CSRF check as a nice-to-have addition, the requests accessing this are done via the jQuery AJAX methods and thus the header is automatically added to all requests already.
 2015-01-09 11:55:18 +01:00
Jörn Friedrich Dreyer
45a20744fc add js tests for filelist filtering 2015-01-09 10:49:22 +01:00
Lukas Reschke
a5099b01f9 Merge pull request #12984 from owncloud/ldap-user-cleanup-master 
Ldap user cleanup master
 2015-01-09 10:47:02 +01:00
Lukas Reschke
b4606ec24f Merge pull request #13184 from owncloud/fix-key 
Verify existence of $_GET key
 2015-01-09 10:39:22 +01:00
Jenkins for ownCloud
d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Lukas Reschke
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
Arthur Schiwon
c1a79d24c5 fix order of initalizing instance properties, and paremeter order in a method call 2015-01-08 17:45:07 +01:00
Thomas Müller
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
Arthur Schiwon
c7f273040e fix table name for getList 2015-01-08 14:21:40 +01:00
Lukas Reschke
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
Vincent Petry
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
Jenkins for ownCloud
6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Christopher Bunn
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
Martin
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
Morris Jobke
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
Bjoern Schiessle
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
Jörn Friedrich Dreyer
0bb91cfcf3 don't show no files yet when mask is in place, fixes #13141 2015-01-07 15:59:39 +01:00
Joas Schilling
70dcebbf92 Correctly return false when translating a foreign activity 2015-01-07 15:02:25 +01:00
Arthur Schiwon
9668405ec7 doc fixes and removal of unnecessary use statements 2015-01-07 13:28:56 +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
Arthur Schiwon
6c335ee6fc add test for mapping's getList method 2015-01-07 12:39:29 +01:00
Joas Schilling
fb37b3c687 Extend Test\TestCase and do not use uniqid() 2015-01-07 10:34:42 +01:00
Jenkins for ownCloud
2daf90dae6 [tx-robot] updated from transifex 2015-01-07 01:55:42 -05:00
Arthur Schiwon
b9235e2a24 inject DB Connection to user manager 2015-01-07 00:52:18 +01:00
Arthur Schiwon
64f0b055e6 inject IDateTimeFormatter to show-remnants command 2015-01-06 23:40:00 +01:00
Arthur Schiwon
40ecd30fba inject oc config to User_LDAP 2015-01-06 23:28:49 +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
Arthur Schiwon
e724b78694 smaller fixes: coding style, PHPdoc, typos and few for DI 2015-01-06 17:50:06 +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
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
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
Jenkins for ownCloud
6a3f69c2d0 [tx-robot] updated from transifex 2015-01-06 01:54:59 -05:00
Jörn Friedrich Dreyer
7a812801db correctly clear searchbox when switching filelists 2015-01-05 17:53:14 +01: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
23900a5a39 filter trashbin and share views 2015-01-05 13:11:50 +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
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
Jenkins for ownCloud
8776271103 [tx-robot] updated from transifex 2015-01-05 01:54:36 -05:00
Tom Needham
f17f0ade7f Remove unnecessary setUp method 2015-01-04 23:10:44 +00:00
Jenkins for ownCloud
84ed1034b4 [tx-robot] updated from transifex 2015-01-04 01:54:53 -05:00
Morris Jobke
fcae87170d Merge pull request #13091 from owncloud/fix-provisioning-api 
Fix remaining unit tests for provisioning_api
 2015-01-03 22:41:44 +01:00
Tom Needham
a20de1548d Add proper group setup and teardown to all provisioning_api tests 2015-01-03 15:58:36 +00:00
Tom Needham
5c0d7f2ee5 Create admin group before running provisioning_api tests 2015-01-03 15:39:42 +00:00
Tom Needham
97d31946c3 Ensure admin group is present before running tests 2015-01-03 13:25:48 +00:00
Morris Jobke
92f062baac Merge pull request #13082 from mmattel/rename_text_no_external_storages 
adopt text "no external storage configured"
 2015-01-03 11:59:22 +01:00
Jenkins for ownCloud
05ffa3ab7a [tx-robot] updated from transifex 2015-01-03 01:54:29 -05:00
root
c44d41178a adopt text "no ecternal storage configured" 
storage -> storages
 2015-01-02 21:00:02 +01:00
Tom Needham
32d9563359 Change array element order to fix failing test 2015-01-02 19:07:31 +00:00
Tom Needham
a4f270a9ce Add placeholder app.php for provisioning_api so app is detected 2015-01-02 18:52:11 +00:00
Jörn Friedrich Dreyer
ba235eb51d delay hiding no results message until search is triggered 2015-01-02 16:13:15 +01:00