Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | 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 | |
| | | |\ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge master into oc_preview | Georg Ehrke | 2013-08-14 | 9 | -2/+330 | |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | ||||||
| | | * | | | | | | fix merge conflicts | Georg Ehrke | 2013-08-05 | 9 | -9/+423 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ | Merge branch 'master' into oc_preview | Thomas Müller | 2013-07-30 | 18 | -168/+1140 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | remove debug code ... | Georg Ehrke | 2013-07-11 | 1 | -4/+1 | |
| | | * | | | | | | | | it's setValue not getValue, damn type | Georg Ehrke | 2013-07-11 | 1 | -3/+6 | |
| | | * | | | | | | | | merge conflicts ... | Georg Ehrke | 2013-07-10 | 17 | -84/+418 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | add unit tests for preview lib to make @DeepDiver1975 happy | Georg Ehrke | 2013-06-26 | 1 | -0/+108 | |
| | * | | | | | | | | | | Fix #4258, clean up \OC_Image and improve its unittest | kondou | 2013-08-30 | 1 | -9/+24 | |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into clean_up_util | kondou | 2013-08-20 | 7 | -6/+145 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Clean up \OC\Util | kondou | 2013-08-15 | 3 | -4/+4 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-08-31 | 2 | -5/+106 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #4348 from owncloud/fixing-4343-master | Jörn Friedrich Dreyer | 2013-08-27 | 1 | -0/+101 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into fixing-4343-master | Thomas Müller | 2013-08-22 | 15 | -11/+327 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | | | ||||||
| | * | | | | | | | | | adding unit tests for quota checks | Thomas Müller | 2013-08-08 | 1 | -1/+55 | |
| | * | | | | | | | | | adding unit tests to determine length | Thomas Müller | 2013-08-08 | 1 | -0/+47 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #4507 from owncloud/existingusersfromgroup | blizzz | 2013-08-27 | 1 | -5/+5 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | consolidate validity check for users in group class | Arthur Schiwon | 2013-08-26 | 1 | -5/+5 | |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-08-26 | 8 | -6/+277 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #4292 from owncloud/add_appconfig_unittest | Bart Visscher | 2013-08-26 | 1 | -0/+132 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
| | * | | | | | | | | Use setUpBeforeClass() and tearDownAfterClass() | kondou | 2013-08-06 | 1 | -3/+9 | |
| | * | | | | | | | | Revert "Add null and emptystring tests to check NOT NULL" | kondou | 2013-08-02 | 1 | -14/+0 |