Commit Graph

7771 Commits

Author SHA1 Message Date
Frank Karlitschek 6cb3774706 make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups. 2012-11-22 19:22:00 +01:00
Thomas Müller c773d071ee Merge pull request #506 from owncloud/fix_505
refs #505 - defining publicListView based on template parameter
2012-11-22 02:53:10 -08:00
blizzz d4ec77e08b Merge pull request #482 from eMerzh/fix_prevent_shared_folder
Show error message to prevent adding a shared folder in the root dir fix...
2012-11-22 02:40:23 -08:00
Thomas Müller 54356636e4 Merge pull request #483 from owncloud/archive_sizes
stop increasing folder sizes once we hit a non folder
2012-11-22 01:56:08 -08:00
Jenkins for ownCloud 3a5f5e127c [tx-robot] updated from transifex 2012-11-22 00:02:16 +01:00
Arthur Schiwon 495a8da354 port 95cee0e from stable45 2012-11-21 19:29:56 +01:00
Arthur Schiwon aebd4fd32d port dd694b5 from stable45 2012-11-21 19:28:29 +01:00
Arthur Schiwon 42f235123e LDAP: Make update script escape all known DNs. Requires version bump. 2012-11-21 19:25:36 +01:00
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
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
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
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
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
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 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
Bernhard Posselt 25e4a071ef fixed: this.routes_request is a deferred/promise 2012-11-15 15:01:21 +01:00
Bernhard Posselt e642d18e26 When using routing in apps, no apps are loaded in the left navigation tree. To fix this: load apps for matching a request 2012-11-15 14:48:18 +01:00
Bernhard Posselt bf20021b62 instead of warning via popup, write to console.warn 2012-11-15 14:48:18 +01:00