summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-15328-2930/+1168
* Merge pull request #1182 from owncloud/sanitizeHTML-CleanLukas Reschke2013-01-141-2/+5
|\
| * Move { to same lineLukas Reschke2013-01-141-2/+1
| * Expand if to multiple linesLukas Reschke2013-01-141-2/+6
|/
* Merge pull request #1177 from owncloud/OC_User--isAdminUser()Bart Visscher2013-01-1419-113/+38
|\
| * Enhanced auth is totally unmaintained and brokenLukas Reschke2013-01-146-76/+0
| * Add a closing )Lukas Reschke2013-01-141-1/+1
| * CP failLukas Reschke2013-01-141-1/+1
| * Check if user is admin - boolLukas Reschke2013-01-1416-37/+38
* | Merge pull request #1172 from owncloud/isSubDirectoryBart Visscher2013-01-141-24/+4
|\ \
| * | Check for string position instead of string existenceLukas Reschke2013-01-141-1/+1
| * | Commentblocks should begin with two *Lukas Reschke2013-01-131-1/+1
| * | Add @brief to descriptionLukas Reschke2013-01-131-1/+1
| * | Simplify the isSubDirectory() functionLukas Reschke2013-01-131-22/+2
* | | Merge pull request #1169 from owncloud/webdav_L10nBart Visscher2013-01-141-2/+2
|\ \ \
| * | | The => ThisLukas Reschke2013-01-131-1/+1
| * | | Improved the help textLukas Reschke2013-01-131-1/+1
| * | | legend - l10nLukas Reschke2013-01-131-1/+1
| |/ /
* | | Merge pull request #1135 from owncloud/allow_default_click_behaviourLukas Reschke2013-01-141-1/+2
|\ \ \ | |_|/ |/| |
| * | allow default click behaviourJörn Friedrich Dreyer2013-01-091-1/+2
* | | Merge pull request #1112 from Raydiation/masterBart Visscher2013-01-141-17/+5
|\ \ \
| * | | added cleanup recommendations by including ocs in the cachedKey method and mo...Bernhard Posselt2013-01-071-5/+5
| * | | readded ocs routesBernhard Posselt2013-01-071-0/+5
| * | | fixed error that displayed a white page and a warning that routes could not b...Bernhard Posselt2013-01-071-17/+0
* | | | Revert "fix c&p error"Daniel Molkentin2013-01-141-3/+3
* | | | fix c&p errorDaniel Molkentin2013-01-141-3/+3
* | | | Merge pull request #1170 from owncloud/correctIndentionThomas Müller2013-01-142-78/+78
|\ \ \ \
| * | | | Remove ugly indentationLukas Reschke2013-01-132-78/+78
* | | | | Merge branch 'master' of github.com:owncloud/coreBjörn Schießle2013-01-14429-5960/+7494
|\ \ \ \ \
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1416-45/+59
| | |_|_|/ | |/| | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1320-53/+81
| * | | | Correct the linkLukas Reschke2013-01-121-1/+1
| * | | | Merge pull request #1160 from owncloud/updateContribLukas Reschke2013-01-122-4/+55
| |\ \ \ \
| | * | | | Updated browser logLukas Reschke2013-01-121-4/+5
| | * | | | Adding database to server configThomas Müller2013-01-121-1/+5
| | * | | | TyposLukas Reschke2013-01-111-2/+2
| | * | | | Add server operating system to templateLukas Reschke2013-01-111-1/+1
| | * | | | Add the correct link to the apps repositoryLukas Reschke2013-01-111-1/+1
| | * | | | Add a space behind the ####Lukas Reschke2013-01-111-4/+4
| | * | | | Uneeded newlineLukas Reschke2013-01-111-2/+0
| | * | | | Remove :Lukas Reschke2013-01-111-4/+4
| | * | | | Add ownCloud versionLukas Reschke2013-01-111-0/+2
| | * | | | Add templateLukas Reschke2013-01-111-4/+3
| | * | | | Create issue_template.mdLukas Reschke2013-01-111-0/+41
| | * | | | Fix a typoLukas Reschke2013-01-111-1/+1
| | * | | | Update CONTRIBUTING.mdLukas Reschke2013-01-111-5/+11
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-12263-2111/+1537
| * | | | | Merge pull request #1157 owncloud/move-OpenIDBart Visscher2013-01-112-20/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Remove OpenID from the routerLukas Reschke2013-01-111-5/+1
| | * | | | Move to apps repoLukas Reschke2013-01-111-16/+0