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

8026 commits

Author SHA1 Message Date
Jenkins for ownCloud
9919ec48df [tx-robot] updated from transifex 2014-05-09 01:55:42 -04:00
Vincent Petry
6e7c274d2e Merge pull request #8499 from owncloud/shareextstoragemountpointfix 
Fix sharing of ext storage mount points
 2014-05-08 22:35:01 +02:00
Vincent Petry
af2b7634ee Merge pull request #8293 from owncloud/files_external_fix_readData 
Fix issue with personal mount points and sharing
 2014-05-08 11:01:54 +02:00
Vincent Petry
f73a168694 Added unit test for sharing ext storage mount points 2014-05-08 11:00:19 +02:00
Vincent Petry
28f0e6307f Fix sharing of ext storage mount points 
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
 2014-05-08 10:03:07 +02:00
Vincent Petry
390549c286 Merge pull request #8221 from owncloud/type-hinting-sharing 
Type hinting fixes for sharing
 2014-05-08 09:30:50 +02:00
Jenkins for ownCloud
4da6645a94 [tx-robot] updated from transifex 2014-05-08 01:55:39 -04:00
Bjoern Schiessle
f85e968883 Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup 2014-05-07 17:57:32 +02:00
Bjoern Schiessle
d3f957c21e remove error_log output 2014-05-07 17:56:52 +02:00
Joas Schilling
dbb93074b3 Fix endless loop on windows servers 
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
 2014-05-07 17:38:29 +02:00
Bjoern Schiessle
31bf2d4b33 we can take the permission directly from the share, no need to call the share api first 2014-05-07 16:49:07 +02:00
Bjoern Schiessle
799d8ca381 check if we have a fileinfo 2014-05-07 11:47:52 +02:00
Bjoern Schiessle
bee48f851e ignore part files 2014-05-07 11:47:27 +02:00
Jenkins for ownCloud
283b483100 [tx-robot] updated from transifex 2014-05-07 01:55:48 -04:00
Thomas Müller
45f8d2d3ff Merge pull request #8456 from owncloud/extstorage-unittestssuite 
Added ext storage app in autotest unit test run
 2014-05-05 19:48:35 +02:00
Vincent Petry
0c8ae6eb66 Added ext storage app in autotest unit test run 
To make sure that the dynamic mount config and config classes from
external storages are tested, these are now added into the autotest.sh
test run by enabling the app.
 2014-05-05 15:03:10 +02:00
Vincent Petry
1a454f61ed Merge pull request #8386 from owncloud/fix_6946_master 
Fix 6946 master
 2014-05-05 14:08:45 +02:00
Thomas Müller
341fcdc37a Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master 
Images on public sharing get downscaled to increase use experience - thi...
 2014-05-05 10:12:40 +02:00
Jenkins for ownCloud
51d1e6c8b1 [tx-robot] updated from transifex 2014-05-05 01:55:47 -04:00
Lukas Reschke
2c483fdca2 Add missing \ 2014-05-04 15:52:25 +02:00
Lukas Reschke
0b7d9e2668 Cleanup code a little bit 
- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
 2014-05-04 15:51:08 +02:00
Jenkins for ownCloud
9385b97b5f [tx-robot] updated from transifex 2014-05-04 01:56:15 -04:00
Jenkins for ownCloud
cf20de185c [tx-robot] updated from transifex 2014-05-03 01:56:11 -04:00
Thomas Müller
95fe55f9e7 fix broken unit test 2014-05-02 20:35:03 +02:00
Vincent Petry
9e18be6422 Merge pull request #8377 from youngguns-nl/issue_8376 
RecursiveDirectoryIterator does not work on NFS
 2014-05-02 18:45:09 +02:00
