Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into filesystem | Robin Appelman | 2012-12-25 | 1 | -57/+45 |
|\ | |||||
| * | call it "proxy" instead of "curlproxy" | root | 2012-12-19 | 1 | -4/+4 |
| * | make it more readable as deepdiver suggested | Frank Karlitschek | 2012-12-19 | 1 | -2/+6 |
| * | add curl proxy support. Fixes #504 | Frank Karlitschek | 2012-12-19 | 1 | -27/+28 |
| * | Merge pull request #961 from owncloud/check_locale | Frank Karlitschek | 2012-12-19 | 1 | -0/+12 |
| |\ | |||||
| | * | add a check and a warning if setlocale is working | Frank Karlitschek | 2012-12-19 | 1 | -0/+12 |
| * | | Merge pull request #868 from owncloud/new_doc_system | Frank Karlitschek | 2012-12-19 | 1 | -30/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | remove PgeNavi. It's no longer used | Frank Karlitschek | 2012-12-13 | 1 | -30/+1 |
* | | | use numeric ids for storages in the filecache | Robin Appelman | 2012-12-15 | 1 | -1/+1 |
* | | | merge master into filesystem | Robin Appelman | 2012-12-15 | 1 | -31/+30 |
|\| | | |||||
| * | | More style fixes | Bart Visscher | 2012-12-15 | 1 | -2/+1 |
| * | | Fix "Line indented incorrectly" | Bart Visscher | 2012-12-15 | 1 | -29/+29 |
| |/ | |||||
* | | Merge branch 'master' into filesystem | Robin Appelman | 2012-12-11 | 1 | -6/+4 |
|\| | |||||
| * | Merge pull request #182 from owncloud/fix-redirect | Bart Visscher | 2012-12-07 | 1 | -6/+4 |
| |\ | |||||
| | * | Fix warning about redirect_url not set | Bart Visscher | 2012-12-07 | 1 | -1/+1 |
| | * | Make the redirect_url working again | Lukas Reschke | 2012-10-31 | 1 | -6/+4 |
* | | | merge master into filesystem | Robin Appelman | 2012-11-30 | 1 | -6/+15 |
|\| | | |||||
| * | | add function to safely end output buffering | Robin Appelman | 2012-11-29 | 1 | -3/+12 |
| * | | implement share via link token | Jörn Friedrich Dreyer | 2012-11-20 | 1 | -1/+1 |
* | | | Create public function initMountPoints() for initializing a specified user's ... | Michael Gapczynski | 2012-11-22 | 1 | -16/+0 |
* | | | Remove incorrect extra parameter for init() call | Michael Gapczynski | 2012-11-22 | 1 | -1/+1 |
* | | | merge master into filesystem | Robin Appelman | 2012-11-21 | 1 | -1/+1 |
|\| | | |||||
| * | | Fix typo in getUrlContent fix #514 | Brice Maron | 2012-11-19 | 1 | -1/+1 |
* | | | merge master into filesystem | Robin Appelman | 2012-11-18 | 1 | -0/+39 |
|\| | | |||||
| * | | Little case fix | Brice Maron | 2012-11-17 | 1 | -1/+1 |
| * | | Add User agent when OC does a request | Brice Maron | 2012-11-17 | 1 | -1/+1 |
| * | | Merge pull request #375 from tdevos/master | Thomas Müller | 2012-11-17 | 1 | -0/+39 |
| |\ \ | |||||
| | * | | Remove parentheses in return, modify description, and fix a mistake | thomas | 2012-11-15 | 1 | -3/+3 |
| | * | | change and transfert getUrlContent | thomas | 2012-11-14 | 1 | -0/+39 |
* | | | | merge master into filesystem | Robin Appelman | 2012-11-15 | 1 | -29/+53 |
|\| | | | |||||
| * | | | Bump version to trigger update. | Thomas Tanghus | 2012-11-13 | 1 | -1/+1 |
| * | | | Fixed new checkstyle issues in util.php from build #1341. | Diederik de Haas | 2012-11-10 | 1 | -2/+2 |
| * | | | add a check and a warning if the ownClodu server is not able to establish htt... | Frank Karlitschek | 2012-11-08 | 1 | -0/+27 |
| |/ / | |||||
* | | | merge master into filesystem | Robin Appelman | 2012-11-07 | 1 | -1/+1 |
|\| | | |||||
| * | | Checkstyle: Fix the last two SpaceBeforeOpenBrace | Felix Moeller | 2012-11-04 | 1 | -1/+1 |
| * | | Merge pull request #238 from fmms/checkstyle04 | Thomas Müller | 2012-11-04 | 1 | -19/+19 |
| |\ \ | |||||
| | * | | Checkstyle fixes: NoSpaceAfterComma | Felix Moeller | 2012-11-04 | 1 | -19/+19 |
| * | | | Merge pull request #178 from owncloud/JustOneCSRFTokenPerSession | Lukas Reschke | 2012-11-04 | 1 | -23/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Create only one CSRF token per session | Lukas Reschke | 2012-10-31 | 1 | -23/+6 |
| | |/ | |||||
| * / | Checkstyle: many fixes | Felix Moeller | 2012-11-02 | 1 | -3/+3 |
| |/ | |||||
* | | merge master into filesystem | Robin Appelman | 2012-10-30 | 1 | -53/+46 |
|\| | |||||
| * | Generate only one CSRF token | Lukas Reschke | 2012-10-29 | 1 | -31/+19 |
| * | Fix a typo | Lukas Reschke | 2012-10-29 | 1 | -1/+1 |
| * | NoSpaceAfterComma | Felix Moeller | 2012-10-28 | 1 | -26/+26 |
| * | check if RUNTIME_NOAPPS is set before using it | Arthur Schiwon | 2012-10-28 | 1 | -1/+1 |
| * | make sure all filesystem apps are loaded when setupFS is proceeded, to make s... | Arthur Schiwon | 2012-10-28 | 1 | -0/+5 |
| * | remove whitespaces, no code change | Arthur Schiwon | 2012-10-28 | 1 | -4/+4 |
* | | add file permissions cache | Robin Appelman | 2012-10-26 | 1 | -1/+1 |
* | | merge master into filesystem | Robin Appelman | 2012-10-26 | 1 | -6/+6 |
|\| | |||||
| * | possible fix for bombarding the server with the htaccess test during setup | Robin Appelman | 2012-10-26 | 1 | -16/+21 |