summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | first log the exceptionThomas Müller2013-09-151-1/+1
* | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-15214-1077/+5087
|\| | |
| * | | Merge pull request #4835 from owncloud/fix-apps-heightMorris Jobke2013-09-151-2/+2
| |\ \ \
| | * | | use lineheight instead of padding and heightBernhard Posselt2013-09-131-2/+2
| | |/ /
| * | | Merge pull request #4803 from owncloud/fix-4465-add-share-user-on-enterMorris Jobke2013-09-151-2/+4
| |\ \ \
| | * | | no autoFocus if no users returnedPete McFarlane2013-09-111-1/+3
| | * | | Added autoFocus to #shareWith autocomplete optionsPete McFarlane2013-09-111-3/+3
| * | | | Merge pull request #4853 from owncloud/external-shared_mimetype-iconsThomas Müller2013-09-152-16/+10
| |\ \ \ \
| | * | | | Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-142-16/+10
| * | | | | Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-1420-2/+578
| |\ \ \ \ \
| | * | | | | Remove superfluous $kondou2013-09-141-1/+1
| | * | | | | Merge branch 'master' into oc_avatarskondou2013-09-12511-3418/+12124
| | |\ \ \ \ \
| | * | | | | | Add a comment to clear defaultavatar-functionalitykondou2013-09-111-0/+1
| | * | | | | | Bring another enable_avatars to $_ and fix $thus->$thiskondou2013-09-113-2/+3
| | * | | | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-097-36/+41
| | * | | | | | Have the "notsquare" error as data, not as messagekondou2013-09-062-2/+2
| | * | | | | | Use \OC_App for checking whether encryption is enabledkondou2013-09-051-1/+1
| | * | | | | | Clean up avatars and preliminary use JSON->rawlist.phpkondou2013-09-054-18/+18
| | * | | | | | Fix an IE8 bug with the avatarcropper.kondou2013-09-052-10/+12
| | * | | | | | Have login-checks and CSRF checkskondou2013-09-053-8/+16
| | * | | | | | Use proper controller namingkondou2013-09-042-8/+10
| | * | | | | | Fix some bugs and remove \OCP\Avatar for nowkondou2013-09-042-18/+6
| | * | | | | | fixing style, var name & PHPDocThomas Müller2013-09-042-3/+5
| | * | | | | | Remove backgroundcolor on updating avatar, and add a missing parameterkondou2013-09-041-3/+8
| | * | | | | | Merge branch 'master' into oc_avatarskondou2013-09-0458-468/+630
| | |\ \ \ \ \ \
| | * | | | | | | Clean up oc_avatarskondou2013-09-043-9/+10
| | * | | | | | | Don't update avatar on displayNameChange anymorekondou2013-09-041-1/+0
| | * | | | | | | Have the header avatar to the left of the user namekondou2013-09-032-9/+18
| | * | | | | | | Fix unwanted caching in IE8kondou2013-09-032-7/+20
| | * | | | | | | Partly fix cropper in IE8 and don't use a dialog for itkondou2013-09-032-25/+34
| | * | | | | | | Don't use HTML5 <header> to support avatars in IE8kondou2013-09-032-2/+2
| | * | | | | | | Merge branch 'master' into oc_avatarskondou2013-09-03242-1875/+2007
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-024-9/+9
| | * | | | | | | | Pass setLastModifiedHeader() time()kondou2013-09-011-2/+2
| | * | | | | | | | $image doesn't have data() when a defaultavatar should be usedkondou2013-09-011-1/+1
| | * | | | | | | | Also set an E-Tag headerkondou2013-09-011-0/+2
| | * | | | | | | | Use \OC_Response for cache invalidationkondou2013-09-011-10/+4
| | * | | | | | | | Properly check for tmpavatar, invalidate cache, fix debug msgskondou2013-09-012-4/+16
| | * | | | | | | | Fix @tanghus's complains in avatars and clean up cropper after closing with "x"kondou2013-09-012-8/+36
| | * | | | | | | | Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-016-7/+22
| | * | | | | | | | Merge branch 'master' into oc_avatarskondou2013-09-013-146/+193
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Better naming than "ava" & "data", cache timeout, use OC.Router.registerLoade...kondou2013-09-013-15/+17
| | * | | | | | | | | Add a description for $.avatar() and remove TODOs @raghunayyar fixedkondou2013-08-312-2/+28
| | * | | | | | | | | Deal with OC.Router.generate()kondou2013-08-311-4/+4
| | * | | | | | | | | Sanitize displayname, respect data @ $element, fix routename, clean after cro...kondou2013-08-315-12/+18
| | * | | | | | | | | Merge branch 'master' into oc_avatarskondou2013-08-31463-5441/+12834
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix \OCP\Avatarkondou2013-08-301-17/+1
| | * | | | | | | | | | Clean upkondou2013-08-303-4/+3
| | * | | | | | | | | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitestskondou2013-08-307-37/+55
| | * | | | | | | | | | Use OC_Cache and finish cropper functionalitykondou2013-08-293-38/+13