Thomas Müller
d163441f3e load image via javascript and use $(document).width() to determine the proper side of the image to be returned 2014-05-02 18:36:58 +02:00
Thomas Müller
c92c577b5e - Introduce isShared() and isMounted() on FileInfo class 
- Reuse these methods on determineIcon()
- Generate permission string for the desktop client
- expose {http://owncloud.org/ns}permissions as additional WebDAV property containing the permission string
 2014-05-02 17:37:16 +02:00
Thomas Müller
20893cc3b3 Images on public sharing get downscaled to increase use experience - this will speed up loading time 
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
 2014-05-02 17:02:57 +02:00
Thomas Müller
49d9631eee Merge pull request #8400 from owncloud/download-button-public-folder 
reintroduce download button on public shares
 2014-05-02 16:59:09 +02:00
Thomas Müller
6e75b37d04 disable download button if zip download is disabled 2014-05-02 15:53:46 +02:00
Jan-Christoph Borchardt
899c7c0443 fix position and look of public download button 2014-05-02 15:26:21 +02:00
Jenkins for ownCloud
6519b9672a [tx-robot] updated from transifex 2014-05-02 01:55:53 -04:00
Björn Schießle
bf681713c8 Merge pull request #8415 from owncloud/sharing_fix_rename 
[sharing] return the new name if a mount point was renamed
 2014-05-01 14:58:29 -04:00
Jenkins for ownCloud
17f5a18922 [tx-robot] updated from transifex 2014-05-01 01:56:01 -04:00
Bjoern Schiessle
33883a46f5 return the new name if a mount point was renamed 2014-04-30 20:29:21 +02:00
Lukas Reschke
9ee88104e9 Merge pull request #8412 from owncloud/sharing_fix_part_file_rename 
[sharing] fix rename of part files
 2014-04-30 17:52:29 +02:00
Thomas Müller
38989c3458 Merge pull request #8404 from owncloud/fix-checkboxes 
Fixed too generic checkbox and link selectors
 2014-04-30 14:51:29 +02:00
Morris Jobke
dca2d9311a Merge pull request #8408 from owncloud/delete-spinner 
Show spinner for all files when deleting all
 2014-04-30 14:51:02 +02:00
Bjoern Schiessle
20e4ad382b get the correct owner path for part files 2014-04-30 12:49:16 +02:00
Bjoern Schiessle
57b671ebec only update the values which really changed 2014-04-30 12:48:16 +02:00
Jenkins for ownCloud
654a6e6c6a [tx-robot] updated from transifex 2014-04-30 01:57:53 -04:00
Vincent Petry
61db16321f Clear selection on reload (when changing sort) 2014-04-29 18:49:11 +02:00
Vincent Petry
10bc67bef9 Show spinner for all files when deleting all 2014-04-29 17:59:30 +02:00
Thomas Müller
003049e8a6 remove file name from upper right button 2014-04-29 17:16:14 +02:00
Vincent Petry
2f58e798ec Fixed too generic checkbox and link selectors 
It turns out that the sharing dropdown is embedded into the table row
for some reason.

This fix makes use of a more specific selector for the checkboxes and
file name links to make sure it doesn't spill into any other potential
elements like the sharing dialog.
 2014-04-29 16:28:43 +02:00
Thomas Müller
df32254133 reintroduce download button on public shares 2014-04-29 15:28:35 +02:00
Sjors van der Pluijm
49822dfcdb refs #8376; spaces=>tabs 2014-04-29 14:59:47 +02:00
Vincent Petry
6b02126dc1 Merge pull request #8382 from owncloud/enc_fix_decrypt_all 
fix shouldEncrypt() method and improved decryptAll() unit tests
 2014-04-29 12:15:11 +02:00
icewind1991
b95aa43a5d Merge pull request #8285 from owncloud/better_getmountby_handling 
Handle return values better from Filesystem::getMountBy*
 2014-04-29 11:22:11 +02:00
Jenkins for ownCloud
b4a5093da8 [tx-robot] updated from transifex 2014-04-29 01:56:49 -04:00
Sjors van der Pluijm
54f482ff9c refs #8376; added comment and applied patch on other files 2014-04-28 19:32:25 +02:00
Thomas Müller
535302b25e typos, indentation and remove of unused code 2014-04-28 17:59:50 +02:00
Bart Visscher
66b1ad0a9b Merge branch 'master' into type-hinting-sharing 
Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php
 2014-04-28 17:59:41 +02:00
Thomas Müller
05dc265ea2 html input tag has no closing tag 2014-04-28 17:58:23 +02:00
Thomas Müller
ac9e07c589 $RUNTIME_APPTYPES is no longer used - left over from pre OC4 2014-04-28 17:56:20 +02:00
Vincent Petry
af22e7ec95 Added unit test in files app for sort function in helper class 
Added unit test for the Helper class in the files app that tests the
different sort orders.
 2014-04-28 17:42:04 +02:00
Vincent Petry
c0e5975ab6 Set default sort of trashbin to timestamp descending 2014-04-28 17:42:04 +02:00
Vincent Petry
688f6162da Add sorting to files list, trashbin and public files 2014-04-28 17:42:04 +02:00
Thomas Müller
bf61d841a2 typos, naming, remove unused code, identation 2014-04-28 16:51:57 +02:00
Vincent Petry
f99f451026 Fixed drag and drop into folder and onto breadcrumb 
Fixed drag and drop code to use FileList.getSelectedFiles() instead of
the visible DOM elements.
 2014-04-28 14:55:01 +02:00
Vincent Petry
a15b68c10f Fixed selection summary calculation issue 2014-04-28 14:55:01 +02:00
Vincent Petry
c29e8b0bae Cleanup of event handlers 
Now using _.bind() for event handlers so we can use "this" which is more
readable than a static access to FileList.
 2014-04-28 14:55:01 +02:00
Vincent Petry
3c006a5a4d Cleanup and fix trashbin "clear all files" operation 2014-04-28 14:55:01 +02:00
Vincent Petry
3159c2ee64 Fixed drag shadow file sorting 2014-04-28 14:55:01 +02:00
Vincent Petry
fd982df6ae Fixed selection to be based on FileList.files 
The file selection is now based on the internal model array
FileList.files instead of the visible checkboxes.

This makes it possible to virtually select files that haven't been
rendered yet (select all, then deselect a visible one)

Added more unit tests for selection (with shift and ctrl as well)
 2014-04-28 14:55:01 +02:00
Vincent Petry
a952d80ad9 Fix trashbin previews and "delete selected" 2014-04-28 14:55:01 +02:00
Vincent Petry
8909b574fa Make sure there are always enough elements visible on the page 2014-04-28 14:55:01 +02:00
Vincent Petry
2883f231d0 Fixed insertion of files 
Removed "insert" flag, inserting is by default for FileList.add().
Added "animate" flag to FileList.add().
Added logic to correctly detect when to insert/append elements whenever
the insertion point is visible or not.
Fixed "render next page" logic to work correctly when many pages of
files have been added.
 2014-04-28 14:55:01 +02:00
Vincent Petry
f6586f6bdf Fixed file sorting to work with scrolling 
The FileList.files model is now updated with file operations.
Adding files to the list will add to the model first, then to the DOM.
If the insertion point isn't visible yet, the file won't be added to the
DOM until the user scrolls down.

Updated unit tests to include checking for the correct insertion point.
 2014-04-28 14:55:00 +02:00
Vincent Petry
9c2fbea6a4 Fix file selection for infinite scrolling 
- moved file selection code to FileList
- fix selection summary when all files are selected
- nextPage now auto-selects files if "select all" checkbox is checked
- fixed trashbin to use the same selection logic as FileList
 2014-04-28 14:55:00 +02:00
Vincent Petry
9f62059efa Fix file summary to use the whole file list 
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
 2014-04-28 14:49:39 +02:00
Bjoern Schiessle
73a2d87ab4 fix shouldEncrypt() method and improved decryptAll() unit tests 2014-04-28 14:49:19 +02:00
Vincent Petry
efdf0c4df0 Added infinite scrolling (in-memory list) 2014-04-28 14:34:28 +02:00
Arthur Schiwon
45e42c25de Group Database backend must not gather user details itself but ask user 
backends. This is a port to master from PR #7745

remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

Conflicts:
	lib/private/group/backend.php

LDAP: getDisplayNamesInGroup is not an option for group backends anymore

Conflicts:
	apps/user_ldap/group_ldap.php
	apps/user_ldap/group_proxy.php

clean up group backends

Conflicts:
	lib/private/group/database.php

remove now unnecessary test

implement getDisplayNames in group manager

adjust user manager tests

test for group manager's displayNamesInGroup

trim must not be used in empty in PHP < 5.5

keep the constant to not provoke PHP warnings

Conflicts:
	lib/private/group/backend.php
 2014-04-28 13:49:56 +02:00
Thomas Müller
9128900c56 drop files_irods from apps_external 2014-04-28 12:39:28 +02:00
Thomas Müller
727e3e2359 Merge pull request #8327 from owncloud/l10n-files_external-fields 
Add translatable mount configs
 2014-04-28 08:52:50 +02:00
Jenkins for ownCloud
642f57c1d5 [tx-robot] updated from transifex 2014-04-28 01:56:24 -04:00
Jenkins for ownCloud
8e5c9eea3a [tx-robot] updated from transifex 2014-04-27 01:54:54 -04:00
Volkan Gezer
6de6f68ae2 fix single quote sanitization 2014-04-26 18:58:01 +02:00
icewind1991
7ac7546b71 Merge pull request #8353 from owncloud/publicshare-webdav 
Expose public shares over webdav
 2014-04-26 15:55:37 +02:00
Jenkins for ownCloud
c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Morris Jobke
ace0293bd1 fix layout of external storage config table 2014-04-25 16:34:48 +02:00
icewind1991
7599fa94ce Merge pull request #8350 from owncloud/share-search-mime 
fix search by mime for shared single files
 2014-04-25 15:54:36 +02:00
Robin Appelman
b176708505 Expose public shares over webdav 2014-04-25 14:45:18 +02:00
Robin Appelman
b42418246f Also fixed the returned internal path when getting the root shared item by id 2014-04-25 14:04:22 +02:00
Robin Appelman
c53c4b9791 fix search by mime for shared single files 2014-04-25 12:28:10 +02:00
Robin Appelman
6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Robin McCorkell
77e3d067f0 Better handle return values from Filesystem::getMountBy* 
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
 2014-04-25 09:50:34 +01:00
Jenkins for ownCloud
3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Björn Schießle
f520305848 Merge pull request #8026 from owncloud/remove_shared_folder 
remove the "Shared" folder
 2014-04-24 18:45:45 +02:00
Jenkins for ownCloud
435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Volkan Gezer
da61acd1e2 Add translatable mount configs 
Will close #8070
 2014-04-23 17:58:14 +02:00
blizzz
645ecb7644 Merge pull request #6297 from leo-b/fix_ldap_errors 
only check ldap_errno if an ldap_* function actually fails
 2014-04-23 16:26:43 +02:00
Thomas Müller
3aee23ee2b Merge pull request #8233 from owncloud/fix-newdialog-ie 
fix shift of icons in 'New' menu in IE8/9, fix #7987
 2014-04-23 16:17:24 +02:00
Robin McCorkell
c2f7848aeb Adjust renaming of directories, fixes #8280 
Directories will not be considered to have an extension, even if a dot is
found.

Stop Scrutinizer being annoyed

But the spaced version looked good!

Stop jsHint being annoyed

These code quality tools are really pestering
 2014-04-23 16:04:01 +02:00
Bjoern Schiessle
7ef8f6d352 always allow to rename the share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
b102222fed split-up the update script and add unit tests for it 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
93469ca468 make it possible to move files out of a shared mount point 2014-04-23 12:54:26 +02:00
Thomas Müller
dd1e47b3b8 typos, use, unused and return fixed 2014-04-23 12:54:26 +02:00
Robin Appelman
2049bedcaf Dont throw an error when a storage isn't found for shared cache 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
fb88aba8f4 some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
d468cdacf2 add unit tests which got lost during rebase 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
652d417a58 we don't allow to share a folder if it contains a share mount point 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
b712393e72 fix etag propagation 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
aae22b2d6a update script, create Shared folder and adjust target path for the shares 2014-04-23 12:54:26 +02:00
Bjoern Schiessle
bffcbac7a7 allow to rename group share mount points 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
3f6e9e0102 cleanup the shared storage, always keep the whole share resource 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
22e0a4b9a8 external storages: allow to mount a folder called "Shared", it is no longer a reserved name 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
c9bd2f7a6c also fetch the etag from file cache 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
d4085d8148 make sure that path is not 'false' 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
33cdd93890 fix deleting of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
bfabd247f4 fix updating of shared files 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
a86d97295e fix encryption tests after the removal of the shared folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
ed981294f1 fix share api tests 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
27c5a978f9 we no longer need to handle the Shared folder different from any other folder 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
83d6810725 don't overwrite shared folder icon 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
4967435237 show "shared by ..." for share mount point 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
6b19482f3e generate unique target name 2014-04-23 12:54:25 +02:00
Bjoern Schiessle
6d87dacad4 fix getMimeType call, we always need to check the source path 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
a02fb3722b user should be able to rename/delete shared files if the owner allowed it 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
b02b6d3c23 no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
c377893f0e make sure that we have the right permissions for the mount points 2014-04-23 12:54:24 +02:00
Bjoern Schiessle
a27db9e4ca first steps to remove the shared folder: 
- mount shares to the root folder instead of "Shared/"
- navigate in shared folder and sub-folders
- show previews
- show correct file permissions
- download/edit files
 2014-04-23 12:54:24 +02:00
blizzz
97f21712cd Merge pull request #8164 from owncloud/fix-6651 
LDAP: fix random resets of filter
 2014-04-23 11:09:35 +02:00
Thomas Müller
e0cac32442 fixing some JSHint warnings 2014-04-23 10:08:14 +02:00
Jenkins for ownCloud
3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
Arthur Schiwon
c1c2f2c49e add additional comments, PHPdoc and check whether it's really applicable 2014-04-22 18:36:43 +02:00
Arthur Schiwon
1c71d5c444 LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example 2014-04-22 18:36:37 +02:00
Robin Appelman
b42ce6c30a Prevent error if previously cached data doesn't have an etag 2014-04-22 15:24:38 +02:00
Robin Appelman
3821a09689 merge master into webdav-injection 2014-04-22 12:25:49 +02:00
Raghu Nayyar
d56072cf2e Merge pull request #8255 from owncloud/fix-public-download-button 
keep long file names in one line to not overflow download button on mobile
 2014-04-22 15:44:29 +05:30
Thomas Müller
54873c7aae Merge pull request #8247 from owncloud/l10n-files_trasbin-fix 
Fix localization issues of files_trashbin
 2014-04-22 11:34:49 +02:00
Thomas Müller
5049664285 Merge pull request #8239 from owncloud/directlink-overflow 
add max-width to directLink input to prevent overflow
 2014-04-22 11:23:10 +02:00
Jörn Friedrich Dreyer
4d9ff49f61 Merge pull request #8283 from owncloud/translatable-max-in-upload 
make max. text translatable
 2014-04-22 10:23:08 +02:00
Jenkins for ownCloud
a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Robin McCorkell
abfd7ecb72 Permit personal mount points to be used for sharing 
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.

`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
 2014-04-21 21:42:35 +01:00
Jenkins for ownCloud
4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Volkan Gezer
1aa7774178 make max. text translatable 2014-04-21 02:41:33 +02:00
Andreas Fischer
93ed6a695e Merge pull request #8169 from owncloud/change-to-show 
Change from showHTML to show

* owncloud/change-to-show:
  Change from showHTML to show
 2014-04-20 15:53:33 +02:00
Jenkins for ownCloud
1abd9c1305 [tx-robot] updated from transifex 2014-04-19 01:56:06 -04:00
Volkan Gezer
f434c3a213 Fix localization issues of files_trashbin 2014-04-17 21:10:21 +02:00
blizzz
36c8dec10a Merge pull request #8220 from owncloud/type-hinting-ldap 
Fix PHPdoc in user_ldap
 2014-04-17 18:15:40 +02:00
Jan-Christoph Borchardt
d82a31d121 keep long file names in one line to not overflow download button on mobile 2014-04-17 17:11:28 +02:00
Morris Jobke
0b4431216d Merge pull request #8236 from owncloud/header-right-fix 
remove duplication of header and 'header-right' element, also ellipsize when too wide
 2014-04-17 15:18:40 +02:00
Robin McCorkell
13b463cc17 Merge pull request #8189 from Xenopathic/misc_fixes 
Various fixes
 2014-04-17 11:56:51 +01:00
Jenkins for ownCloud
a7d7ca2fb3 [tx-robot] updated from transifex 2014-04-17 01:56:06 -04:00
Bart Visscher
81751cb616 Add missing param hint 2014-04-16 17:54:10 +02:00
Jan-Christoph Borchardt
9434ed44f8 add max-width to directLink input to prevent overflow 2014-04-16 16:43:35 +02:00
Jan-Christoph Borchardt
9c6f8e59ae fix header code duplication, code style fixes 2014-04-16 16:26:41 +02:00
Jan-Christoph Borchardt
547ddf7775 remove duplication of 'header-right' element, also make it overflow when too wide 2014-04-16 15:53:38 +02:00
Jan-Christoph Borchardt
924aee718c fix shift of icons in 'New' menu in IE8/9, fix #7987 2014-04-16 14:58:27 +02:00
blizzz
f6551d214f Merge pull request #7815 from owncloud/ldap_fix_usercount_master 
correct LDAP user count on setup with many users (occ user:report)
 2014-04-16 10:36:19 +02:00
Jenkins for ownCloud
23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Thomas Müller
8bc7174bdc Merge pull request #8104 from owncloud/lukepolo-master 
Added the ability to Drag and Drop folders [chrome]
 2014-04-15 21:39:32 +02:00
Thomas Müller
83e8981e24 add link to further discussion about that folder check 2014-04-15 21:39:13 +02:00
Bart Visscher
bad41c05b8 Fix PHPdoc in user_ldap 
using scrutinizer patch
 2014-04-15 21:05:49 +02:00
Bart Visscher
999e74e834 Fix PHPdoc in apps/files_sharing 
using scrutinizer patch
 2014-04-15 21:05:44 +02:00
Robin Appelman
c82adb8c5d merge master into webdav-injection 2014-04-15 20:03:00 +02:00
Björn Schießle
2dbb2db7e0 Merge pull request #7780 from owncloud/share-file-exists 
Verify that a file exists before we share it
 2014-04-15 11:23:17 +02:00
Lukas Reschke
340089f270 Merge pull request #8059 from owncloud/countUsersInGroup 
add optional countUsersInGroup method to group backends
 2014-04-14 20:45:12 +02:00
Jenkins for ownCloud
2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Robin McCorkell
8bb003868c Fix user_ldap default setting value 2014-04-13 16:49:23 +01:00
Robin McCorkell
869e7a51f0 Prevent error in files_trashbin 
`glob` can return FALSE when the directory is empty, instead of an empty array,
causing an error at `foreach`.

"Note: On some systems it is impossible to distinguish between empty match and
an error."

See http://www.php.net/manual/en/function.glob.php -> Return Values
 2014-04-13 14:51:33 +01:00
Robin McCorkell
fa8814902e Adjust logic for deciding if trashbin empty 
Any error in opening the trashbin directory returns 'true' for isEmpty.
An error is prevented by checking if the directory exists before trying to
open it.
 2014-04-13 13:49:04 +01:00
Lukas Reschke
2454759af7 Check whether the user has permissions to add personal storage backends 2014-04-13 11:01:50 +02:00
Jenkins for ownCloud
982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04:00
Jenkins for ownCloud
329b8f3e99 [tx-robot] updated from transifex 2014-04-12 01:56:11 -04:00
Lukas Reschke
6343391e58 Change from showHTML to show 
There is no need to use `showHTML` here.
 2014-04-11 20:38:27 +02:00
Lukas Reschke
e704bc2bf0 Merge pull request #7807 from sarciszewski/patch-1 
Update crypt.php
 2014-04-11 19:19:02 +02:00
Björn Schießle
10dc1de644 Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app 
Fix some localization issues with file encryption/decryption strings
 2014-04-11 17:22:13 +02:00
Volkan Gezer
d67cba973e Typo fix. 2014-04-11 15:23:43 +02:00
Thomas Müller
07ea57465b drop folder support on public shared folders 2014-04-11 14:54:13 +02:00
Arthur Schiwon
1c57ffa16f Give hint when composing filter failed 2014-04-11 14:08:12 +02:00
Arthur Schiwon
e28227ecdc fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh 2014-04-11 13:56:06 +02:00
Arthur Schiwon
6f1e9f8920 Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651 2014-04-11 13:48:45 +02:00
Jenkins for ownCloud
36107e1bad [tx-robot] updated from transifex 2014-04-11 01:55:15 -04:00
Lukas Reschke
d229856fc5 Merge pull request #8076 from owncloud/enable-dav-browser 
Re-enable the sabredav browser plugin to fix sync client setup
 2014-04-10 21:47:03 +02:00
Thomas Müller
0edacf372c fix single file upload in firefox 2014-04-10 18:07:36 +02:00
Jenkins for ownCloud
7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Thomas Müller
e8be2ac554 In cases folder drag and drop is not supported a proper message is displayed 2014-04-09 23:32:12 +02:00
Thomas Müller
2fc9e27ced use FileList.findFileEl 2014-04-09 22:16:41 +02:00
Thomas Müller
d2961dcf11 Merge branch 'master' into lukepolo-master 
Conflicts:
	apps/files/js/filelist.js
 2014-04-09 22:00:25 +02:00
Morris Jobke
d8f56e3c00 Merge pull request #8049 from owncloud/filepickersvg 
Fix file picker SVG issues
 2014-04-09 15:05:40 +02:00
Vincent Petry
b19671d204 Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js 
remove obsolete code
 2014-04-09 14:50:15 +02:00
blizzz
9feebeaf40 Merge pull request #7837 from owncloud/fix_7530 
LDAP: fix determining objectclasses takes long
 2014-04-09 12:27:17 +02:00
Arthur Schiwon
dbebf6bb5e add comment to clearify when a skip in the foreach happens 2014-04-09 12:25:48 +02:00
Jörn Friedrich Dreyer
9b0f289143 remove obsolete code 2014-04-09 12:09:28 +02:00
Arthur Schiwon
ee3368d2ad replace hardcoded limit of 400 with user controlled ldapPagingSize value 2014-04-09 11:38:51 +02:00
Arthur Schiwon
2e5adadad7 Put inner loop into own method, let's see whether it makes scrutinizer happier 2014-04-09 11:31:56 +02:00
Arthur Schiwon
bdc418d1f9 var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop 2014-04-09 11:31:56 +02:00
Arthur Schiwon
43402c56dd initialize variable 2014-04-09 11:31:56 +02:00
Arthur Schiwon
40f9875f11 LDAP: fix user report i.e. count for LDAP servers with really many users 2014-04-09 11:31:56 +02:00
Arthur Schiwon
8bb27551bd LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0 2014-04-09 11:31:56 +02:00
Jenkins for ownCloud
796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Vincent Petry
35ab6fe5a9 Disable sharing in trashbin app 2014-04-08 17:13:59 +02:00
Arthur Schiwon
2407321625 add tests for LDAP 2014-04-08 12:57:06 +02:00
Arthur Schiwon
142fc5f3af fix return value when a search string was passed to return integer instead of array 2014-04-08 12:53:59 +02:00
Arthur Schiwon
96cb75f5cf implement countUsersInGroup in LDAP group backend 2014-04-08 12:04:38 +02:00
Thomas Müller
411a810ebe Merge pull request #8032 from owncloud/fs-backend-registration 
Files External: allow dynamic backend registration
 2014-04-08 11:27:02 +02:00
Jenkins for ownCloud
4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00