summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2013-01-16183-1516/+2341
|\
| * Merge pull request #1180 from owncloud/whitespace-cleanupBart Visscher2013-01-1651-1058/+1056
| |\
| | * Whitespace cleanupBart Visscher2013-01-1634-107/+105
| | * Spaces to tabsBart Visscher2013-01-1618-951/+951
| |/
| * Merge pull request #1185 from owncloud/fixing-1162-masterJan-Christoph Borchardt2013-01-162-5/+19
| |\
| | * handling proper display of files/folders with negative sizeThomas Mueller2013-01-142-5/+19
| * | Merge pull request #1192 from schiesbn/versioning_history_issue_1189Björn Schießle2013-01-161-2/+5
| |\ \
| | * \ Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into...Björn Schießle2013-01-160-0/+0
| | |\ \
| | | * | initializeBjörn Schießle2013-01-161-1/+2
| | * | | initialize $versionCreatedBjörn Schießle2013-01-161-1/+2
| | |/ /
| | * | Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into...Björn Schießle2013-01-150-0/+0
| | |\ \
| | | * | fix for issue #1189, missing variables addedBjörn Schießle2013-01-151-1/+3
| | * | | fix for issue #1186, missing variables addedBjörn Schießle2013-01-151-1/+3
| | |/ /
| * | | Merge pull request #1195 from owncloud/cache_preparedThomas Müller2013-01-151-2/+14
| |\ \ \
| | * | | Clear cached prepared statements when switching between mdb2 and pdoRobin Appelman2013-01-161-2/+4
| | * | | Cache prepared statements in OC_DBRobin Appelman2013-01-151-0/+10
| | |/ /
| * | | [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
* | | | | | Cache: more efficient upgradingRobin Appelman2013-01-153-10/+26
* | | | | | Cache: show upgrade progressRobin Appelman2013-01-158-80/+302
* | | | | | merge master into filesystemRobin Appelman2013-01-15660-9136/+8580
|\| | | | |
| * | | | | 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