Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge master into filesystem | Robin Appelman | 2013-01-16 | 183 | -1516/+2341 |
|\ | |||||
| * | Merge pull request #1180 from owncloud/whitespace-cleanup | Bart Visscher | 2013-01-16 | 51 | -1058/+1056 |
| |\ | |||||
| | * | Whitespace cleanup | Bart Visscher | 2013-01-16 | 34 | -107/+105 |
| | * | Spaces to tabs | Bart Visscher | 2013-01-16 | 18 | -951/+951 |
| |/ | |||||
| * | Merge pull request #1185 from owncloud/fixing-1162-master | Jan-Christoph Borchardt | 2013-01-16 | 2 | -5/+19 |
| |\ | |||||
| | * | handling proper display of files/folders with negative size | Thomas Mueller | 2013-01-14 | 2 | -5/+19 |
| * | | Merge pull request #1192 from schiesbn/versioning_history_issue_1189 | Björn Schießle | 2013-01-16 | 1 | -2/+5 |
| |\ \ | |||||
| | * \ | Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into... | Björn Schießle | 2013-01-16 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * | | initialize | Björn Schießle | 2013-01-16 | 1 | -1/+2 |
| | * | | | initialize $versionCreated | Björn Schießle | 2013-01-16 | 1 | -1/+2 |
| | |/ / | |||||
| | * | | Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into... | Björn Schießle | 2013-01-15 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * | | fix for issue #1189, missing variables added | Björn Schießle | 2013-01-15 | 1 | -1/+3 |
| | * | | | fix for issue #1186, missing variables added | Björn Schießle | 2013-01-15 | 1 | -1/+3 |
| | |/ / | |||||
| * | | | Merge pull request #1195 from owncloud/cache_prepared | Thomas Müller | 2013-01-15 | 1 | -2/+14 |
| |\ \ \ | |||||
| | * | | | Clear cached prepared statements when switching between mdb2 and pdo | Robin Appelman | 2013-01-16 | 1 | -2/+4 |
| | * | | | Cache prepared statements in OC_DB | Robin Appelman | 2013-01-15 | 1 | -0/+10 |
| | |/ / | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-16 | 122 | -473/+1270 |
| * | | | Merge pull request #1178 from owncloud/return_true_because_of_ponies | Thomas Müller | 2013-01-15 | 2 | -8/+1 |
| |\ \ \ | |||||
| | * | | | Remove uneeded returns | Lukas Reschke | 2013-01-14 | 2 | -5/+1 |
| | * | | | Remove uneeded return | Lukas Reschke | 2013-01-14 | 1 | -3/+0 |
| * | | | | Fix regression caused by 31b1a73e1f508a33843835b632ee05c7bfc2aaaf | Daniel Molkentin | 2013-01-15 | 1 | -1/+3 |
| * | | | | Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master | Bart Visscher | 2013-01-15 | 18 | -34/+30 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | remove php closing tag | Thomas Mueller | 2013-01-14 | 3 | -3/+1 |
| | * | | | Merge branch 'master' into fixing-unused-and-undefined-in-master | Thomas Mueller | 2013-01-14 | 469 | -8058/+10445 |
| | |\ \ \ | |||||
| | * | | | | fixing <input> tag | Thomas Mueller | 2013-01-07 | 3 | -6/+6 |
| | * | | | | fixing returns | Thomas Mueller | 2013-01-06 | 2 | -8/+8 |
| | * | | | | fixing returns | Thomas Mueller | 2013-01-06 | 1 | -4/+3 |
| | * | | | | add missing return | Thomas Mueller | 2013-01-06 | 1 | -1/+2 |
| | * | | | | remove silly assignment | Thomas Mueller | 2013-01-06 | 1 | -1/+0 |
| | * | | | | fixing undefined variable $where | Thomas Mueller | 2013-01-06 | 1 | -1/+1 |
| | * | | | | fixing undefined variable $result - should be $query I assume | Thomas Mueller | 2013-01-06 | 1 | -1/+1 |
| | * | | | | initialize $result | Thomas Mueller | 2013-01-06 | 1 | -1/+1 |
| | * | | | | fixing undefined $eventSource | Thomas Mueller | 2013-01-06 | 1 | -1/+2 |
| | * | | | | fixing call of OC_Log::write() - missing parameter | Thomas Mueller | 2013-01-06 | 1 | -1/+1 |
| | * | | | | removing unused parameter $parameters | Thomas Mueller | 2013-01-06 | 1 | -2/+2 |
| | * | | | | removing undefined $response | Thomas Mueller | 2013-01-06 | 1 | -4/+2 |
* | | | | | | Cache: more efficient upgrading | Robin Appelman | 2013-01-15 | 3 | -10/+26 |
* | | | | | | Cache: show upgrade progress | Robin Appelman | 2013-01-15 | 8 | -80/+302 |
* | | | | | | merge master into filesystem | Robin Appelman | 2013-01-15 | 660 | -9136/+8580 |
|\| | | | | | |||||
| * | | | | | Merge pull request #1087 from owncloud/ldap_multiple_dns | blizzz | 2013-01-15 | 4 | -45/+105 |
| |\ \ \ \ \ | |||||
| | * | | | | | dechex not necessary, do not waste time with it | Arthur Schiwon | 2013-01-08 | 1 | -1/+1 |
| | * | | | | | Code style | Arthur Schiwon | 2013-01-08 | 1 | -6/+10 |
| | * | | | | | support LDAP search using multiple base DNs also with paged results, implemen... | Arthur Schiwon | 2013-01-04 | 1 | -33/+50 |
| | * | | | | | support multiple base DNs | Arthur Schiwon | 2013-01-03 | 1 | -5/+42 |
| | * | | | | | Base DNs will be used as array, now, to support usage of multiple DNs | Arthur Schiwon | 2013-01-03 | 1 | -3/+3 |
| | * | | | | | Switch to textarea to enable configuration of multiple DNs | Arthur Schiwon | 2013-01-03 | 2 | -4/+6 |
| | * | | | | | LDAP: fix spelling | Arthur Schiwon | 2013-01-03 | 1 | -1/+1 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-15 | 328 | -2930/+1168 |
| | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #1182 from owncloud/sanitizeHTML-Clean | Lukas Reschke | 2013-01-14 | 1 | -2/+5 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Move { to same line | Lukas Reschke | 2013-01-14 | 1 | -2/+1 |