| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | | | | | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatars | kondou | 2013-08-28 | 1 | -13/+0 |
| | * | | | | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-28 | 23 | -120/+325 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Continue work on cropper | kondou | 2013-08-28 | 4 | -5/+19 |
| | * | | | | | | | | | Clean up some cruft | kondou | 2013-08-26 | 1 | -4/+1 |
| | * | | | | | | | | | Have a controller instead ofo avatar.php and fix some cropper-design | kondou | 2013-08-26 | 1 | -1/+1 |
| | * | | | | | | | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIP | kondou | 2013-08-25 | 3 | -8/+21 |
| | * | | | | | | | | | Fix spacing, have remove() and return JSON for custom-default-avatars | kondou | 2013-08-25 | 1 | -54/+40 |
| | * | | | | | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even... | kondou | 2013-08-25 | 1 | -84/+30 |
| | * | | | | | | | | | Clean up and prepare a bit for custom default avatars | kondou | 2013-08-25 | 1 | -7/+6 |
| | * | | | | | | | | | Several improvements | kondou | 2013-08-25 | 2 | -7/+12 |
| | * | | | | | | | | | Refactor newavatar.php and show (for now) an alert on problems when setting n... | kondou | 2013-08-25 | 1 | -2/+4 |
| | * | | | | | | | | | Have /avatar.php as a central avatar-point | kondou | 2013-08-25 | 1 | -34/+36 |
| | * | | | | | | | | | Improve styling & enable avatar-upload at personal page | kondou | 2013-08-25 | 1 | -1/+1 |
| | * | | | | | | | | | Load avatar from path, if one's provided | kondou | 2013-08-25 | 1 | -6/+6 |
| | * | | | | | | | | | Add unittests & check filetype in setLocalAvatar() | kondou | 2013-08-25 | 1 | -2/+8 |
| | * | | | | | | | | | Modularize get(), async getAvatar, avatars @ usermgmt | kondou | 2013-08-25 | 4 | -22/+98 |
| | * | | | | | | | | | Add basic avatars and gravatar | kondou | 2013-08-25 | 3 | -0/+79 |
| * | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-13 | 2 | -5/+52 |
* | | | | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-13 | 16 | -2/+1995 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | Merge pull request #4712 from owncloud/fileapi-foreward | Thomas Müller | 2013-09-13 | 16 | -2/+1995 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | cleanup public storage interface a bit | Robin Appelman | 2013-09-12 | 1 | -46/+0 |
| | * | | | | | | | | | | Merge branch 'master' into fileapi-foreward | Robin Appelman | 2013-09-12 | 31 | -543/+691 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|/
| | | |/| | | | | | | | |
|
| | * | | | | | | | | | | add storage backend interface to public namespace | Robin Appelman | 2013-09-10 | 3 | -2/+345 |
| | * | | | | | | | | | | improve phpdoc for the public files interface | Robin Appelman | 2013-09-10 | 4 | -51/+105 |
| | * | | | | | | | | | | move filesystem expceptions to global namespace | Robin Appelman | 2013-09-10 | 10 | -57/+99 |
| | * | | | | | | | | | | move public files api to a clearer namespace | Robin Appelman | 2013-09-10 | 3 | -13/+13 |
| | * | | | | | | | | | | update phpdoc for public fileapi | Robin Appelman | 2013-09-06 | 2 | -10/+10 |
| | * | | | | | | | | | | extract interfaces from fileapi for public namespace | Robin Appelman | 2013-09-06 | 6 | -3/+259 |
| | * | | | | | | | | | | use === | Robin Appelman | 2013-09-06 | 1 | -1/+1 |
| | * | | | | | | | | | | Provide an implementation of the fileapi for oc6 build on top of the old api | Robin Appelman | 2013-09-01 | 8 | -1/+1345 |
| | | |_|_|_|/ / / / /
| | |/| | | | | | | | |
|
* | | | | | | | | | | | Merge branch 'appframework-master' of github.com:owncloud/core into appframew... | Thomas Müller | 2013-09-13 | 6 | -35/+123 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | adding public interface for preview | Thomas Müller | 2013-09-04 | 6 | -35/+123 |
| * | | | | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-04 | 33 | -450/+1893 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | |
|
* | | | | | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-13 | 53 | -616/+2190 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / /
|/| | / / / / / / / / /
| | |/ / / / / / / / /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | remove unused OC_L10N | Thomas Müller | 2013-09-13 | 1 | -1/+0 |
| * | | | | | | | | | | adding TB and GB to OC_Helper::humanFileSize | Thomas Müller | 2013-09-13 | 1 | -2/+9 |
| * | | | | | | | | | | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 12 | -73/+103 |
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / /
| |/| | | | | | | | | |
|
| | * | | | | | | | | | more is_resource checks before readdir | Arthur Schiwon | 2013-09-05 | 3 | -23/+30 |
| | * | | | | | | | | | Always check variable type before using readdir to avoid surprises | Arthur Schiwon | 2013-09-04 | 9 | -50/+73 |
| | |/ / / / / / / / |
|
| * | | | | | | | / | adding icons for shared folders and external folders | Thomas Müller | 2013-09-12 | 1 | -0/+8 |
| | |_|_|_|_|_|_|/
| |/| | | | | | | |
|
| * | | | | | | | | Merge pull request #4798 from owncloud/fixing-variable-typos-master | VicDeo | 2013-09-11 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | no further comment - which dev did not test this BEFORE submitting the pull r... | Thomas Müller | 2013-09-11 | 1 | -3/+3 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-11 | 1 | -4/+18 |
| |/ / / / / / / / |
|
| * | | | | | | | | Merge pull request #4472 from owncloud/remove-disconnect | Andreas Fischer | 2013-09-10 | 1 | -12/+0 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | Remove disconnect function from OC_DB | Bart Visscher | 2013-08-16 | 1 | -12/+0 |
| * | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-10 | 3 | -12/+12 |
| * | | | | | | | | | Merge pull request #4757 from owncloud/deleteAll-alias | Thomas Müller | 2013-09-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | change View->deleteAll to an alias of View->rmdir since rmdir works recursive | Robin Appelman | 2013-09-07 | 1 | -1/+1 |
| * | | | | | | | | | | Merge pull request #4772 from owncloud/preview_improvements | Thomas Müller | 2013-09-09 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | use avconv instead of ffmpeg | Georg Ehrke | 2013-09-05 | 1 | -4/+4 |