Commit Graph

17146 Commits (dcca5f7bdd224f9fdd773d2a9ff8ac6f3199823a)
 

Author SHA1 Message Date
blizzz a179335775 Merge pull request #7940 from owncloud/settings-userlistajaxcallfix 11 years ago
Björn Schießle c45793033d Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook 11 years ago
Vincent Petry be0660f84f Merge pull request #7943 from hjort/master 11 years ago
Vincent Petry 5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2 11 years ago
Vincent Petry 18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock 11 years ago
Morris Jobke a94ac41512 Merge pull request #7966 from owncloud/url_generation_hack 11 years ago
Morris Jobke 0d2a81a095 apply proposed change 11 years ago
Vincent Petry 0067a4eac2 Added missing fclose in file_get_contents and file_put_contents 11 years ago
Vincent Petry d6ce45fe61 Correctly read the full stream in file_get_contents 11 years ago
Jenkins for ownCloud 7a4a836abe [tx-robot] updated from transifex 11 years ago
Bart Visscher 6b061c236d Merge branch 'master' into type-hinting 11 years ago
Björn Schießle 0ca80254ec Merge pull request #7967 from owncloud/sharing_fix_select_statement 11 years ago
Bjoern Schiessle c578ab68fe there is no need to re-calculate the shares after a touch 11 years ago
Bjoern Schiessle 8e34812393 always encrypt files to owner 11 years ago
Thomas Müller fe2c6f4e6d remove pl_PL - fixes #7973 11 years ago
Robin Appelman 76c63a5760 Fix uploading files containing a # in the path for webdav 11 years ago
Morris Jobke ab696edba6 Merge pull request #7916 from owncloud/fix-input-sizes 11 years ago
Vincent Petry cf361b6b4a Allow using "/" in "overwritewebroot" 11 years ago
Bjoern Schiessle aa867ad647 don't call getFileInfo() to avoid to open the same file twice 11 years ago
Bjoern Schiessle 8ebb1f15d3 move check if a file should be encrypted to the pre hook 11 years ago
Bjoern Schiessle 3a731a01b1 select statement always need to contain file_source respectively item_source 11 years ago
Robin Appelman 0c2585f3ac Improve phpdoc 11 years ago
Thomas Tanghus 6292aa57af Check if web root has already been appended 11 years ago
Morris Jobke 8bd308ffed merge CSS rules 11 years ago
Jan-Christoph Borchardt 2be2a5d2c5 external storage: fix merge conflict, indentation 11 years ago
Jan-Christoph Borchardt 6ac85480f7 replace last personalblock fieldset within files_external 11 years ago
Jan-Christoph Borchardt 615de6534f fix duplicate rules for button/input styles, em to px 11 years ago
Vincent Petry 65e3f63400 Merge pull request #7939 from owncloud/wring_redirect_on_login 11 years ago
Jenkins for ownCloud 5b552c84da [tx-robot] updated from transifex 11 years ago
raghunayyar 881c66df52 Removes highlighting of selected items, padding from apps management. 11 years ago
Jenkins for ownCloud bfb0b9a044 [tx-robot] updated from transifex 11 years ago
Thomas Tanghus 7278f2f567 Sub-dir was prepended twice 11 years ago
Thomas Tanghus 3a7829f784 Sub-dir was prepended twice 11 years ago
Jenkins for ownCloud 915fa3da74 [tx-robot] updated from transifex 11 years ago
Thomas Müller 80c6f883a8 Merge pull request #7845 from duritong/fix_submodule_url 11 years ago
Morris Jobke 73c81ae709 Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master 11 years ago
Rodrigo Hjort 51b727cfca Correction: failure on sharing when user ID was prefixed by zero 11 years ago
Vincent Petry 82f98fb3d3 Fixed user list offset call 11 years ago
Thomas Tanghus c14107550d Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 11 years ago
Vincent Petry 0ae9ed4244 Merge pull request #7934 from owncloud/addEventToExpirationDate 11 years ago
Robin Appelman fe78d963d9 Implement getPath for shared files 11 years ago
Robin Appelman f331d5f9d4 Give storages the option to implement the getById behaviour for View->getPath 11 years ago
Morris Jobke 841069e8cb Merge pull request #7770 from jamesryanbell/master 11 years ago
Morris Jobke e4069e1553 Emit event after setting a new expiration for a share 11 years ago
Björn Schießle 7adb5ae2c5 Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails 11 years ago
Alexander Bergolth b158939283 adapt description of paging size configuration 11 years ago
Alexander Bergolth 0d9d70b51c change default ldap paging size to 500 11 years ago
Thomas Müller 70db348475 Merge pull request #7824 from owncloud/hash-parameter-order 11 years ago
Thomas Müller f1b085df01 adding @method annotation to declare methods which can be called on the wrapped statement object 11 years ago
Vincent Petry d0012e729a Merge pull request #7879 from owncloud/sharing_cleanup_public_api 11 years ago