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

8559 commits

Author SHA1 Message Date
Björn Schießle
a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete 
[sharing] unshare childrens on delete
 2014-07-04 17:42:52 +02:00
Bjoern Schiessle
5397101e1c improved unit tests 2014-07-04 17:37:35 +02:00
Bjoern Schiessle
ddac446c5b always take unencrypted size 2014-07-04 16:44:50 +02:00
icewind1991
d3fab824f7 Merge pull request #9445 from owncloud/filelist-auth-error 
Reload the page when the files app encounters an authentication error
 2014-07-04 16:39:00 +02:00
Robin Appelman
4fe1cdd2a7 Add machine readable error messages to OC\JSON 
Reload the files app in case of authentication errors, expired tokens or disabled app

Reloading will triger the full server side handeling of those errors

formatting

fix missing semicolon + some jshint warnings
 2014-07-04 16:20:27 +02:00
Morris Jobke
574cb15c2d Merge pull request #9434 from owncloud/files-reloadpromiseissue 
Fix reload call for all subclasses
 2014-07-04 16:13:33 +02:00
Thomas Müller
2327d41b11 Merge pull request #9269 from owncloud/fix_versions_preview 
change order of registering api and capabilities to fix file version previews
 2014-07-04 15:25:24 +02:00
Morris Jobke
aae118890a Merge pull request #9440 from owncloud/files-fileactionsdeepcopy 
Fix FileActions merging override
 2014-07-04 14:49:00 +02:00
Morris Jobke
3d13e04170 Merge pull request #9426 from owncloud/design-remoteshare-confirm 
use icon-confirm instead of text for accepting remote share, works better with translations
 2014-07-04 14:13:44 +02:00
Vincent Petry
07118f599e Fix FileActions merging override 
When merging FileActions, the register() functio needs to correctly
override the previously merged action handler without affecting the
original one.
 2014-07-04 12:56:04 +02:00
Bjoern Schiessle
673b0f5eb9 add owner as parameter for delShareKey 2014-07-04 12:19:59 +02:00
Vincent Petry
59ca30d462 Fix reload call for all subclasses 
All subclasses must also properly return the ajax call object.
 2014-07-04 11:45:36 +02:00
Vincent Petry
5e8959a5b3 Return and use isPreviewAvailable for share previews 
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
 2014-07-04 11:16:23 +02:00
Bjoern Schiessle
e9f5730869 make sure that the umount hook always contains the path relative to data/user/files 2014-07-04 10:34:54 +02:00
Bjoern Schiessle
3b9fa81581 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 10:34:54 +02:00
Morris Jobke
ac00e4b6e6 IE8 fixes 2014-07-04 08:13:05 +02:00
Jenkins for ownCloud
e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Jan-Christoph Borchardt
8e617453e5 use icon-confirm instead of text for accepting remote share, works better with translations 2014-07-04 00:07:24 +02:00
Morris Jobke
3cbea82bd0 Merge pull request #9420 from owncloud/trashbin-hidesummarysize 
Hide the size in the trashbin summary row
 2014-07-03 17:37:33 +02:00
Morris Jobke
c223977794 Merge pull request #9407 from owncloud/fix-share-logo 
for shared links, use wide logo on desktop and icon on mobile
 2014-07-03 17:33:34 +02:00
Vincent Petry
52248d4d81 Hide the size in the trashbin summary row 
This also fixes the extra spacing that appearing on the right of the
table.
 2014-07-03 17:16:50 +02:00
Morris Jobke
a829d07234 Merge pull request #9403 from owncloud/design-fix-fileslistbottom 
Fix bottom of files list, add proper space to have room for dropdowns
 2014-07-03 16:40:38 +02:00
Jan-Christoph Borchardt
6c174813b6 Merge pull request #9394 from owncloud/design-fix-rename 
fix position of rename function, and text size
 2014-07-03 13:44:00 +02:00
