summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4871 from owncloud/add_exists_method_to_jqueryBernhard Posselt2013-09-171-1/+10
|\
| * add exists method to jqueryJörn Friedrich Dreyer2013-09-161-1/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1636-36/+0
|/
* 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-151-5/+1
|\ \ \
| * | | Use external and shared icons in OC.Dialogs.filepicker()kondou2013-09-141-5/+1
* | | | Merge pull request #4506 from owncloud/oc_avatarsBernhard Posselt2013-09-146-2/+288
|\ \ \ \
| * | | | Remove superfluous $kondou2013-09-141-1/+1
| * | | | Merge branch 'master' into oc_avatarskondou2013-09-1217-73/+184
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add a comment to clear defaultavatar-functionalitykondou2013-09-111-0/+1
| * | | | Bring another enable_avatars to $_ and fix $thus->$thiskondou2013-09-111-1/+1
| * | | | Pass view in \OC_Avatar to constructor and use $_ for enable_avatarskondou2013-09-091-8/+8
| * | | | Have the "notsquare" error as data, not as messagekondou2013-09-061-1/+1
| * | | | Clean up avatars and preliminary use JSON->rawlist.phpkondou2013-09-052-16/+14
| * | | | Have login-checks and CSRF checkskondou2013-09-052-7/+15
| * | | | Use proper controller namingkondou2013-09-042-8/+10
| * | | | Fix some bugs and remove \OCP\Avatar for nowkondou2013-09-041-6/+6
| * | | | fixing style, var name & PHPDocThomas Müller2013-09-041-2/+4
| * | | | Merge branch 'master' into oc_avatarskondou2013-09-0410-41/+76
| |\ \ \ \
| * | | | | Clean up oc_avatarskondou2013-09-042-3/+2
| * | | | | Have the header avatar to the left of the user namekondou2013-09-032-9/+18
| * | | | | Fix unwanted caching in IE8kondou2013-09-031-3/+11
| * | | | | Don't use HTML5 <header> to support avatars in IE8kondou2013-09-032-2/+2
| * | | | | Merge branch 'master' into oc_avatarskondou2013-09-0353-25/+118
| |\ \ \ \ \
| * | | | | | Fix some of @jancborchardt's complaints in oc_avatarskondou2013-09-021-3/+3
| * | | | | | 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-011-3/+14
| * | | | | | Fix @tanghus's complains in avatars and clean up cropper after closing with "x"kondou2013-09-011-6/+30
| * | | | | | Provide 'enable_avatars' in config.php, to disable avatarskondou2013-09-011-0/+2
| * | | | | | 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-313-8/+16
| * | | | | | Merge branch 'master' into oc_avatarskondou2013-08-31134-370/+3456
| |\ \ \ \ \ \
| * | | | | | | Clean upkondou2013-08-301-3/+3
| * | | | | | | Finish cropper, Get rid of TODOs, Improve \OCP\Avatar and "fix" unitestskondou2013-08-303-16/+14
| * | | | | | | Use OC_Cache and finish cropper functionalitykondou2013-08-292-31/+9
| * | | | | | | Use defaultavatarskondou2013-08-295-3/+50
| * | | | | | | Merge branch 'master' into oc_avatarskondou2013-08-282-0/+66
| |\ \ \ \ \ \ \
| * | | | | | | | Use OC.Router.generate, TODO use cache, prepare for defaultavatarskondou2013-08-281-1/+1
| * | | | | | | | Merge branch 'master' into oc_avatarskondou2013-08-2820-191/+115
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Continue work on cropperkondou2013-08-282-12/+62
| * | | | | | | | | Translate "Permission denied" & use class-autoloaderkondou2013-08-272-8/+8