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

7279 Commits

Author SHA1 Message Date
Georg Ehrke 44dbdd9632 add a client side check 2012-11-29 14:39:54 +01:00
Georg Ehrke 97231e64ba fix group and subadmin managing for 'ajax-loaded' users 2012-11-29 14:39:54 +01:00
Georg Ehrke cc785e2f1b make some checks server-side 2012-11-29 14:39:54 +01:00
Frank Karlitschek 5daf512405 4.5.3 2012-11-26 19:51:36 +01:00
Björn Schießle d6bc7757ab Merge pull request #581 from schiesbn/add_user_to_fscache 
make sure to add the right user as owner of a file to the file cache table
 2012-11-26 08:47:45 -08:00
Jörn Friedrich Dreyer 94db6c64a9 Merge branch 'stable45' of github.com:owncloud/core into stable45 2012-11-26 17:41:00 +01:00
Arthur Schiwon ef159cd863 use normalizePath to have a proper target path 2012-11-26 17:39:20 +01:00
Arthur Schiwon 263da2463a remove debug output 2012-11-26 17:39:20 +01:00
Arthur Schiwon 15a485cbdb coding style 2012-11-26 17:39:20 +01:00
Arthur Schiwon 440828f0f1 check whether to join url with ? or & 2012-11-26 17:39:19 +01:00
Arthur Schiwon 5d53e0d5ce all but the first parameter are introduced by & 2012-11-26 17:39:19 +01:00
Arthur Schiwon 07c0cda12d make sure path starts with / 2012-11-26 17:39:19 +01:00
Jörn Friedrich Dreyer 2f08d24743 Backport pull request #380 from butonic/feature_share_link_with_token 2012-11-26 17:31:40 +01:00
Björn Schießle 1b4f249157 make sure to add the right user as owner of a file to the file cache table 2012-11-26 15:09:02 +01:00
blizzz 410d798e98 Merge pull request #456 from owncloud/fix_new_from_url 
Fix new from url
 2012-11-26 05:24:58 -08:00
Arthur Schiwon 34937479a8 use normalizePath to have a proper target path 2012-11-26 14:13:23 +01:00
Robin Appelman 41bfd5e1f3 make sure the output buffer is closed when handeling webdav 2012-11-25 15:34:23 +01:00
Frank Karlitschek e56de16876 backport pullrequest #562 2012-11-24 18:56:53 +01:00
Jörn Friedrich Dreyer f385d32331 introduce Files.containsInvalidCharacters(), use when creating or renaming files 
Conflicts:
	apps/files/js/files.js
 2012-11-23 21:59:42 +01:00
Thomas Mueller 3c5470358e some more invalid characters have been added 
Conflicts:
	apps/files/js/files.js
 2012-11-23 21:57:50 +01:00
Bart Visscher 05db74e7db Also reject names with \ in the name 
fixes issues #435 and #437
 2012-11-23 21:54:34 +01:00
Frank Karlitschek 470e93e4df backport pullrequest 561 2012-11-23 15:01:14 +01:00
Frank Karlitschek f359c2a716 backport pullrequest #554 
better reverse proxy support
 2012-11-23 12:48:54 +01:00
Arthur Schiwon 88516dd8ae remove debug output 2012-11-23 12:18:38 +01:00
Robin Appelman 3e20032a32 stop increasing folder sizes once we hit a non folder 
fixes #234

Conflicts:
	lib/filecache.php
 2012-11-22 22:21:14 +01:00
Robin Appelman f849dd0693 also return fileid in OC_Filecache::get 2012-11-22 22:09:27 +01:00
Robin Appelman a566684564 typo 2012-11-22 22:09:14 +01:00
Brice Maron dceb2b7c32 Show error message to prevent adding a shared folder in the root dir fix #468 2012-11-22 22:05:41 +01:00
blizzz 270d1199a6 Merge pull request #497 from owncloud/fix_ldap_escape_dn 
Fix ldap escape dn
 2012-11-21 10:24:05 -08:00
Björn Schießle 89bdb78f0a Merge pull request #525 from owncloud/fix_metadata_on_upload 
add root as parameter to keep default root for non-shared folder/files
 2012-11-21 03:50:59 -08:00
Thomas Müller 756424b6dd Merge pull request #539 from owncloud/filecache_query_fix 
fix copy-paste error in sql query
 2012-11-20 22:25:12 -08:00
Robin Appelman e9c710e4fc fix copy-paste error in sql query 
fixes #526
 2012-11-21 00:05:32 +01:00
Björn Schießle 8f2209680a Merge pull request #518 from owncloud/fix_property_cache 
use correct path for property cache
 2012-11-20 14:06:59 -08:00
Arthur Schiwon 95cee0eb5d LDAP: also prepare for DN for login due to the escape changes for #419. Hopefully we're really done now.. 2012-11-20 17:36:25 +01:00
Björn Schießle ea54fe98f7 take root folder into account while checking for Shared folder 2012-11-20 16:57:35 +01:00
Björn Schießle 939470d771 Merge pull request #521 from owncloud/filecache_update_user 
allow to update the user in file cache. (e.g. for Shared files)
 2012-11-20 06:57:46 -08:00
Björn Schießle 84754d3d20 add root as parameter to keep default root for non-shared folder/files 2012-11-20 14:28:32 +01:00
Arthur Schiwon dd694b5fb4 LDAP: correct escaping in DNs, differ between use for filters and bases. Really fixes #419 now 2012-11-20 13:15:02 +01:00
Björn Schießle e44e357381 Merge pull request #448 from owncloud/fix_metadata_on_upload 
Fix metadata on upload
 2012-11-20 03:19:58 -08:00
Björn Schießle ced12cbf76 allow to update the user in file cache. (e.g. for Shared files) 2012-11-20 11:40:50 +01:00
Björn Schießle 2854ee56e9 use correct path for property cache (the real path of the file and not the virtual path in the shared folder 2012-11-20 10:24:32 +01:00
Arthur Schiwon fd71023dd6 LDAP: Make update script escape all known DNs. Requires version bump. 2012-11-17 00:03:35 +01:00
Arthur Schiwon 124e4ba53c LDAP: escape values in the DN, fixes #419 2012-11-16 23:29:00 +01:00
Arthur Schiwon 85a0ba28d7 coding style 2012-11-16 20:28:58 +01:00
Arthur Schiwon 54352fe566 check whether to join url with ? or & 2012-11-16 20:28:03 +01:00
Thomas Müller 326496ff80 Merge pull request #439 from owncloud/239_webdav_999_files_stable45 
backport of #271 to stable45
 2012-11-16 08:12:24 -08:00
Thomas Mueller 6188f07c95 backport of PR #471 2012-11-16 17:10:40 +01:00
Thomas Mueller 4fa86c4dc3 closes #466 - manual backport of translations 2012-11-16 15:31:24 +01:00
Bart Visscher 39a54f5abf Better place to check for user removal 2012-11-15 23:15:15 +01:00
Bart Visscher 52dd0274d3 Better check and handing of user deletion 2012-11-15 23:15:08 +01:00