Jan-Christoph Borchardt
c7101d26db fix checkbox shifting when rename input appears 2014-07-03 13:34:12 +02:00
Jan-Christoph Borchardt
e5f68bafb9 for shared links, use wide logo on desktop and icon on mobile 2014-07-03 12:20:44 +02:00
Jan-Christoph Borchardt
cee5afa8af reduce file list bottom whitespace a bit 2014-07-03 11:43:59 +02:00
Jan-Christoph Borchardt
6f14034c48 fix left margin of file list summary 2014-07-03 11:40:11 +02:00
Jan-Christoph Borchardt
4c97f2b3af add whitespace to bottom of Files list – more obvious it's the end, and space for share dropdown 2014-07-03 11:36:04 +02:00
Jan-Christoph Borchardt
e9f616b0a0 Merge pull request #9391 from owncloud/design-mobile-share 
Fix mobile share view glitches
 2014-07-03 09:45:19 +02:00
Jenkins for ownCloud
1a1c5aa3c0 [tx-robot] updated from transifex 2014-07-03 01:56:24 -04:00
Jan-Christoph Borchardt
e695244f32 fix position of rename function, and text size 2014-07-03 02:08:53 +02:00
Jan-Christoph Borchardt
079fee2c2a Merge pull request #9389 from owncloud/fix-nametext-height 
fix nametext height, was higher than the row
 2014-07-03 01:09:19 +02:00
Jan-Christoph Borchardt
019e1b1065 Merge pull request #9365 from owncloud/design-controls-polish 
Design controls polish
 2014-07-03 01:08:15 +02:00
Volkan Gezer
bf08e3a85e Merge pull request #9382 from owncloud/server2server-css 
fix lineheight of server2server share
 2014-07-03 00:39:37 +02:00
Jan-Christoph Borchardt
0df04975b0 use same logo for mobile as for when logged in, fix #9360 2014-07-02 23:33:20 +02:00
Jan-Christoph Borchardt
560c530875 hide text of download button, only show icon 2014-07-02 23:21:06 +02:00
Jan-Christoph Borchardt
0a91c22ebb shared view: remove whitespace glitch on right 2014-07-02 23:14:21 +02:00
Jan-Christoph Borchardt
a94130509a fix nametext height, was higher than the row 2014-07-02 22:54:30 +02:00
Volkan Gezer
586c4236fd fix lineheight of server2server share 2014-07-02 21:46:52 +02:00
Vincent Petry
ed29e7d160 Merge pull request #9329 from owncloud/sharing_check_target 
don't move a share mount point into a different mount point
 2014-07-02 21:01:03 +02:00
Vincent Petry
f1f66ff686 Merge pull request #9373 from owncloud/design-fix-modified 
shade color for modified dates again, fix #9363
 2014-07-02 21:00:32 +02:00
Vincent Petry
615d037d3e Merge pull request #9364 from owncloud/sharing_rename_mount_points 
[sharing] rename mount point of children if parent was renamed
 2014-07-02 18:48:07 +02:00
Vincent Petry
f4eb90e229 Merge pull request #9311 from owncloud/storage-not-available 
Handle storages not being available in webui and webdav
 2014-07-02 18:15:58 +02:00
Morris Jobke
b6aeea8c0b simplify formula and add comment 2014-07-02 17:20:56 +02:00
Jan-Christoph Borchardt
053b0a4063 shade color for modified dates again, fix #9363 2014-07-02 16:37:15 +02:00
Jan-Christoph Borchardt
2a9fb130ec make sure table header is white instead of slightly grey 2014-07-02 15:40:52 +02:00
Bjoern Schiessle
ea31ab7b5c rename mount point of children if parent was renamed 2014-07-02 15:39:38 +02:00
Morris Jobke
d2f3ff5c34 Merge pull request #9245 from owncloud/server2server-sharing-design-fixes 
drop unneeded code
 2014-07-02 15:34:57 +02:00
