Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-14 | 30 | -70/+128 |
* | Merge pull request #14206 from owncloud/issue/14204-revert-14171 | Thomas Müller | 2015-02-13 | 2 | -17/+1 |
|\ | |||||
| * | Update version to a higher one then before | Joas Schilling | 2015-02-13 | 1 | -1/+1 |
| * | Revert "Improve: Index for file_map" | Joas Schilling | 2015-02-13 | 1 | -18/+0 |
| * | Revert "Incorporate review changes" | Joas Schilling | 2015-02-13 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #14178 from RealRancor/fix_config_sample | Morris Jobke | 2015-02-13 | 1 | -1/+1 |
|\ | |||||
| * | Removed anchor in config.sample.php | RealRancor | 2015-02-12 | 1 | -1/+1 |
* | | Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-alway... | Lukas Reschke | 2015-02-13 | 2 | -1/+10 |
|\ \ | |||||
| * | | Ensure that passed argument is always a string | Lukas Reschke | 2015-02-13 | 2 | -1/+10 |
* | | | Merge pull request #14086 from hlop/master | Lukas Reschke | 2015-02-13 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | App install behind a Proxy | Witali Rott | 2015-02-11 | 1 | -1/+1 |
* | | | Merge pull request #14171 from owncloud/fix/11639 | Joas Schilling | 2015-02-13 | 2 | -1/+17 |
|\ \ \ | |||||
| * | | | Incorporate review changes | Lukas Reschke | 2015-02-12 | 2 | -3/+1 |
| * | | | Improve: Index for file_map | windaishi | 2015-02-12 | 1 | -0/+18 |
| | |/ | |/| | |||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-13 | 98 | -148/+22 |
|/ / | |||||
* | | Merge pull request #13771 from owncloud/fix-humanfileSize | Lukas Reschke | 2015-02-12 | 2 | -1/+3 |
|\ \ | |||||
| * | | generate valid human readable text for 0 - fixed #9342 | Thomas Müller | 2015-01-29 | 2 | -1/+3 |
* | | | Merge pull request #13780 from owncloud/cmreflector-inheritance | Lukas Reschke | 2015-02-12 | 1 | -2/+58 |
|\ \ \ | |||||
| * | | | another test for overriding the docblock | Bernhard Posselt | 2015-01-29 | 1 | -0/+14 |
| * | | | additional inheritance tests | Bernhard Posselt | 2015-01-29 | 1 | -2/+44 |
* | | | | Merge pull request #14145 from owncloud/no-whitespace-from-themes-master | Lukas Reschke | 2015-02-12 | 2 | -11/+13 |
|\ \ \ \ | |||||
| * | | | | catch any whitespaces which might get written to the output buffer while load... | Thomas Müller | 2015-02-12 | 2 | -11/+13 |
* | | | | | Merge pull request #14159 from owncloud/remove-internal | Thomas Müller | 2015-02-12 | 1 | -5/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Remove internal annotation | Lukas Reschke | 2015-02-12 | 1 | -5/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #14121 from Zillode/app-favicon | Morris Jobke | 2015-02-12 | 2 | -4/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Disable application-specific favicons for non-user pages | Lode Hoste | 2015-02-11 | 2 | -4/+4 |
* | | | | | | Merge pull request #9038 from owncloud/add_tag_file | Lukas Reschke | 2015-02-12 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add .tag file to make tar balls tracable | Daniel Molkentin | 2014-06-14 | 1 | -0/+1 |
* | | | | | | | Merge pull request #14071 from owncloud/add_timeout_for_post_requests | Björn Schießle | 2015-02-12 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add timeout to curl request | Bjoern Schiessle | 2015-02-12 | 1 | -1/+2 |
* | | | | | | | | Merge pull request #13913 from rullzer/showusergroups | Lukas Reschke | 2015-02-12 | 2 | -0/+14 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Added overview of groups a user is a member of | Roeland Jago Douma | 2015-02-12 | 2 | -0/+14 |
* | | | | | | | | Merge pull request #14135 from cmeh/master | Morris Jobke | 2015-02-12 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Orthography: "Back-end" -> Backend (without hyphen) and correction of "users"... | cmeh | 2015-02-12 | 1 | -1/+1 |
| * | | | | | | | | Adding a missing space between value and unit | cmeh | 2015-02-12 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #10993 from owncloud/scanner-reuse-fileid | Morris Jobke | 2015-02-12 | 2 | -73/+124 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | only read permissions once | Robin Appelman | 2015-02-11 | 1 | -2/+3 |
| * | | | | | | | | | Only try to scan the children of directories | Robin Appelman | 2015-02-11 | 1 | -3/+3 |
| * | | | | | | | | | Cast mtimes and size to int | Robin Appelman | 2015-02-11 | 1 | -0/+3 |
| * | | | | | | | | | Reuse cache data of existing files during scan | Robin Appelman | 2015-02-11 | 1 | -69/+116 |
* | | | | | | | | | | Merge pull request #14129 from owncloud/deprecate-oc-json | Morris Jobke | 2015-02-12 | 2 | -122/+139 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Deprecate `OC_JSON` and `OCP\JSON` | Lukas Reschke | 2015-02-12 | 2 | -122/+139 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||||
* / | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-12 | 66 | -70/+176 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #14126 from owncloud/remove-that-old-thing | Lukas Reschke | 2015-02-11 | 1 | -54/+0 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Remove unused file | Lukas Reschke | 2015-02-11 | 1 | -54/+0 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #14097 from yanntech/fix/utf8-check | Thomas Müller | 2015-02-11 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | in some case charset can be in lower case. | Yann VERRY | 2015-02-11 | 1 | -1/+3 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-p... | Vincent Petry | 2015-02-11 | 2 | -5/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add a test for the post_shared hook shareType | Joas Schilling | 2015-02-09 | 1 | -0/+11 |
| * | | | | | | | | Do not overwrite the shareType so the post hook is still correct | Joas Schilling | 2015-02-09 | 1 | -5/+5 |