summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatarskondou2013-08-281-13/+0
| | * | | | | | | | Merge branch 'master' into oc_avatarskondou2013-08-2823-120/+325
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Continue work on cropperkondou2013-08-284-5/+19
| | * | | | | | | | | Clean up some cruftkondou2013-08-261-4/+1
| | * | | | | | | | | Have a controller instead ofo avatar.php and fix some cropper-designkondou2013-08-261-1/+1
| | * | | | | | | | | Use Jcrop, have inline errormsg, work on cropping, clean up, WIPkondou2013-08-253-8/+21
| | * | | | | | | | | Fix spacing, have remove() and return JSON for custom-default-avatarskondou2013-08-251-54/+40
| | * | | | | | | | | Remove gravatar and no-avatar functionality, prepare for default avatars even...kondou2013-08-251-84/+30
| | * | | | | | | | | Clean up and prepare a bit for custom default avatarskondou2013-08-251-7/+6
| | * | | | | | | | | Several improvementskondou2013-08-252-7/+12
| | * | | | | | | | | Refactor newavatar.php and show (for now) an alert on problems when setting n...kondou2013-08-251-2/+4
| | * | | | | | | | | Have /avatar.php as a central avatar-pointkondou2013-08-251-34/+36
| | * | | | | | | | | Improve styling & enable avatar-upload at personal pagekondou2013-08-251-1/+1
| | * | | | | | | | | Load avatar from path, if one's providedkondou2013-08-251-6/+6
| | * | | | | | | | | Add unittests & check filetype in setLocalAvatar()kondou2013-08-251-2/+8
| | * | | | | | | | | Modularize get(), async getAvatar, avatars @ usermgmtkondou2013-08-254-22/+98
| | * | | | | | | | | Add basic avatars and gravatarkondou2013-08-253-0/+79
| * | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-132-5/+52
* | | | | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-1316-2/+1995
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #4712 from owncloud/fileapi-forewardThomas Müller2013-09-1316-2/+1995
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | cleanup public storage interface a bitRobin Appelman2013-09-121-46/+0
| | * | | | | | | | | | Merge branch 'master' into fileapi-forewardRobin Appelman2013-09-1231-543/+691
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | * | | | | | | | | | add storage backend interface to public namespaceRobin Appelman2013-09-103-2/+345
| | * | | | | | | | | | improve phpdoc for the public files interfaceRobin Appelman2013-09-104-51/+105
| | * | | | | | | | | | move filesystem expceptions to global namespaceRobin Appelman2013-09-1010-57/+99
| | * | | | | | | | | | move public files api to a clearer namespaceRobin Appelman2013-09-103-13/+13
| | * | | | | | | | | | update phpdoc for public fileapiRobin Appelman2013-09-062-10/+10
| | * | | | | | | | | | extract interfaces from fileapi for public namespaceRobin Appelman2013-09-066-3/+259
| | * | | | | | | | | | use ===Robin Appelman2013-09-061-1/+1
| | * | | | | | | | | | Provide an implementation of the fileapi for oc6 build on top of the old apiRobin Appelman2013-09-018-1/+1345
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
* | | | | | | | | | | Merge branch 'appframework-master' of github.com:owncloud/core into appframew...Thomas Müller2013-09-136-35/+123
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | adding public interface for previewThomas Müller2013-09-046-35/+123
| * | | | | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-0433-450/+1893
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-1353-616/+2190
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | remove unused OC_L10NThomas Müller2013-09-131-1/+0
| * | | | | | | | | | adding TB and GB to OC_Helper::humanFileSizeThomas Müller2013-09-131-2/+9
| * | | | | | | | | | Merge pull request #4719 from owncloud/port_4701_masterThomas Müller2013-09-1212-73/+103
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | more is_resource checks before readdirArthur Schiwon2013-09-053-23/+30
| | * | | | | | | | | Always check variable type before using readdir to avoid surprisesArthur Schiwon2013-09-049-50/+73
| | |/ / / / / / / /
| * | | | | | | | / adding icons for shared folders and external foldersThomas Müller2013-09-121-0/+8
| | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #4798 from owncloud/fixing-variable-typos-masterVicDeo2013-09-111-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | no further comment - which dev did not test this BEFORE submitting the pull r...Thomas Müller2013-09-111-3/+3
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-111-4/+18
| |/ / / / / / / /
| * | | | | | | | Merge pull request #4472 from owncloud/remove-disconnectAndreas Fischer2013-09-101-12/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove disconnect function from OC_DBBart Visscher2013-08-161-12/+0
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-103-12/+12
| * | | | | | | | | Merge pull request #4757 from owncloud/deleteAll-aliasThomas Müller2013-09-091-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | change View->deleteAll to an alias of View->rmdir since rmdir works recursiveRobin Appelman2013-09-071-1/+1
| * | | | | | | | | | Merge pull request #4772 from owncloud/preview_improvementsThomas Müller2013-09-091-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | use avconv instead of ffmpegGeorg Ehrke2013-09-051-4/+4