Robin Appelman
edb67f9f4d Remove invalid mounts from the active fs 2014-07-02 15:00:12 +02:00
Robin Appelman
0008db9995 Fix unit test 2014-07-02 14:39:45 +02:00
Morris Jobke
59629e688c Merge pull request #9341 from owncloud/sharing-fileactions-fix 
Fix fileActionsReady event after deferred file actions update
 2014-07-02 14:36:59 +02:00
Morris Jobke
456770fde9 Merge pull request #9344 from owncloud/files-scrollissue 
Fix files list scroll behavior
 2014-07-02 13:26:23 +02:00
Morris Jobke
5e986271ef Merge pull request #9336 from owncloud/fix-version-dropdown 
increase width of version dropdown - fixes #9270
 2014-07-02 12:04:04 +02:00
Jenkins for ownCloud
9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
Vincent Petry
32d2457e58 Fix files list scroll behavior 
View container height needs to be accurate and span over the whole
scroll container for infinite scrolling to work properly.
 2014-07-01 21:48:06 +02:00
Vincent Petry
025b71d068 Use fileActionsReady to re-render sharing icons 
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.

Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
 2014-07-01 21:32:04 +02:00
Jan-Christoph Borchardt
7760fd4bef add ellipsizing to restore string if text is too long 2014-07-01 20:37:14 +02:00
Bjoern Schiessle
bb935978fa don't move a share mount point into a different mount point 2014-07-01 19:38:55 +02:00
Vincent Petry
509cdebab7 Fix fileActionsReady event after deferred file actions update 2014-07-01 18:50:54 +02:00
Vincent Petry
fd68034357 Fixed remote share password param detection 2014-07-01 17:34:01 +02:00
Morris Jobke
eaf9d6eccc increase width of version dropdown - fixes #9270 2014-07-01 16:17:00 +02:00
Robin Appelman
8339618ead More error catching in list.php 2014-07-01 14:58:17 +02:00
Robin Appelman
8061a4ccc0 Remove external shares if the share is invalid 2014-07-01 14:58:07 +02:00
Vincent Petry
577d06ea4d Merge pull request #9328 from owncloud/extstorage-annoyingwarnings 
Fix warnings when personal is not set
 2014-07-01 14:51:01 +02:00
Robin Appelman
1c43081d38 Detect removed public shares 2014-07-01 14:36:06 +02:00
blizzz
16ce23d19d Merge pull request #9006 from owncloud/ldap_fix_bgjob 
LDAP: fix background job, fixes #8995
 2014-07-01 14:28:04 +02:00
Jörn Friedrich Dreyer
12420d08e2 change order of registering api and capabilities to fix file version previews 2014-07-01 14:09:48 +02:00
Vincent Petry
5e6f6da786 Fix warnings when personal is not set 2014-07-01 13:32:57 +02:00
Jörn Friedrich Dreyer
abc521dbf7 add missing backticks 2014-07-01 12:29:30 +02:00
Morris Jobke
08e49e9b07 Merge pull request #9313 from owncloud/design-icon-cancel 
change 'Cancel upload' text to x icon for more space in breadcrumbs bar
 2014-07-01 11:00:17 +02:00
Vincent Petry
19ab6165e7 Merge pull request #9300 from owncloud/extstorage-listfilterfix 
Use filtered list for ext storage list mounts API
 2014-07-01 09:56:47 +02:00
Jenkins for ownCloud
a878b42b42 [tx-robot] updated from transifex 2014-07-01 01:54:43 -04:00
Björn Schießle
f3973c1c20 Merge pull request #9240 from owncloud/enc_check_if_file_exists 
[encryption] check if file still exists before removing encryption keys
 2014-06-30 21:23:59 +02:00
Jan-Christoph Borchardt
07ba9442db Merge pull request #9305 from owncloud/design-share-fixes 
Design share fixes
 2014-06-30 18:46:37 +02:00
