Commit Graph

10537 Commits

Author SHA1 Message Date
Thomas Mueller a05820c659 fixing various filesystem/storage unit tests on windows
fixing copy operation on mapper
2013-03-12 15:30:10 +01:00
Thomas Mueller 818c24bd45 skip archive tests for now 2013-03-12 10:33:40 +01:00
Thomas Mueller eedbebd40e adding //IGNORE to iconv to prevent nasty php warnings 2013-03-12 09:26:21 +01:00
Thomas Mueller 06992fec6d slug generates uniqid in case the file/folder name contains not one single valid character 2013-03-12 09:24:58 +01:00
Thomas Mueller 0900301668 indexed slug should be created based on logic path 2013-03-12 09:15:53 +01:00
Thomas Mueller 2fe56b8969 fixes #2081 2013-03-12 09:14:05 +01:00
Jenkins for ownCloud 569c7ab138 [tx-robot] updated from transifex 2013-03-12 00:14:05 +01:00
Arthur Schiwon 1e07801c95 LDAP: compatibility with Novell eDirectory UUID 2013-03-11 13:30:06 +01:00
Bernhard Posselt 1e20067c00 Merge pull request #2183 from owncloud/fix-shared-statuses-again
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
Bernhard Posselt 11251ec8a8 Merge pull request #2218 from owncloud/fix-mounting-all
Fix variable for mounting for all users, fix #357
2013-03-11 02:41:41 -07:00
Bernhard Posselt 049a4df259 Merge pull request #1786 from owncloud/shared-folder-etags
Include etags for the root of the shared folder
2013-03-11 02:38:50 -07:00
Bernhard Posselt 75377a6eb4 Merge pull request #2184 from tripflex/master
Remove php_value from .htaccess causing 500 errors, fixes #2176
2013-03-10 12:39:17 -07:00
Michael Gapczynski 39f75d9854 Merge pull request #2224 from owncloud/ldap_version_bump
LDAP: fancy version for release, no code change
2013-03-10 11:28:48 -07:00
Arthur Schiwon 07f88424c8 LDAP: fancy version for release, no code change 2013-03-10 18:34:56 +01:00
Lukas Reschke 3c06020e3e Merge pull request #2217 from owncloud/mountconfig-location
Store the global mount configuration file in the datadir
2013-03-10 00:25:10 -08:00
Michael Gapczynski 8a5946fadc Fix variable for mounting for all users, fix #357 2013-03-09 21:09:31 -05:00
Robin Appelman be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Tom Needham dfbf57207d Merge pull request #1584 from owncloud/ocs_multiple_methods
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
Jenkins for ownCloud 6bdb84ab28 [tx-robot] updated from transifex 2013-03-10 00:06:53 +01:00
Frank Karlitschek e6c2a91781 this is now 6.0 pre alpha 2013-03-09 20:19:34 +01:00
Frank Karlitschek 256595e7b2 5.0.0 2013-03-09 18:51:02 +01:00
Bernhard Posselt 769317702f Merge pull request #2236 from owncloud/fix-migration
Check if username is valid and remove slashes from filename
2013-03-11 08:43:09 -07:00
Lukas Reschke 3ae70ab162 Check if username is valid and remove slashes from filename 2013-03-11 16:21:26 +01:00
Lukas Reschke 0fa12f8d85 Merge pull request #2214 from riso/fix_xsendfile
Fixed typo that broke xsendfile
2013-03-09 08:20:09 -08:00
Valerio Ponte 99c873ea29 fixed typo that broke xsendfile 2013-03-09 15:35:36 +01:00
Frank Karlitschek 4763c4616f Merge pull request #2213 from owncloud/fix_2208
remove remaining br-tags that do not belong here
2013-03-09 05:30:12 -08:00
Arthur Schiwon 988a67fc9a remove remaining br-tags that do not belong here 2013-03-09 13:45:37 +01:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00
Jenkins for ownCloud 0629ff4dd9 [tx-robot] updated from transifex 2013-03-09 00:06:34 +01:00
Michael Gapczynski e743386acf Fix correctFolders and retrieve the correct storage cache 2013-03-08 14:27:30 -05:00
Lukas Reschke 546fb72b25 Merge pull request #2165 from owncloud/fix_2155
Offer download of whole shared dir only if it does not exceed zip input ...
2013-03-08 10:31:48 -08:00
Arthur Schiwon f4a326173e fix foldersize check to validate zip input size 2013-03-08 19:21:06 +01:00
Robin Appelman 1d3beffacf Cache: better rename hook for cache updater 2013-03-08 19:08:07 +01:00
Björn Schießle 02e2f7384e not only files can be reshared but also folders 2013-03-08 17:32:04 +01:00
Bernhard Posselt 9ad03b61a3 Update share.js
Added HTML escaping
2013-03-08 17:29:05 +01:00
Michael Gapczynski 20828488bc Fix share hook for updater 2013-03-08 10:59:22 -05:00
Björn Schießle 2d00d13a5d use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated 2013-03-08 15:13:00 +01:00
Frank Karlitschek f9c24a0368 5.0.0 RC3 2013-03-08 10:01:22 +01:00
Bernhard Posselt 0525bbd73c Merge pull request #2189 from owncloud/versioning_sync_client
fix versioning for the sync client - distinguish between touch and write operation
2013-03-08 03:05:28 -08:00
Björn Schießle 8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Björn Schießle 45869afa5a remove debug output 2013-03-08 10:51:28 +01:00
Myles McNamara ef2e84026e remove php_value
php_value can only be used with mod_php, using it with FCGI will cause 500 Internal Server errors.  This needs to be set in php.ini manually or set using ini_set().
2013-03-07 23:30:56 -05:00
Michael Gapczynski 6e5e8c6b46 Fix #2080 and fix #2141 2013-03-07 22:30:12 -05:00
Jenkins for ownCloud 308c85090e [tx-robot] updated from transifex 2013-03-08 00:26:35 +01:00
Michael Gapczynski 4826564344 Merge branch 'master' into shared-folder-etags
Conflicts:
	apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
Florian Hülsmann 0aa6c1b163 fixed header content padding 2013-03-07 19:28:17 +01:00
Bernhard Posselt d6bb627a62 Merge pull request #2173 from owncloud/fix-shared-storage
Fix fetching source path of shared files
2013-03-07 09:37:36 -08:00
Michael Gapczynski ef2eb10ea4 Change findById to findByStorageId in mount test 2013-03-07 11:47:24 -05:00
blizzz 99914a44a5 Merge pull request #2174 from owncloud/fix_printed_brs
Remove <br> from error messages, because they will be escaped and the us...
2013-03-07 08:39:29 -08:00
Arthur Schiwon 47d176ae69 Remove <br> from error messages, because they will be escaped and the used template has it's own <br> already 2013-03-07 17:28:28 +01:00