Commit Graph

8149 Commits

Author SHA1 Message Date
Arthur Schiwon 24e13419a3 LDAP: escape values in the DN, fixes #419 2012-11-21 19:25:10 +01:00
Thomas Müller a85d891938 Merge pull request #538 from Deltachaos/fix_537
Fixes update of shared files with mirall because it dose not update all ...
2012-11-20 22:55:08 -08:00
Jenkins for ownCloud 9204be827b [tx-robot] updated from transifex 2012-11-21 00:02:33 +01:00
Maximilian Ruta ac4cafcfc7 Fixes update of shared files with mirall because it dose not update all methadata for a file 2012-11-20 23:34:25 +01:00
Thomas Müller 486b8013d0 Merge pull request #524 from owncloud/fix_user_webdavauth
interpret http 403 and http 401 as not authorized
2012-11-20 06:40:21 -08:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Frank Karlitschek 9b7cbb1145 interpret http 403 and http 401 as not authorized 2012-11-20 13:44:49 +01:00
Jenkins for ownCloud 568def2b61 [tx-robot] updated from transifex 2012-11-20 00:02:08 +01:00
Brice Maron 8fa7d6a48a Fix typo in getUrlContent fix #514 2012-11-19 17:13:07 +00:00
Thomas Müller d91c841f73 Merge pull request #383 from owncloud/contacts_api
Proposal for a public contacts api
2012-11-19 05:42:01 -08:00
Frank Karlitschek 5b2aeebaf0 Merge pull request #280 from butonic/feature_bmp_support
add bmp support
2012-11-19 00:53:46 -08:00
Jenkins for ownCloud c5e891008b [tx-robot] updated from transifex 2012-11-19 00:01:48 +01:00
Robin Appelman 40fae0acbf fix outdated permissions cache use in scanner 2012-11-18 14:10:28 +01:00
Robin Appelman a922eb756e merge master into filesystem 2012-11-18 14:07:52 +01:00
Thomas Müller ea80a8b9e3 Merge pull request #114 from riso/xsendfile
Implement X-Sendfile support
2012-11-18 04:35:46 -08:00
Thomas Mueller 2af7ac78d2 refs #505 - defining publicListView based on template parameter 2012-11-18 12:28:04 +01:00
Jenkins for ownCloud e28d71bf55 [tx-robot] updated from transifex 2012-11-18 00:02:00 +01:00
Thomas Müller f3ae43d94a Merge pull request #420 from libasys/bugfix-share
If you using the sharing by link the array monthNames don't exist and ca...
2012-11-17 14:47:24 -08:00
Thomas Müller 87c45b1651 Merge pull request #503 from eMerzh/add_ua_request
Add User agent when OC does a request
2012-11-17 14:22:37 -08:00
Brice Maron 4337e0fb99 Little case fix 2012-11-17 22:12:24 +00:00
Brice Maron 71adad8817 Add User agent when OC does a request 2012-11-17 21:08:58 +00:00
Thomas Müller ac3e962732 Merge pull request #375 from tdevos/master
Use curl to get remote file content
2012-11-17 12:31:25 -08:00
Thomas Müller 9e9bf20b07 Merge pull request #495 from owncloud/fix_issue_262
Fix lostpassword url generation
2012-11-17 02:09:40 -08:00
Jenkins for ownCloud 61670184c4 [tx-robot] updated from transifex 2012-11-17 00:02:24 +01:00
Bart Visscher 03b8ba273a Fix lostpassword url generation
Fixes issue #262
2012-11-16 22:01:24 +01:00
Robin Appelman 1007013833 stop increasing folder sizes once we hit a non folder
fixes #234
2012-11-16 17:54:58 +01:00
Robin Appelman 8fe69dfac6 also return fileid in OC_Filecache::get 2012-11-16 17:52:52 +01:00
Robin Appelman 74611801dd typo 2012-11-16 17:41:38 +01:00
Bart Visscher b03eca5ee2 Merge pull request #471 from owncloud/461_drag_drop_upload_to_folder
refs #461 - drag'n'drop upload to a sub folder is working now
2012-11-16 07:46:50 -08:00
Bart Visscher 20c24f234f Do the url encoding once, only in breadcrumbs template
fixes issue #438
2012-11-16 16:12:28 +01:00
Brice Maron 02bc440900 Show error message to prevent adding a shared folder in the root dir fix #468 2012-11-16 14:59:14 +00:00
Robin Appelman 3358bface5 fix incorectly merged versions.php 2012-11-16 12:24:28 +01:00
Robin Appelman 54240140b1 fix incorectly merged smb.php 2012-11-16 12:14:29 +01:00
Robin Appelman f4f00b4edb Merge branch 'master' into filesystem 2012-11-16 12:13:03 +01:00
Thomas Mueller 4a3b5125cf adding comments on the form array indexes 2012-11-16 11:58:33 +01:00
Thomas Mueller 2b192a75c4 normalize the path once in upload.php is enough - THX Robin for this hint 2012-11-16 11:50:57 +01:00
Thomas Mueller 7af4cf48c9 refs #461 - drag'n'drop upload to a sub folder is working now 2012-11-16 10:23:40 +01:00
Thomas Müller d1c0f2a739 Merge pull request #454 from Raydiation/master
Routing fixes
2012-11-15 15:15:07 -08:00
Thomas Tanghus b99213f7a7 Merge pull request #458 from owncloud/js_console_switch
Very simple js console switcher.
2012-11-15 15:05:47 -08:00
Jenkins for ownCloud d86a368e54 [tx-robot] updated from transifex 2012-11-16 00:03:47 +01:00
Thomas Müller 36bf4e24f0 Merge pull request #433 from owncloud/user_setting_fixes
User setting fixes
2012-11-15 14:01:16 -08:00
Robin Appelman 288ecf318c add getFileInfo and getDirectoryContent to OC_Files for compatibility 2012-11-15 22:08:08 +01:00
Robin Appelman 5569f07e8d add OC_FilesystemView alias for compatibility 2012-11-15 22:04:48 +01:00
Robin Appelman f94d62380f Merge branch 'master' into filesystem 2012-11-15 21:27:24 +01:00
thomas d2047a00cf Remove parentheses in return, modify description, and fix a mistake 2012-11-15 20:46:17 +01:00
Thomas Tanghus b51b9539d0 Very simple js console switcher. 2012-11-15 19:43:10 +01:00
Bart Visscher 8bed38c78d Rename install hook functions to register hook 2012-11-15 18:13:54 +01:00
Bart Visscher 9419913c06 Better place to check for user removal 2012-11-15 18:10:40 +01:00
Björn Schießle 8a93cc14f6 port of approved pull request #442 - 'Always set renaming to false, also if renaming was aborted, to finalize the operation and show the file actions again.' 2012-11-15 17:16:18 +01:00
Bernhard Posselt defdbe3c10 removed unneeded callback checks in routes_request that could potentially fail 2012-11-15 15:07:01 +01:00