aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #4449 from owncloud/clean_up_utilMorris Jobke2013-09-033-5/+5
| |\
| | * Merge branch 'master' into clean_up_utilkondou2013-09-02177-619/+3800
| | |\
| | * \ Merge branch 'master' into clean_up_utilkondou2013-08-20107-649/+557
| | |\ \
| | * | | Fix some naming and spacing in lib/util.phpkondou2013-08-181-1/+1
| | * | | Clean up \OC\Utilkondou2013-08-153-5/+5
| * | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepickerMorris Jobke2013-09-031-1/+5
| |\ \ \ \
| | * | | | Add previews to OC.dialogs.filepicker(); Fix #4697kondou2013-09-031-1/+5
| * | | | | Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bindChristopher2013-09-031-1/+2
| |\ \ \ \ \
| | * | | | | use on to add event listener instead of deprecated jquery bindJörn Friedrich Dreyer2013-09-031-1/+2
| * | | | | | Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-031-20/+29
| |\ \ \ \ \ \
| | * | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering crum...Jörn Friedrich Dreyer2013-08-161-20/+29
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-032-4/+27
| * | | | | | | Merge pull request #4702 from owncloud/center-utilsMorris Jobke2013-09-031-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | center utilsBernhard Posselt2013-09-021-0/+1
| * | | | | | | | Merge pull request #4695 from owncloud/placeholder-hslMorris Jobke2013-09-031-8/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | placeholder.js: fix typoJan-Christoph Borchardt2013-09-021-1/+1
| | * | | | | | | placeholder.js: adjust saturation and lightness valuesJan-Christoph Borchardt2013-09-021-2/+2
| | * | | | | | | RGB -> HSLMorris Jobke2013-09-021-7/+4
| | | |_|/ / / / | | |/| | | | |
| * / | | | | | Use provided mimetype on open. Fix #4696Thomas Tanghus2013-09-021-2/+2
| |/ / / / / /
* | | | | | | 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
|\| | | | | |
| * | | | | | Merge pull request #4657 from owncloud/files-controls-fixesMorris Jobke2013-09-011-7/+13
| |\ \ \ \ \ \
| | * | | | | | adjust right padding of controls bar, fix #4650Jan-Christoph Borchardt2013-08-301-2/+2
| | * | | | | | fix coding style for controls barJan-Christoph Borchardt2013-08-301-7/+13
| * | | | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-iconsMorris Jobke2013-09-012-2/+19
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | IE8 fixesMorris Jobke2013-09-021-0/+4
| | * | | | | | Fit filesummary for \OC\Preview's ne mimetype-iconskondou2013-08-311-2/+15
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-011-1/+8
| |\ \ \ \ \ \
| | * | | | | | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-311-5/+5
| | * | | | | | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-311-1/+8
| | |/ / / / /
| * / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-09-0151-15/+78
| |/ / / / /
* | | | | | 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