summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-11-2387-1159/+1434
* Merge pull request #554 from owncloud/reverse_proxyThomas Müller2012-11-223-1/+13
|\
| * make it possible to manually override the hostname and protocol if the automa...Frank Karlitschek2012-11-223-1/+13
|/
* Merge pull request #506 from owncloud/fix_505Thomas Müller2012-11-221-0/+8
|\
| * refs #505 - defining publicListView based on template parameterThomas Mueller2012-11-181-0/+8
* | Merge pull request #482 from eMerzh/fix_prevent_shared_folderblizzz2012-11-221-0/+4
|\ \
| * | Show error message to prevent adding a shared folder in the root dir fix #468Brice Maron2012-11-161-0/+4
* | | Merge pull request #483 from owncloud/archive_sizesThomas Müller2012-11-222-7/+20
|\ \ \
| * | | stop increasing folder sizes once we hit a non folderRobin Appelman2012-11-161-2/+15
| * | | also return fileid in OC_Filecache::getRobin Appelman2012-11-161-2/+2
| * | | typoRobin Appelman2012-11-161-3/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2228-228/+370
* | | | port 95cee0e from stable45Arthur Schiwon2012-11-211-1/+14
* | | | port dd694b5 from stable45Arthur Schiwon2012-11-211-11/+6
* | | | LDAP: Make update script escape all known DNs. Requires version bump.Arthur Schiwon2012-11-212-6/+33
* | | | LDAP: escape values in the DN, fixes #419Arthur Schiwon2012-11-211-0/+13
* | | | Merge pull request #538 from Deltachaos/fix_537Thomas Müller2012-11-201-5/+7
|\ \ \ \
| * | | | Fixes update of shared files with mirall because it dose not update all metha...Maximilian Ruta2012-11-201-5/+7
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2160-448/+628
|/ / / /
* | | | Merge pull request #524 from owncloud/fix_user_webdavauthThomas Müller2012-11-201-1/+1
|\ \ \ \
| * | | | interpret http 403 and http 401 as not authorizedFrank Karlitschek2012-11-201-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2050-564/+799
* | | | Fix typo in getUrlContent fix #514Brice Maron2012-11-191-1/+1
* | | | Merge pull request #383 from owncloud/contacts_apiThomas Müller2012-11-191-0/+103
|\ \ \ \
| * | | | function isEnabled() addedThomas Mueller2012-11-131-3/+13
| * | | | public contacts api as discussed here https://github.com/owncloud/apps/issues...Thomas Mueller2012-11-121-0/+93
* | | | | Merge pull request #280 from butonic/feature_bmp_supportFrank Karlitschek2012-11-192-24/+301
|\ \ \ \ \
| * | | | | add php-doc for ellipsisJörn Friedrich Dreyer2012-11-121-2/+8
| * | | | | move code to better placesJörn Friedrich Dreyer2012-11-122-141/+146
| * | | | | add php-docJörn Friedrich Dreyer2012-11-121-6/+23
| * | | | | add bmp supportJörn Friedrich Dreyer2012-11-121-3/+252
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-1926-91/+1729
* | | | | | Merge pull request #114 from riso/xsendfileThomas Müller2012-11-183-4/+67
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixed style according to owncloud styleguideValerio Ponte2012-11-142-21/+32
| * | | | | Moved X-Sendfile headers into OC_Files::getValerio Ponte2012-11-144-34/+72
| * | | | | Implemented X-Sendfile supportValerio Ponte2012-11-141-0/+14
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-1834-288/+400
* | | | | | Merge pull request #420 from libasys/bugfix-shareThomas Müller2012-11-171-1/+3
|\ \ \ \ \ \
| * | | | | | If you using the sharing by link the array monthNames don't exist and causes ...libasys2012-11-141-1/+3
* | | | | | | Merge pull request #503 from eMerzh/add_ua_requestThomas Müller2012-11-171-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Little case fixBrice Maron2012-11-171-1/+1
| * | | | | | | Add User agent when OC does a requestBrice Maron2012-11-171-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #375 from tdevos/masterThomas Müller2012-11-172-11/+41
|\ \ \ \ \ \ \
| * | | | | | | Remove parentheses in return, modify description, and fix a mistakethomas2012-11-151-3/+3
| * | | | | | | change and transfert getUrlContentthomas2012-11-142-21/+40
| * | | | | | | Add connection time out optionthomas2012-11-121-0/+1
| * | | | | | | Use curl to get remote file contentthomas2012-11-121-10/+20
* | | | | | | | Merge pull request #495 from owncloud/fix_issue_262Thomas Müller2012-11-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix lostpassword url generationBart Visscher2012-11-161-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-1736-384/+457
| |_|_|_|_|_|/ |/| | | | | |