summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-01-1876-215/+288
|
* Merge pull request #1148 from seancomeau/topic/setupFrank Karlitschek2013-01-161-5/+35
|\ | | | | Fix issue #108
| * Rename TestException to DatabaseSetupExceptionSean Comeau2013-01-141-5/+5
| |
| * Use a custom exception instead of adding a delimiter to the error messageSean Comeau2013-01-141-8/+31
| |
| * Throw an exception when creating a MySQL user fails and display exception ↵Sean Comeau2013-01-101-3/+10
| | | | | | | | error text to user
* | [tx-robot] updated from transifexJenkins for ownCloud2013-01-1791-1695/+1975
| |
* | Merge pull request #1204 from Raydiation/masterBart Visscher2013-01-163-10/+8
|\ \ | | | | | | Dont resize content div with javascript but use css box-sizing to do it
| * | dont show horizontal scrollbarBernhard Posselt2013-01-161-1/+1
| | |
| * | dont resize content div with javascript but use css box-sizing to do itBernhard Posselt2013-01-163-10/+8
|/ /
* | Merge pull request #1180 from owncloud/whitespace-cleanupBart Visscher2013-01-1651-1058/+1056
|\ \ | | | | | | Whitespace cleanup
| * | 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 size
| * | handling proper display of files/folders with negative sizeThomas Mueller2013-01-142-5/+19
| | | | | | | | | | | | refs #1162
* | | Merge pull request #1192 from schiesbn/versioning_history_issue_1189Björn Schießle2013-01-161-2/+5
|\ \ \ | | | | | | | | fix for issue #1186, missing variables added
| * \ \ Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core ↵Björn Schießle2013-01-160-0/+0
| |\ \ \ | | | | | | | | | | | | | | | into versioning_history_issue_1189
| | * | | 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 ↵Björn Schießle2013-01-150-0/+0
| |\ \ \ | | | | | | | | | | | | | | | into versioning_history_issue_1189
| | * | | 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
|\ \ \ \ | | | | | | | | | | Cache prepared statements in OC_DB
| * | | | 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 return
| * | | | Remove uneeded returnsLukas Reschke2013-01-142-5/+1
| | | | |
| * | | | Remove uneeded returnLukas Reschke2013-01-141-3/+0
| | | | | | | | | | | | | | | Thx @Raydiation
* | | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | Fixing unused and undefined in master
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | fixing undefined variable $useDir
| * | | | | removing undefined $responseThomas Mueller2013-01-061-4/+2
| | | | | |
* | | | | | Merge pull request #1087 from owncloud/ldap_multiple_dnsblizzz2013-01-154-45/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | LDAP: ability to configure more than one base DN
| * | | | | | 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, ↵Arthur Schiwon2013-01-041-33/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | implements #395
| * | | | | | 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
| | | | | | |