Jan-Christoph Borchardt
24277f0dd6 change 'Cancel upload' text to x icon for more space in breadcrumbs bar 2014-06-30 18:20:35 +02:00
Bjoern Schiessle
618c9fd033 improved error message 2014-06-30 16:28:40 +02:00
Robin Appelman
30c240a145 If loading a directory fails, navigate back to the previous directory 2014-06-30 16:27:31 +02:00
Robin Appelman
4526bc0ba6 Handle StorageNotAvailableException in ajax/list.php 2014-06-30 16:12:12 +02:00
Jörn Friedrich Dreyer
f35f14aa37 Merge pull request #9303 from owncloud/issue/8841 
Do not strict compare item source id so the dropdown is closed correctly
 2014-06-30 14:46:46 +02:00
Joas Schilling
5e4ac548bb Use attr() instead of data() so the item ids work as intended 
Fix #8841
 2014-06-30 14:21:27 +02:00
Jan-Christoph Borchardt
a4c693dd75 remove obsolete CSS, fix visual bug in share dialog #9255 2014-06-30 14:00:43 +02:00
Bjoern Schiessle
372d58544f no longer check if the external storage app is enabled, we use no the webdav implementation from core 2014-06-30 12:34:49 +02:00
Vincent Petry
8977a68548 Use filtered list for ext storage list mounts API 
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.

Since that call was missing the backend name which is important for the
UI, this one was added as well.
 2014-06-30 12:33:11 +02:00
Jenkins for ownCloud
589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Jenkins for ownCloud
ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04:00
Volkan Gezer
d918e5a68c Merge pull request #9278 from owncloud/l10n-servershare-dialog 
fix server share dialog title
 2014-06-28 14:44:37 +02:00
Morris Jobke
d5462fdb50 Merge pull request #9265 from owncloud/fix-whitespace 
fix trailing whitespace noted by Scrutinizer
 2014-06-28 12:26:09 +02:00
Morris Jobke
cec20d5049 Merge pull request #9020 from owncloud/l10n-external-errors-fix 
some strings to localize external mount api responses. fix #8094
 2014-06-28 11:40:32 +02:00
Jenkins for ownCloud
26d0978993 [tx-robot] updated from transifex 2014-06-28 01:54:54 -04:00
Volkan Gezer
11788c9579 fix server share dialog title 2014-06-28 01:54:51 +02:00
Bjoern Schiessle
1004836fd3 unit tests 2014-06-27 23:09:31 +02:00
Bjoern Schiessle
e4c45b5e26 check if file exists before deleting keys, and add debug output for every 
delete operation
 2014-06-27 23:09:31 +02:00
Bjoern Schiessle
706a8ace58 normalize path before comparison to make sure that we always find the mount point 2014-06-27 22:53:26 +02:00
Arthur Schiwon
fe0b75ccab also adapt result check from readAttribute 2014-06-27 20:09:16 +02:00
icewind1991
1a3e698294 Merge pull request #9263 from owncloud/remote-share-update 
Better detecting of remote changes for external shares
 2014-06-27 19:31:18 +02:00
Arthur Schiwon
ef7ab856f6 fix instantiation of Access class 2014-06-27 18:49:11 +02:00
Arthur Schiwon
df7678f01e specify no attribute for group exists check, as done with users 2014-06-27 18:49:11 +02:00
Jan-Christoph Borchardt
b7cb4f5a63 fix trailing whitespace noted by Scrutinizer 2014-06-27 18:25:56 +02:00
Vincent Petry
7a1b45c43b Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpage 
Allow late registration of file actions in public page
 2014-06-27 18:00:32 +02:00
Jan-Christoph Borchardt
a18658fa7f Merge pull request #9256 from owncloud/design-mobile-shared 
show share action of shared items darker to distinguish from non-shared,...
 2014-06-27 17:59:48 +02:00
Morris Jobke
44e1bfb0ea Merge pull request #9259 from owncloud/fix-rename-icon 
fix rename icon, fix #9257
 2014-06-27 17:41:23 +02:00
Robin Appelman
1bb1504d24 Improve comment 2014-06-27 17:31:51 +02:00
Robin Appelman
6f5d5b9a30 Also check for updated permissions for webdav storages 2014-06-27 17:27:47 +02:00
Vincent Petry
fd8b5680dd Merge pull request #8383 from owncloud/object_storage 
Object storage
 2014-06-27 16:53:03 +02:00
Vincent Petry
0ff30a7d5e Remove missed console.log in file list 2014-06-27 16:10:37 +02:00
Vincent Petry
13b7937381 Allow late registration of file actions in public page 2014-06-27 16:10:20 +02:00
Jan-Christoph Borchardt
e33fa226cd fix rename icon, fix #9257 2014-06-27 15:53:32 +02:00
Jan-Christoph Borchardt
b86b7fd143 show share action of shared items darker to distinguish from non-shared, fix #8898 2014-06-27 15:39:54 +02:00
Morris Jobke
3b2fd5e4e6 Merge pull request #9254 from owncloud/fileactions-deferred 
Sync file list with file actions
 2014-06-27 15:03:21 +02:00
Jan-Christoph Borchardt
b975f0e718 Merge pull request #9174 from owncloud/breadcrumbfix 
Breadcrumb width calculation fix
 2014-06-27 13:51:18 +02:00
Vincent Petry
586b3a9683 Sync file list with file actions 
Whenever file actions are registered later, now the file lists are
automatically notified.

Added FileActions.addUpdateListener() to be able to receive such
notifications.

This removes the need for apps to manually call FileActions.display()
after registering new actions.

This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
 2014-06-27 13:41:01 +02:00
Thomas Müller
4d6019b73f Merge pull request #9247 from owncloud/move-webdav-class-to-core-master 
Move webdav class to core master
 2014-06-27 12:59:59 +02:00
Vincent Petry
4b5bf606cb Merge pull request #9215 from owncloud/officemimetypesupdatefix 
Office mime types update fix
 2014-06-27 11:23:19 +02:00
Vincent Petry
ec4cf96f0d Breadcrumb width calculation fix 
Rewrote the breadcrumb calculation to be more readable.

Breadcrumb now has a setMaxWidth() method to set the maximum allowed
width which is used to fit the breadcrumbs.

The breadcrumb width is now based on the container width, passed through
setMaxWidth() by the FileList class.

Now using fixed widths for the test crumbs to simulate consistent
widths across browsers which rendering engines might usually yield
different results.
 2014-06-27 11:11:34 +02:00
Thomas Müller
ef4057d382 remove pointless require - we should kill all require_once like that in our tests 2014-06-27 09:30:42 +02:00
Thomas Müller
171475b95a fix autoloader 2014-06-27 08:52:40 +02:00
Thomas Müller
c745240543 Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies 2014-06-27 08:52:28 +02:00
Jenkins for ownCloud
36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
Morris Jobke
d9aa8c9f0e drop unneeded code 2014-06-27 00:30:14 +02:00
Frank Karlitschek
2daffbc44e Merge pull request #9051 from owncloud/Bagera-master 
Fix delete action height
 2014-06-26 17:48:55 -04:00
icewind1991
1b1bebdcb2 Merge pull request #9236 from owncloud/sharing-settingswording 
Fix wording for remote shares in settings page
 2014-06-26 22:56:46 +02:00
Vincent Petry
c6b89cc55a Fix wording for remote shares in settings page 2014-06-26 19:35:57 +02:00
Raghu Nayyar
5b189315b5 Merge pull request #9234 from owncloud/fix-ellipsis-for-folders 
Fix ellipsis for folders on mobile screens
 2014-06-26 22:45:40 +05:30
Vincent Petry
8526556110 Merge pull request #9206 from owncloud/occ-scan-user 
Prevent running the files:scan command as the wrong user
 2014-06-26 17:03:23 +02:00
icewind1991
46adf8cb19 Merge pull request #9223 from owncloud/occ-scan-arguments 
Add error message when no users specified to files:scan command
 2014-06-26 17:01:39 +02:00
Morris Jobke
cbd5e31d33 fix padding for last cell in summary of trashbin 2014-06-26 16:58:49 +02:00
Morris Jobke
9eb7ed4925 Fix ellipsis for folders on mobile screens 
* fixes #9162
 2014-06-26 16:37:34 +02:00
