summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge pull request #471 from owncloud/461_drag_drop_upload_to_folderBart Visscher2012-11-163-4/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | adding comments on the form array indexesThomas Mueller2012-11-161-0/+3
| * | | | | | normalize the path once in upload.php is enough - THX Robin for this hintThomas Mueller2012-11-162-8/+2
| * | | | | | refs #461 - drag'n'drop upload to a sub folder is working nowThomas Mueller2012-11-164-4/+23
|/ / / / / /
* | | | | | Merge pull request #454 from Raydiation/masterThomas Müller2012-11-152-2/+8
|\ \ \ \ \ \
| * | | | | | removed unneeded callback checks in routes_request that could potentially failBernhard Posselt2012-11-151-4/+0
| * | | | | | fixed: this.routes_request is a deferred/promiseBernhard Posselt2012-11-151-5/+1
| * | | | | | When using routing in apps, no apps are loaded in the left navigation tree. T...Bernhard Posselt2012-11-151-0/+1
| * | | | | | instead of warning via popup, write to console.warnBernhard Posselt2012-11-151-1/+1
| * | | | | | Prevent ajax race conditions when using routes by offering a callback that is...Bernhard Posselt2012-11-151-2/+15
* | | | | | | Merge pull request #458 from owncloud/js_console_switchThomas Tanghus2012-11-154-0/+19
|\ \ \ \ \ \ \
| * | | | | | | Very simple js console switcher.Thomas Tanghus2012-11-154-0/+19
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-16154-369/+473
* | | | | | | | Merge pull request #433 from owncloud/user_setting_fixesThomas Müller2012-11-153-17/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Better place to check for user removalBart Visscher2012-11-151-1/+4
| * | | | | | | Better check and handing of user deletionBart Visscher2012-11-142-1/+3
| * | | | | | | Better check and handling of user creationBart Visscher2012-11-142-3/+6
| * | | | | | | Always have the username as string in user adminBart Visscher2012-11-141-6/+6
| * | | | | | | Cleanup user settings jsBart Visscher2012-11-141-8/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | port of approved pull request #442 - 'Always set renaming to false, also if r...Björn Schießle2012-11-151-1/+1
| |/ / / / / |/| | | | |