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

7848 commits

Author SHA1 Message Date
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
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
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