upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-25 16:41:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
10396 commits 1040 branches 1229 tags 6.8 GiB
Commit graph

10396 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brice Maron
885b81ba23 Add backtick for trash app to prevent pg errors 2013-03-15 11:19:02 +01:00
Björn Schießle
6ca2abc108 create new version if the same file is uploaded again over the web interface, approved in #2317 2013-03-15 10:47:19 +01:00
Björn Schießle
0fe2f81a0c create new version if the same file is uploaded again over the web interface 2013-03-15 10:44:27 +01:00
Bernhard Posselt
2cd52e52c8 Merge pull request #2294 from owncloud/use_display_name_in_mail 
use display name as sender for private link mails
 2013-03-14 05:22:45 -07:00
Björn Schießle
d06fec658c use display name as sender for private link mails 2013-03-14 11:48:04 +01:00
Bernhard Posselt
049329588f Merge pull request #2276 from owncloud/fix_sharing_hooks_oc5 
listen to the pre delete hook in the sharing app [oc5]
 2013-03-13 10:16:14 -07:00
Jörn Friedrich Dreyer
09d3b9ef26 Merge pull request #2278 from owncloud/fix_2267_master 
use OC_DB instead of MDB2
 2013-03-13 10:09:39 -07:00
Björn Schießle
92ce2bf89b fix for #2267, use OC_DB instead of MDB2 2013-03-13 16:51:41 +01:00
Björn Schießle
ca93f6e1de don't show share action for the Shared folder, approved pull request #2265 2013-03-13 16:26:20 +01:00
Björn Schießle
d166471a46 we need to listen to the pre delete hook, otherwise the file is already gone 2013-03-13 15:36:02 +01:00
Arthur Schiwon
6017ca5ddd LDAP: compatibility with Novell eDirectory UUID 2013-03-12 20:16:09 +01:00
Thomas Mueller
eedc1e76db 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 20:01:40 +01:00
Thomas Mueller
510cbc4ff9 write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-( 2013-03-12 20:01:40 +01:00
Thomas Mueller
9b9497bedf fixing various filesystem/storage unit tests on windows 
fixing copy operation on mapper
 2013-03-12 19:57:56 +01:00
Thomas Mueller
8846edd919 skip archive tests for now 2013-03-12 19:57:42 +01:00
Thomas Mueller
253f7ec932 adding //IGNORE to iconv to prevent nasty php warnings 2013-03-12 19:57:28 +01:00
Thomas Mueller
8bafcd1414 slug generates uniqid in case the file/folder name contains not one single valid character 2013-03-12 19:56:44 +01:00
Thomas Mueller
40bb805b83 indexed slug should be created based on logic path 2013-03-12 19:56:33 +01:00
icewind1991
00030a6c24 Merge pull request #2248 from otetard/bugfix/fix-public-link-file-sharing 
Fix file sharing via public link for one particular file.
 2013-03-12 11:49:08 -07:00
Olivier Tétard
2afece459a 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 11:53:41 +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
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
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
Björn Schießle
8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00