Björn Schießle
aabee3e4b0 Merge pull request #9171 from owncloud/enc_always_use_oc_view 
[encryption] always use oc view
 2014-06-26 15:11:08 +02:00
Vincent Petry
fd04b3070f Add error message when no users specified to files:scan command 2014-06-26 11:58:38 +02:00
Björn Schießle
1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation 
make sure that the etags get propagated correctly
 2014-06-26 10:26:24 +02:00
Jenkins for ownCloud
a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Vincent Petry
93a6792da7 Merge pull request #9205 from owncloud/remoteshare-fixurlpath 
Fix parsing of remote URL when mounting remote shares
 2014-06-25 19:59:39 +02:00
Vincent Petry
b1e778d5fd Moved office mimetype update to a repair step 2014-06-25 19:49:18 +02:00
Jörn Friedrich Dreyer
42e9d49d72 update files_external swift to php-opencloud v1.9.2 2014-06-25 17:15:59 +02:00
Morris Jobke
a9d0e9a5d5 Merge pull request #9202 from owncloud/urlhashfix 
Do not clear URL hash when no external mount params given
 2014-06-25 16:28:52 +02:00
Robin Appelman
9a2ed86672 Prevent running the files:scan command as the wrong user 2014-06-25 15:22:49 +02:00
Bjoern Schiessle
38ff8173ab make sure that hooks are registered for the tests 2014-06-25 15:20:52 +02:00
Vincent Petry
d22559200c Fix parsing of remote URL when mounting remote shares 
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud".
Such URLs are now parsed correctly.

Added unit test for URL parsing.
 2014-06-25 15:11:43 +02:00
icewind1991
c94c69aea1 Merge pull request #9189 from owncloud/sharing_fix_permissions 
Sharing fix permissions
 2014-06-25 15:01:34 +02:00
Jörn Friedrich Dreyer
e792d38c11 remove rackspace opencloud libs from files_external 3rdparty 2014-06-25 14:54:43 +02:00
Bjoern Schiessle
d3d1955ef4 fix unit tests 2014-06-25 12:38:26 +02:00
Jenkins for ownCloud
b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Bjoern Schiessle
3d0805f27d always use a \OC\Files\View 2014-06-25 12:27:30 +02:00
Bjoern Schiessle
709691548d always use oc filesystem for rename operation 2014-06-25 12:27:30 +02:00
Vincent Petry
363f8f3205 Do not clear URL hash when no external mount params given 
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.

In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9

Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
 2014-06-25 12:24:46 +02:00
Bjoern Schiessle
a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Arthur Schiwon
89f2691515 adjust access constructor to master 2014-06-25 11:46:21 +02:00
Arthur Schiwon
452efa5fab Port of LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups #9002 
fix PHPdoc

Conflicts:
	apps/user_ldap/lib/connection.php

add method to count groups on LDAP

Conflicts:
	apps/user_ldap/lib/access.php

LDAP Wizard: count users and groups with the power of paged search

Conflicts:
	apps/user_ldap/lib/wizard.php

consolidate requirement check

fix PHPdoc

Conflicts:
	apps/user_ldap/lib/access.php

Wizard: get really all groups from LDAP by power of Paged Search

Conflicts:
	apps/user_ldap/lib/wizard.php

make all this work in an early configuration state in the wizard by marking  the config active and ignoring the validation state.

Conflicts:
	apps/user_ldap/lib/connection.php

simplify two methods a bit, because they are not used for group search anymore

Conflicts:
	apps/user_ldap/lib/wizard.php

remove unused vars; increase scrutinizer happiness
 2014-06-25 11:45:55 +02:00
Vincent Petry
dd2ef47ed3 Merge pull request #9168 from owncloud/files-phpwarningondelete 
Remove warning when deleting all entries
 2014-06-24 18:18:14 +02:00
Robin Appelman
544963f414 Allow adding object stores with the files_external mount config 2014-06-24 14:36:57 +02:00