Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Disable fancy folder sharing for now | Michael Gapczynski | 2013-01-18 | 1 | -28/+28 |
* | Fix merge | Michael Gapczynski | 2013-01-18 | 1 | -4/+4 |
* | Cache: use a database transition for scanning each folder | Robin Appelman | 2013-01-16 | 1 | -3/+19 |
* | Cache: no longer using this file | Robin Appelman | 2013-01-16 | 1 | -61/+0 |
* | Cache: dont migrate permissions, cache them on demain instead | Robin Appelman | 2013-01-16 | 1 | -17/+0 |
* | merge master into filesystem | Robin Appelman | 2013-01-16 | 37 | -781/+806 |
|\ | |||||
| * | Whitespace cleanup | Bart Visscher | 2013-01-16 | 26 | -80/+78 |
| * | Spaces to tabs | Bart Visscher | 2013-01-16 | 6 | -696/+696 |
| * | 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 #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 |
| * | | | 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 |
| * | | | | Merge branch 'master' into fixing-unused-and-undefined-in-master | Thomas Mueller | 2013-01-14 | 17 | -393/+661 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | 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 |
| * | | | | 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 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 |
* | | | | | Cache: more efficient upgrading | Robin Appelman | 2013-01-15 | 2 | -10/+24 |
* | | | | | Cache: show upgrade progress | Robin Appelman | 2013-01-15 | 2 | -41/+187 |
* | | | | | merge master into filesystem | Robin Appelman | 2013-01-15 | 16 | -297/+177 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Move { to same line | Lukas Reschke | 2013-01-14 | 1 | -2/+1 |
| * | | | | Expand if to multiple lines | Lukas Reschke | 2013-01-14 | 1 | -2/+6 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #1177 from owncloud/OC_User--isAdminUser() | Bart Visscher | 2013-01-14 | 8 | -72/+29 |
| |\ \ \ | |||||
| | * | | | Enhanced auth is totally unmaintained and broken | Lukas Reschke | 2013-01-14 | 2 | -47/+0 |
| | * | | | Check if user is admin - bool | Lukas Reschke | 2013-01-14 | 8 | -25/+29 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1172 from owncloud/isSubDirectory | Bart Visscher | 2013-01-14 | 1 | -24/+4 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Check for string position instead of string existence | Lukas Reschke | 2013-01-14 | 1 | -1/+1 |
| | * | | Commentblocks should begin with two * | Lukas Reschke | 2013-01-13 | 1 | -1/+1 |
| | * | | Add @brief to description | Lukas Reschke | 2013-01-13 | 1 | -1/+1 |
| | * | | Simplify the isSubDirectory() function | Lukas Reschke | 2013-01-13 | 1 | -22/+2 |
| * | | | Merge pull request #1112 from Raydiation/master | Bart Visscher | 2013-01-14 | 1 | -17/+5 |
| |\ \ \ | |||||
| | * | | | added cleanup recommendations by including ocs in the cachedKey method and mo... | Bernhard Posselt | 2013-01-07 | 1 | -5/+5 |
| | * | | | readded ocs routes | Bernhard Posselt | 2013-01-07 | 1 | -0/+5 |
| | * | | | fixed error that displayed a white page and a warning that routes could not b... | Bernhard Posselt | 2013-01-07 | 1 | -17/+0 |
| | | |/ | | |/| | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-14 | 1 | -1/+7 |
| | |/ | |/| | |||||
| * | | Merge pull request #1133 from owncloud/add_linebreaks_in_sharing | Thomas Müller | 2013-01-10 | 1 | -96/+484 |
| |\ \ | |||||
| | * | | add more linebreaks, replace SQL LIMIT with param | Jörn Friedrich Dreyer | 2013-01-09 | 1 | -96/+484 |
| | |/ | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-11 | 1 | -6/+17 |
| * | | Merge pull request #1127 from owncloud/fixing-641-for-webdav-master | Thomas Müller | 2013-01-10 | 2 | -0/+78 |
| |\ \ | |||||
| | * | | webdav returns "503 Service Unavailable" in case the ownCloud server is curre... | Thomas Mueller | 2013-01-09 | 2 | -0/+78 |
| | |/ | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-01-10 | 1 | -2/+32 |
| * | | Upstream merged my patch to add additional ssl root certificates to the webda... | Björn Schießle | 2013-01-08 | 1 | -173/+0 |
| |/ |