Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 85 | -5419/+3048 |
|\ | |||||
| * | Merge pull request #4213 from owncloud/scanning-performance | icewind1991 | 2013-07-29 | 1 | -3/+4 |
| |\ | |||||
| | * | better variable naming | Robin Appelman | 2013-07-29 | 1 | -3/+3 |
| | * | Cache: don't check if the parent exists in the cache if we are already sure i... | Robin Appelman | 2013-07-27 | 1 | -3/+4 |
| * | | Merge pull request #4216 from owncloud/clean_php55_opcache | Thomas Müller | 2013-07-29 | 1 | -0/+4 |
| |\ \ | |||||
| | * | | Also clean PHP 5.5 opcache | kondou | 2013-07-28 | 1 | -0/+4 |
| * | | | Move check so the variable will never be undefined | Michael Gapczynski | 2013-07-28 | 1 | -3/+3 |
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-28 | 3 | -0/+11 |
| |/ / | |||||
| * / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-07-27 | 13 | -0/+49 |
| |/ | |||||
| * | functions in OCP should be static | Robin Appelman | 2013-07-25 | 1 | -1/+1 |
| * | Merge pull request #3887 from owncloud/apc_user_cache | Andreas Fischer | 2013-07-25 | 2 | -1/+31 |
| |\ | |||||
| | * | Add ACPu memory cache | Bart Visscher | 2013-07-24 | 2 | -1/+31 |
| * | | Merge pull request #4183 from owncloud/fix-group-id | icewind1991 | 2013-07-24 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix group id naming fid->gid | Bart Visscher | 2013-07-24 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #3898 from owncloud/sabre-objecttree | icewind1991 | 2013-07-24 | 2 | -1/+102 |
| |\ \ | |||||
| | * | | Merge branch 'master' into sabre-objecttree | Robin Appelman | 2013-07-24 | 136 | -5573/+3463 |
| | |\| | |||||
| | * | | style fix | Robin Appelman | 2013-07-19 | 1 | -1/+1 |
| | * | | improved copy operation for objecttree | Robin Appelman | 2013-06-30 | 1 | -0/+29 |
| | * | | improved move operation for sabre's objecttree | Robin Appelman | 2013-06-30 | 1 | -0/+24 |
| | * | | make use of the fact that rmdir is already recursive | Robin Appelman | 2013-06-30 | 1 | -1/+0 |
| | * | | overwrite Sabre_DAV_ObjectTree with a faster getNodeForPath | Robin Appelman | 2013-06-30 | 1 | -0/+49 |
| * | | | merge master | Jan-Christoph Borchardt | 2013-07-24 | 17 | -529/+1036 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge pull request #4177 from owncloud/move_defaults_to_template_constructor | Björn Schießle | 2013-07-24 | 2 | -2/+6 |
| | |\ \ | |||||
| | | * | | initialize OC_Defaults in template constructorX | Björn Schießle | 2013-07-24 | 2 | -2/+6 |
| | * | | | Merge pull request #3995 from owncloud/groups | icewind1991 | 2013-07-24 | 6 | -130/+511 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Merge branch 'master' into groups | Thomas Müller | 2013-07-24 | 8 | -390/+502 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' into groups | Robin Appelman | 2013-07-23 | 58 | -4887/+1866 |
| | | |\ \ \ | |||||
| | | * | | | | group: only pass backends that hold that specific group to the group constructor | Robin Appelman | 2013-07-18 | 2 | -2/+8 |
| | | * | | | | reneme id to gid | Robin Appelman | 2013-07-10 | 1 | -15/+15 |
| | | * | | | | more consistent naming | Robin Appelman | 2013-07-10 | 2 | -6/+6 |
| | | * | | | | consistent naming | Robin Appelman | 2013-07-10 | 1 | -6/+6 |
| | | * | | | | search parameter is not optional | Robin Appelman | 2013-07-10 | 1 | -2/+2 |
| | | * | | | | more consitency in hook names | Robin Appelman | 2013-07-10 | 2 | -9/+9 |
| | | * | | | | cant use private members from closure in php <5.4 | Robin Appelman | 2013-07-10 | 1 | -3/+3 |
| | | * | | | | use new group api as backend for the old api | Robin Appelman | 2013-07-10 | 1 | -127/+98 |
| | | * | | | | update group management | Robin Appelman | 2013-07-10 | 5 | -3/+407 |
| | * | | | | | Merge pull request #4171 from owncloud/fix-config | Morris Jobke | 2013-07-24 | 1 | -5/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | ignore config read failures | Bart Visscher | 2013-07-23 | 1 | -1/+2 |
| | | * | | | | | Revert "fix failing master branch - Test_Config::testWriteData" | Bart Visscher | 2013-07-23 | 1 | -5/+1 |
| | * | | | | | | Merge branch 'master' into more-themable-strings | Thomas Müller | 2013-07-24 | 59 | -5257/+2246 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | Merge pull request #4090 from owncloud/cleanup-some-template-functions | Thomas Müller | 2013-07-23 | 8 | -390/+502 |
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | | * | | | | Change to use !== and === | Bart Visscher | 2013-07-21 | 2 | -6/+6 |
| | | | * | | | | fixing typos, PHPDoc and missing namespace \ | Thomas Müller | 2013-07-21 | 4 | -10/+11 |
| | | | * | | | | Move basic template functions to their own class | Bart Visscher | 2013-07-21 | 3 | -165/+205 |
| | | | * | | | | Move template functions to there own file | Bart Visscher | 2013-07-21 | 2 | -112/+121 |
| | | | * | | | | Split locating JS and CSS files to their own class | Bart Visscher | 2013-07-21 | 4 | -104/+166 |
| | | * | | | | | Merge pull request #3392 from owncloud/googledrive | Bart Visscher | 2013-07-23 | 1 | -2/+5 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch 'master' into googledrive | Thomas Müller | 2013-07-12 | 138 | -2412/+4777 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-30 | 19 | -73/+325 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' into googledrive | Michael Gapczynski | 2013-05-27 | 58 | -117/+578 |
| | | | |\ \ \ \ \ \ \ |