Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | updating php docs | Thomas Müller | 2013-09-18 | 1 | -1/+1 |
* | Merge branch 'appframework-master' into public_cache | Thomas Tanghus | 2013-09-18 | 1 | -5/+0 |
|\ | |||||
| * | Still some session leftovers. | Thomas Tanghus | 2013-09-17 | 1 | -5/+0 |
* | | OC_Cache namespace changes and add UserCache to server container. | Thomas Tanghus | 2013-09-17 | 2 | -14/+84 |
|/ | |||||
* | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-17 | 4 | -10/+215 |
|\ | |||||
| * | Merge pull request #4825 from owncloud/fix-sharing-expiration-oracle | Bart Visscher | 2013-09-16 | 4 | -10/+215 |
| |\ | |||||
| | * | Calculate dateInPast and dateInFuture. | Andreas Fischer | 2013-09-12 | 1 | -5/+8 |
| | * | Compare objects directly. Also use $expected and $actual. | Andreas Fischer | 2013-09-12 | 1 | -6/+6 |
| | * | Add database tests for INSERT/SELECT date format. | Andreas Fischer | 2013-09-12 | 3 | -0/+80 |
| | * | Add comment explaining how $dateInFuture was picked. | Andreas Fischer | 2013-09-12 | 1 | -0/+2 |
| | * | Coding style: { for methods start are supposed to be on the same line. | Andreas Fischer | 2013-09-12 | 1 | -12/+6 |
| | * | Expiration tests for sharing with groups. | Andreas Fischer | 2013-09-12 | 1 | -6/+76 |
| | * | Do not repeat shareUserOneTestFileWithUserTwo() code. | Andreas Fischer | 2013-09-12 | 1 | -25/+22 |
| | * | Make dates test class properties. | Andreas Fischer | 2013-09-12 | 1 | -2/+5 |
| | * | Try to make Oracle happy by also specifying seconds. | Andreas Fischer | 2013-09-12 | 1 | -2/+2 |
| | * | Test whether a still-valid user share is still accessible. | Andreas Fischer | 2013-09-12 | 1 | -11/+34 |
| | * | Test whether an expired user share is still accessible. | Andreas Fischer | 2013-09-12 | 1 | -0/+33 |
* | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-15 | 2 | -0/+26 |
|\| | | |||||
| * | | Merge pull request #4506 from owncloud/oc_avatars | Bernhard Posselt | 2013-09-14 | 2 | -0/+26 |
| |\ \ | |||||
| | * | | Merge branch 'master' into oc_avatars | kondou | 2013-09-12 | 1 | -1/+30 |
| | |\| | |||||
| | * | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatars | kondou | 2013-09-09 | 1 | -6/+6 |
| | * | | Merge branch 'master' into oc_avatars | kondou | 2013-09-04 | 3 | -4/+4 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into oc_avatars | kondou | 2013-09-01 | 1 | -9/+27 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into oc_avatars | kondou | 2013-08-31 | 1 | -0/+108 |
| | |\ \ \ \ | |||||
| | * | | | | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitests | kondou | 2013-08-30 | 1 | -0/+2 |
| | * | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 3 | -5/+238 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Continue work on cropper | kondou | 2013-08-28 | 1 | -5/+7 |
| | * | | | | | | Fix avatar-unittest | kondou | 2013-08-25 | 1 | -2/+2 |
| | * | | | | | | Fix spacing, have remove() and return JSON for custom-default-avatars | kondou | 2013-08-25 | 1 | -11/+3 |
| | * | | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even... | kondou | 2013-08-25 | 1 | -33/+5 |
| | * | | | | | | Fix testDefaultAvatar | kondou | 2013-08-25 | 1 | -1/+1 |
| | * | | | | | | Have /avatar.php as a central avatar-point | kondou | 2013-08-25 | 1 | -10/+7 |
| | * | | | | | | Improve styling & enable avatar-upload at personal page | kondou | 2013-08-25 | 1 | -1/+1 |
| | * | | | | | | Add unittests & check filetype in setLocalAvatar() | kondou | 2013-08-25 | 2 | -0/+61 |
* | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-13 | 5 | -0/+1701 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #4712 from owncloud/fileapi-foreward | Thomas Müller | 2013-09-13 | 5 | -0/+1701 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | - giving the user a new id for each test run in order to prevent reuse of e.g... | Thomas Müller | 2013-09-13 | 1 | -1/+2 |
| | * | | | | | | | Merge branch 'master' into fileapi-foreward | Robin Appelman | 2013-09-12 | 5 | -14/+61 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | adjust test cases to namespace changes | Robin Appelman | 2013-09-10 | 5 | -26/+26 |
| | * | | | | | | | Provide an implementation of the fileapi for oc6 build on top of the old api | Robin Appelman | 2013-09-01 | 5 | -0/+1700 |
| | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-13 | 7 | -44/+201 |
|\| | | | | | | | |||||
| * | | | | | | | adding TB and GB to OC_Helper::humanFileSize | Thomas Müller | 2013-09-13 | 1 | -30/+32 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #4477 from owncloud/hooks-view | Bernhard Posselt | 2013-09-04 | 1 | -1/+30 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | test case for hooks send from a non-default view | Robin Appelman | 2013-08-29 | 1 | -1/+30 |
| * | | | | | | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 5 | -14/+373 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Check for $this->fileInfo and @depend on testData() | kondou | 2013-09-01 | 1 | -0/+3 |
| | * | | | | | Merge branch 'master' into fix_4258 | kondou | 2013-08-31 | 1 | -0/+108 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-29 | 3 | -5/+238 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | * | | | | Merge branch 'master' into oc_preview | Georg Ehrke | 2013-08-23 | 3 | -2/+141 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | * | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-19 | 4 | -4/+4 |
| | | |\ \ \ \ |