summaryrefslogtreecommitdiffstats
path: root/tests/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into appframework-masterThomas Müller2013-09-151-0/+26
|\
| * Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-141-0/+26
| |\
| | * Merge branch 'master' into oc_avatarskondou2013-09-121-1/+30
| | |\
| | * | Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-091-6/+6
| | * | Merge branch 'master' into oc_avatarskondou2013-09-043-4/+4
| | |\ \
| | * \ \ Merge branch 'master' into oc_avatarskondou2013-09-011-9/+27
| | |\ \ \
| | * \ \ \ Merge branch 'master' into oc_avatarskondou2013-08-311-0/+108
| | |\ \ \ \
| | * | | | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitestskondou2013-08-301-0/+2
| | * | | | | Merge branch 'master' into oc_avatarskondou2013-08-283-5/+238
| | |\ \ \ \ \
| | * | | | | | Continue work on cropperkondou2013-08-281-5/+7
| | * | | | | | Fix avatar-unittestkondou2013-08-251-2/+2
| | * | | | | | Fix spacing, have remove() and return JSON for custom-default-avatarskondou2013-08-251-11/+3
| | * | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even...kondou2013-08-251-33/+5
| | * | | | | | Fix testDefaultAvatarkondou2013-08-251-1/+1
| | * | | | | | Have /avatar.php as a central avatar-pointkondou2013-08-251-10/+7
| | * | | | | | Improve styling & enable avatar-upload at personal pagekondou2013-08-251-1/+1
| | * | | | | | Add unittests & check filetype in setLocalAvatar()kondou2013-08-251-0/+61
* | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-135-0/+1701
|\| | | | | | |
| * | | | | | | Merge pull request #4712 from owncloud/fileapi-forewardThomas Müller2013-09-135-0/+1701
| |\ \ \ \ \ \ \
| | * | | | | | | - giving the user a new id for each test run in order to prevent reuse of e.g...Thomas Müller2013-09-131-1/+2
| | * | | | | | | Merge branch 'master' into fileapi-forewardRobin Appelman2013-09-125-14/+61
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | adjust test cases to namespace changesRobin Appelman2013-09-105-26/+26
| | * | | | | | | Provide an implementation of the fileapi for oc6 build on top of the old apiRobin Appelman2013-09-015-0/+1700
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-137-44/+201
|\| | | | | | |
| * | | | | | | adding TB and GB to OC_Helper::humanFileSizeThomas Müller2013-09-131-30/+32
| | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #4477 from owncloud/hooks-viewBernhard Posselt2013-09-041-1/+30
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | test case for hooks send from a non-default viewRobin Appelman2013-08-291-1/+30
| * | | | | | Merge branch 'master' into clean_up_utilkondou2013-09-025-14/+373
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Check for $this->fileInfo and @depend on testData()kondou2013-09-011-0/+3
| | * | | | | Merge branch 'master' into fix_4258kondou2013-08-311-0/+108
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge master into oc_previewGeorg Ehrke2013-08-293-5/+238
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-233-2/+141
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Merge master into oc_previewGeorg Ehrke2013-08-194-4/+4
| | | |\ \ \ \
| | | * \ \ \ \ Merge master into oc_previewGeorg Ehrke2013-08-146-2/+315
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | * | | | | fix merge conflictsGeorg Ehrke2013-08-056-9/+423
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into oc_previewThomas Müller2013-07-3017-168/+1139
| | | |\ \ \ \ \ \
| | | * | | | | | | remove debug code ...Georg Ehrke2013-07-111-4/+1
| | | * | | | | | | it's setValue not getValue, damn typeGeorg Ehrke2013-07-111-3/+6
| | | * | | | | | | merge conflicts ...Georg Ehrke2013-07-1015-80/+416
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | add unit tests for preview lib to make @DeepDiver1975 happyGeorg Ehrke2013-06-261-0/+108
| | * | | | | | | | | Fix #4258, clean up \OC_Image and improve its unittestkondou2013-08-301-9/+24
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into clean_up_utilkondou2013-08-207-6/+145
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Clean up \OC\Utilkondou2013-08-153-4/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-08-312-5/+106
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #4348 from owncloud/fixing-4343-masterJörn Friedrich Dreyer2013-08-271-0/+101
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into fixing-4343-masterThomas Müller2013-08-2212-11/+312
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | * | | | | | | | adding unit tests for quota checksThomas Müller2013-08-081-1/+55
| | * | | | | | | | adding unit tests to determine lengthThomas Müller2013-08-081-0/+47
| * | | | | | | | | Merge pull request #4507 from owncloud/existingusersfromgroupblizzz2013-08-271-5/+5
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | consolidate validity check for users in group classArthur Schiwon2013-08-261-5/+5
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |