mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,398 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

10398 Commits

Author SHA1 Message Date
Bernhard Posselt 7d748a6b06 Merge pull request #2277 from owncloud/fix_sharing_hooks 
listen to the pre delete hook in the sharing app [master]
 2013-03-13 10:15:57 -07:00
Björn Schießle c3ba49f384 Merge pull request #2265 from owncloud/no_share_option_for_shared_folder 
don't add share action to the Shared folder
 2013-03-13 08:23:35 -07:00
Björn Schießle 30831b6b55 we need to listen to the pre delete hook, otherwise the file is already gone 2013-03-13 15:39:39 +01:00
Björn Schießle e5f40ddaae only prevent shared action for the Shared folder in the root dir 2013-03-13 11:33:20 +01:00
Jenkins for ownCloud f3a2daaa9d [tx-robot] updated from transifex 2013-03-13 00:06:21 +01:00
Olivier Tétard 17fd6482d8 Fix file sharing via public link for one particular file. 
Fix OC_Files::get() to not return the first character of the filename
if only one file is requested.
 2013-03-12 20:03:54 +01:00
Thomas Müller 2e9d641337 Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-string-master 
Fixing mssql utf8 and insert empty string master
 2013-03-12 11:52:40 -07:00
Thomas Müller 84d895dc87 Merge pull request #2253 from owncloud/fixing-windows-file-mapper-master 
Fixing windows file mapper master
 2013-03-12 11:48:29 -07:00
Jan-Christoph Borchardt 68a7b53e03 Merge pull request #2145 from eMerzh/preserve_debug 
Preserve Debug flag accross config writes
 2013-03-12 10:26:01 -07:00
Frank Karlitschek 43d15066f9 Merge pull request #2234 from owncloud/fix_ldap_edirectory 
LDAP: compatibility with Novell eDirectory UUID
 2013-03-12 10:21:49 -07:00
Björn Schießle b2da2f769a don't add share action to the Shared folder 2013-03-12 17:28:36 +01:00
Thomas Mueller ec16853112 enable UTF-8 charset on mssql 
disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
 2013-03-12 15:39:44 +01:00
Thomas Mueller 9d4d399aa3 write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-( 2013-03-12 15:39:29 +01:00
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
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
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