Commit Graph

7301 Commits

Author SHA1 Message Date
Thomas Mueller f96405e78a [files_external] mount filesystems for all users 2012-12-06 14:56:12 +01:00
Brice Maron 39dbecdc10 Fix a dirty function preventing showing errors 2012-12-05 18:16:55 +00:00
Thomas Müller da5fd1a3d0 Merge pull request #691 from VicDeo/stable45
Minor cleanup in OC_OCSClient::getKnownledgebaseEntries. Fix for #487
2012-12-05 01:43:15 -08:00
Jörn Friedrich Dreyer 144a435967 Merge pull request #602 from butonic/add_drag_shadow_in_firefox_stable45
show drag shadow in firefox by using helper:'clone'
2012-12-04 14:51:07 -08:00
blizzz c0a8e3f436 Merge pull request #701 from owncloud/backport_fix_oc-605
fix oc-605 resp. #587
2012-12-04 13:27:56 -08:00
Jörn Friedrich Dreyer 1a2fad128b fix oc-605 2012-12-04 00:08:34 +01:00
Victor Dubiniuk 67682ec259 Check if we have an array with data. Fix #487 2012-12-03 20:27:13 +03:00
Victor Dubiniuk c840a688ab Clean KB entries processing code 2012-12-03 20:26:37 +03:00
Björn Schießle 3ede33a886 Merge pull request #649 from schiesbn/fix_fileVersioningForSharedFiles_stable45
Fix file versioning for shared files stable45, merged because of the positive comments here and in the master branch for the same fix
2012-12-03 02:56:50 -08:00
Frank Karlitschek 4d7910f424 Merge branch 'stable45' of https://github.com/owncloud/core into stable45 2012-12-02 19:57:47 +01:00
Frank Karlitschek 10d97c8140 4.5.4 2012-12-02 19:56:51 +01:00
blizzz d57b870f3e Merge pull request #662 from owncloud/fix_ldap_escape_dn_2
LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. ...
2012-12-02 10:43:43 -08:00
Arthur Schiwon 44119e2051 LDAP: ldap_explode_dn escaped too much, fix it by manual replacement. Fixes different problems, esp. with non-ascii characters in the dn (#631) 2012-12-01 00:27:48 +01:00
Björn Schießle 8596226787 Merge pull request #656 from schiesbn/backport_pull_619
backport of pull request 691
2012-11-30 08:11:33 -08:00
Björn Schießle 85382a5140 backport of pull request #691, no file versions if fs cache 2012-11-30 16:51:39 +01:00
Björn Schießle 1f4713d320 use \OCP\Share::getItemSharedWith to also finds source of files in a shared folder 2012-11-30 14:08:57 +01:00
Björn Schießle b7dd48b41f fix regression in file versioning for shared files 2012-11-30 13:14:24 +01:00
Robin Appelman 4decc86598 use new obEnd function instead of ob_end_clean 2012-11-29 23:16:02 +01:00
Robin Appelman 6fb5095197 add function to safly end output buffering 2012-11-29 23:15:13 +01:00
Georg Ehrke 79a7ee656e use attr instead of data 2012-11-29 14:39:55 +01:00
Georg Ehrke 71679c8921 Revert "fix group and subadmin managing for 'ajax-loaded' users"
This reverts commit a5774229a1.
2012-11-29 14:39:55 +01:00
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
Jörn Friedrich Dreyer a9f041a702 show drag shadow in firefox by using helper:'clone' 2012-11-29 12:08:40 +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