]>
source.dussan.org Git - nextcloud-server.git/log
Jenkins for ownCloud [Sun, 27 Apr 2014 05:54:54 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Sat, 26 Apr 2014 21:00:02 +0000 (23:00 +0200)]
Merge pull request #8371 from owncloud/example-config
Add another example to the trusted_domains config
Lukas Reschke [Sat, 26 Apr 2014 20:37:30 +0000 (22:37 +0200)]
Add another example to the trusted_domains config
Users often ask in IRC or the forum how to add another domain.
Hopefully they will be able to find it out on their own if we have an example with two domains.
Lukas Reschke [Sat, 26 Apr 2014 14:51:29 +0000 (16:51 +0200)]
Merge pull request #8343 from owncloud/fix-status
Use echo since print_unescaped is not defined
icewind1991 [Sat, 26 Apr 2014 13:55:37 +0000 (15:55 +0200)]
Merge pull request #8353 from owncloud/publicshare-webdav
Expose public shares over webdav
Andreas Fischer [Sat, 26 Apr 2014 12:50:34 +0000 (14:50 +0200)]
"echo" is a language construct. Don't treat it like a function.
Lukas Reschke [Sat, 26 Apr 2014 10:29:36 +0000 (12:29 +0200)]
Merge pull request #8341 from owncloud/template-tests-output-buffering
Improve Template Tests by Removing Manual Output Buffering
Jenkins for ownCloud [Sat, 26 Apr 2014 05:55:32 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Andreas Fischer [Fri, 25 Apr 2014 23:21:31 +0000 (01:21 +0200)]
Merge pull request #8355 from owncloud/l10n-expire
typo fix, by translators on transifex
* owncloud/l10n-expire:
typo fix, by translators on transifex
icewind1991 [Fri, 25 Apr 2014 22:06:06 +0000 (00:06 +0200)]
Merge pull request #8356 from owncloud/fix-external-css
fix layout of external storage config table
Morris Jobke [Fri, 25 Apr 2014 14:34:48 +0000 (16:34 +0200)]
fix layout of external storage config table
Volkan Gezer [Fri, 25 Apr 2014 14:26:30 +0000 (16:26 +0200)]
typo fix, by translators on transifex
icewind1991 [Fri, 25 Apr 2014 13:54:36 +0000 (15:54 +0200)]
Merge pull request #8350 from owncloud/share-search-mime
fix search by mime for shared single files
Robin Appelman [Thu, 6 Mar 2014 15:00:25 +0000 (16:00 +0100)]
Expose public shares over webdav
icewind1991 [Fri, 25 Apr 2014 12:42:43 +0000 (14:42 +0200)]
Merge pull request #7504 from owncloud/webdav-injection
Proper injection of filesystem view into the webdav connector
Robin Appelman [Fri, 25 Apr 2014 12:04:41 +0000 (14:04 +0200)]
Merge branch 'master' into share-search-mime
Robin Appelman [Fri, 25 Apr 2014 12:04:22 +0000 (14:04 +0200)]
Also fixed the returned internal path when getting the root shared item by id
icewind1991 [Fri, 25 Apr 2014 12:03:43 +0000 (14:03 +0200)]
Merge pull request #8351 from owncloud/search-mime-substorage
fix paths of searchByMime results on substorages
Robin Appelman [Fri, 25 Apr 2014 11:56:45 +0000 (13:56 +0200)]
Correct the path returned by getFolderContent for substorages
Jan-Christoph Borchardt [Fri, 25 Apr 2014 11:18:55 +0000 (13:18 +0200)]
Merge pull request #8352 from owncloud/icons
Icon improvements
Morris Jobke [Fri, 25 Apr 2014 11:15:58 +0000 (13:15 +0200)]
remove metadata
Jan-Christoph Borchardt [Fri, 25 Apr 2014 10:40:14 +0000 (12:40 +0200)]
use trash as delete icon to differentiate from close
Robin Appelman [Fri, 25 Apr 2014 10:31:44 +0000 (12:31 +0200)]
fix paths of searchByMime results on substorages
Robin Appelman [Fri, 25 Apr 2014 10:28:10 +0000 (12:28 +0200)]
fix search by mime for shared single files
Robin Appelman [Fri, 25 Apr 2014 10:24:18 +0000 (12:24 +0200)]
remove outdated test
Jan-Christoph Borchardt [Fri, 25 Apr 2014 10:16:17 +0000 (12:16 +0200)]
compress view-close icon
Robin Appelman [Fri, 25 Apr 2014 09:47:06 +0000 (11:47 +0200)]
merge master into webdav-injection
Jenkins for ownCloud [Fri, 25 Apr 2014 05:56:28 +0000 (01:56 -0400)]
[tx-robot] updated from transifex
Andreas Fischer [Thu, 24 Apr 2014 20:00:12 +0000 (22:00 +0200)]
Merge pull request #8338 from owncloud/phpunit-4.0-compat
Make PHPUnit_Framework_TestListener implementations compatible to 4.0.
* owncloud/phpunit-4.0-compat:
Normalise testcleanuplistener.php indentation and end of file.
Make PHPUnit_Framework_TestListener implementations compatible to 4.0.
Lukas Reschke [Thu, 24 Apr 2014 17:09:01 +0000 (19:09 +0200)]
Merge pull request #8337 from owncloud/flv-to-mimes
Add flv to known mimetypes
Björn Schießle [Thu, 24 Apr 2014 16:45:45 +0000 (18:45 +0200)]
Merge pull request #8026 from owncloud/remove_shared_folder
remove the "Shared" folder
Lukas Reschke [Thu, 24 Apr 2014 16:41:06 +0000 (18:41 +0200)]
Use echo since print_unescaped is not defined
Fixes https://github.com/owncloud/core/issues/8342
Victor Dubiniuk [Thu, 24 Apr 2014 12:41:30 +0000 (15:41 +0300)]
Add flv to known mimetypes
Thomas Müller [Thu, 24 Apr 2014 15:28:07 +0000 (17:28 +0200)]
Merge pull request #8339 from owncloud/fix_unit_tests
fixing unit tests
Andreas Fischer [Thu, 24 Apr 2014 14:42:28 +0000 (16:42 +0200)]
Normalise testcleanuplistener.php indentation and end of file.
Andreas Fischer [Thu, 24 Apr 2014 13:45:07 +0000 (15:45 +0200)]
Use PHPUnit's expectOutputString() instead of performing output buffering.
Andreas Fischer [Thu, 24 Apr 2014 13:36:02 +0000 (15:36 +0200)]
Split testP() tests into multiple methods.
Andreas Fischer [Thu, 24 Apr 2014 13:34:09 +0000 (15:34 +0200)]
Remove redundant test case for non-HTML string.
Bjoern Schiessle [Thu, 24 Apr 2014 13:13:34 +0000 (15:13 +0200)]
add additional rows to the select statement, 'stime' is needed for the expire check
Andreas Fischer [Thu, 24 Apr 2014 13:16:57 +0000 (15:16 +0200)]
Make PHPUnit_Framework_TestListener implementations compatible to 4.0.
Andreas Fischer [Thu, 24 Apr 2014 13:09:36 +0000 (15:09 +0200)]
Merge pull request #8304 from owncloud/add-xss-tests
Add unit tests for arrays and quotationmark
* owncloud/add-xss-tests:
Remove uneeded newline
Fix indentation
Add unit tests for arrays and "
Andreas Fischer [Thu, 24 Apr 2014 12:03:41 +0000 (14:03 +0200)]
Merge pull request #8335 from owncloud/sharing_set_default_expire_date
[sharing] allow admin to set default expire date
* owncloud/sharing_set_default_expire_date:
add setting to set default expire date
Bjoern Schiessle [Wed, 23 Apr 2014 10:50:24 +0000 (12:50 +0200)]
add setting to set default expire date
Robin Appelman [Thu, 24 Apr 2014 09:10:46 +0000 (11:10 +0200)]
properly quote etags
Robin Appelman [Wed, 23 Apr 2014 14:25:29 +0000 (16:25 +0200)]
Normalize paths when moving properties
Thomas Müller [Thu, 24 Apr 2014 08:06:37 +0000 (10:06 +0200)]
Merge pull request #8332 from owncloud/l10n-access-untrusted
This adds one more missing untranslated text from lib/share
Thomas Müller [Thu, 24 Apr 2014 07:25:32 +0000 (09:25 +0200)]
Merge pull request #8334 from owncloud/protect-co
Preventing access to the config folder
Lukas Reschke [Thu, 24 Apr 2014 06:33:58 +0000 (08:33 +0200)]
Preventing access to the config folder
It isn't uncommon that admins create a backup file of the config (i.e. `config.php.bak`) before performing any changes. This would allow everybody to read the backup of the configuration file which contain several secret and critical values.
I don't believe this is worth a backport or getting added to the installer. It's just a nice to have. People that create public readable backups of their configuration are the one to blame, not us :-)
Jenkins for ownCloud [Thu, 24 Apr 2014 05:55:33 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Volkan Gezer [Wed, 23 Apr 2014 23:42:18 +0000 (01:42 +0200)]
This adds one more missing untranslated text from lib/share
Also displays the untrusted domain warning in English
blizzz [Wed, 23 Apr 2014 14:26:43 +0000 (16:26 +0200)]
Merge pull request #6297 from leo-b/fix_ldap_errors
only check ldap_errno if an ldap_* function actually fails
Thomas Müller [Wed, 23 Apr 2014 14:17:24 +0000 (16:17 +0200)]
Merge pull request #8233 from owncloud/fix-newdialog-ie
fix shift of icons in 'New' menu in IE8/9, fix #7987
Thomas Müller [Wed, 23 Apr 2014 14:06:50 +0000 (16:06 +0200)]
Merge pull request #8284 from owncloud/fix_8280
Adjust renaming of directories with a dot in name
Robin McCorkell [Mon, 21 Apr 2014 08:35:15 +0000 (09:35 +0100)]
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
Thomas Müller [Wed, 23 Apr 2014 13:34:04 +0000 (15:34 +0200)]
fixing typos and PHPDoc
Robin Appelman [Wed, 23 Apr 2014 12:21:09 +0000 (14:21 +0200)]
Revert changes to OC_Connector_Sabre_Server
icewind1991 [Wed, 23 Apr 2014 12:13:44 +0000 (14:13 +0200)]
Merge pull request #8324 from owncloud/expired-link-error
Fix error when viewing expired link
Bjoern Schiessle [Wed, 23 Apr 2014 10:59:22 +0000 (12:59 +0200)]
remove hard-coded shared folder
Bjoern Schiessle [Thu, 17 Apr 2014 13:54:45 +0000 (15:54 +0200)]
always allow to rename the share mount point
Bjoern Schiessle [Wed, 16 Apr 2014 15:43:02 +0000 (17:43 +0200)]
split-up the update script and add unit tests for it
Bjoern Schiessle [Wed, 16 Apr 2014 14:41:23 +0000 (16:41 +0200)]
make it possible to move files out of a shared mount point
Thomas Müller [Tue, 15 Apr 2014 18:26:04 +0000 (20:26 +0200)]
typos, use, unused and return fixed
Robin Appelman [Tue, 15 Apr 2014 14:36:05 +0000 (16:36 +0200)]
Dont throw an error when a storage isn't found for shared cache
Bjoern Schiessle [Tue, 15 Apr 2014 18:18:04 +0000 (20:18 +0200)]
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
Bjoern Schiessle [Tue, 15 Apr 2014 13:48:54 +0000 (15:48 +0200)]
add unit tests which got lost during rebase
Bjoern Schiessle [Tue, 15 Apr 2014 09:19:31 +0000 (11:19 +0200)]
we don't allow to share a folder if it contains a share mount point
Bjoern Schiessle [Mon, 14 Apr 2014 15:08:46 +0000 (17:08 +0200)]
fix etag propagation
Bjoern Schiessle [Mon, 14 Apr 2014 13:04:27 +0000 (15:04 +0200)]
update script, create Shared folder and adjust target path for the shares
Bjoern Schiessle [Mon, 14 Apr 2014 10:04:12 +0000 (12:04 +0200)]
allow to rename group share mount points
Bjoern Schiessle [Mon, 14 Apr 2014 09:33:10 +0000 (11:33 +0200)]
cleanup the shared storage, always keep the whole share resource
Bjoern Schiessle [Mon, 14 Apr 2014 08:15:43 +0000 (10:15 +0200)]
external storages: allow to mount a folder called "Shared", it is no longer a reserved name
Bjoern Schiessle [Fri, 11 Apr 2014 09:54:14 +0000 (11:54 +0200)]
also fetch the etag from file cache
Bjoern Schiessle [Fri, 11 Apr 2014 09:40:14 +0000 (11:40 +0200)]
allow user to delete shared files/folders
Bjoern Schiessle [Fri, 11 Apr 2014 09:18:50 +0000 (11:18 +0200)]
make sure that path is not 'false'
Bjoern Schiessle [Thu, 10 Apr 2014 07:54:29 +0000 (09:54 +0200)]
fix deleting of shared files
Bjoern Schiessle [Wed, 9 Apr 2014 16:00:00 +0000 (18:00 +0200)]
fix updating of shared files
Bjoern Schiessle [Wed, 9 Apr 2014 15:52:24 +0000 (17:52 +0200)]
fix encryption tests after the removal of the shared folder
Bjoern Schiessle [Wed, 9 Apr 2014 15:51:54 +0000 (17:51 +0200)]
fix target generation for group shares
Bjoern Schiessle [Tue, 8 Apr 2014 17:57:07 +0000 (19:57 +0200)]
fix share api tests
Bjoern Schiessle [Tue, 8 Apr 2014 15:17:48 +0000 (17:17 +0200)]
we no longer need to handle the Shared folder different from any other folder
Bjoern Schiessle [Tue, 8 Apr 2014 14:56:10 +0000 (16:56 +0200)]
don't overwrite shared folder icon
Bjoern Schiessle [Tue, 8 Apr 2014 14:37:34 +0000 (16:37 +0200)]
show "shared by ..." for share mount point
Bjoern Schiessle [Tue, 8 Apr 2014 10:29:47 +0000 (12:29 +0200)]
generate unique target name
Bjoern Schiessle [Tue, 8 Apr 2014 12:42:15 +0000 (14:42 +0200)]
add api to get shares from a specific user
Bjoern Schiessle [Tue, 8 Apr 2014 09:32:39 +0000 (11:32 +0200)]
fix getMimeType call, we always need to check the source path
Bjoern Schiessle [Fri, 4 Apr 2014 16:32:49 +0000 (18:32 +0200)]
user should be able to rename/delete shared files if the owner allowed it
Bjoern Schiessle [Mon, 7 Apr 2014 17:00:03 +0000 (19:00 +0200)]
allow to remove and change mount points
Bjoern Schiessle [Fri, 4 Apr 2014 15:45:53 +0000 (17:45 +0200)]
no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache
Bjoern Schiessle [Fri, 4 Apr 2014 14:54:02 +0000 (16:54 +0200)]
make sure that we have the right permissions for the mount points
Bjoern Schiessle [Wed, 2 Apr 2014 10:04:51 +0000 (12:04 +0200)]
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
Bjoern Schiessle [Fri, 28 Mar 2014 14:24:13 +0000 (15:24 +0100)]
add some action items
Robin Appelman [Wed, 23 Apr 2014 10:54:18 +0000 (12:54 +0200)]
Fix error when viewing expired link
Joas Schilling [Wed, 23 Apr 2014 10:49:06 +0000 (12:49 +0200)]
Merge pull request #8009 from owncloud/feature/add-sharing-target
Add option to getUsersSharingFile() to get the paths for the shared users
Thomas Müller [Wed, 23 Apr 2014 10:32:30 +0000 (12:32 +0200)]
Merge pull request #7617 from nishiki/cache_user
Cache user
blizzz [Wed, 23 Apr 2014 09:09:35 +0000 (11:09 +0200)]
Merge pull request #8164 from owncloud/fix-6651
LDAP: fix random resets of filter
Thomas Müller [Wed, 23 Apr 2014 09:05:00 +0000 (11:05 +0200)]
Merge pull request #8213 from cbojar/master
Clean up js.js along suggestions from scrutinizer-ci, fixes #8204.
Thomas Müller [Wed, 23 Apr 2014 08:08:14 +0000 (10:08 +0200)]
fixing some JSHint warnings
Thomas Müller [Wed, 23 Apr 2014 07:58:10 +0000 (09:58 +0200)]
Merge pull request #8068 from wakeup/fix-share.php-string-extraction
Make lib/** share.php strings extractable for translation
Thomas Müller [Wed, 23 Apr 2014 07:28:44 +0000 (09:28 +0200)]
Merge pull request #8315 from owncloud/fix-8294
add uncompressed jquery files - fixes #8294
Thomas Müller [Wed, 23 Apr 2014 07:15:28 +0000 (09:15 +0200)]
Merge pull request #8316 from owncloud/add-new-jquery-to-scrutinizer-ignore
Add new jquery files to exclude list