summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-16122-473/+1270
* Merge pull request #1178 from owncloud/return_true_because_of_poniesThomas Müller2013-01-152-8/+1
|\
| * Remove uneeded returnsLukas Reschke2013-01-142-5/+1
| * Remove uneeded returnLukas Reschke2013-01-141-3/+0
* | Fix regression caused by 31b1a73e1f508a33843835b632ee05c7bfc2aaafDaniel Molkentin2013-01-151-1/+3
* | Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-masterBart Visscher2013-01-1518-34/+30
|\ \
| * | remove php closing tagThomas Mueller2013-01-143-3/+1
| * | Merge branch 'master' into fixing-unused-and-undefined-in-masterThomas Mueller2013-01-14469-8058/+10445
| |\ \
| * | | fixing <input> tagThomas Mueller2013-01-073-6/+6
| * | | fixing returnsThomas Mueller2013-01-062-8/+8
| * | | fixing returnsThomas Mueller2013-01-061-4/+3
| * | | add missing returnThomas Mueller2013-01-061-1/+2
| * | | remove silly assignmentThomas Mueller2013-01-061-1/+0
| * | | fixing undefined variable $whereThomas Mueller2013-01-061-1/+1
| * | | fixing undefined variable $result - should be $query I assumeThomas Mueller2013-01-061-1/+1
| * | | initialize $resultThomas Mueller2013-01-061-1/+1
| * | | fixing undefined $eventSourceThomas Mueller2013-01-061-1/+2
| * | | fixing call of OC_Log::write() - missing parameterThomas Mueller2013-01-061-1/+1
| * | | removing unused parameter $parametersThomas Mueller2013-01-061-2/+2
| * | | removing undefined $responseThomas Mueller2013-01-061-4/+2
* | | | Merge pull request #1087 from owncloud/ldap_multiple_dnsblizzz2013-01-154-45/+105
|\ \ \ \
| * | | | dechex not necessary, do not waste time with itArthur Schiwon2013-01-081-1/+1
| * | | | Code styleArthur Schiwon2013-01-081-6/+10
| * | | | support LDAP search using multiple base DNs also with paged results, implemen...Arthur Schiwon2013-01-041-33/+50
| * | | | support multiple base DNsArthur Schiwon2013-01-031-5/+42
| * | | | Base DNs will be used as array, now, to support usage of multiple DNsArthur Schiwon2013-01-031-3/+3
| * | | | Switch to textarea to enable configuration of multiple DNsArthur Schiwon2013-01-032-4/+6
| * | | | LDAP: fix spellingArthur Schiwon2013-01-031-1/+1
* | | | | [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