summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #4672 from owncloud/ocs_cleanupblizzz2013-09-022-52/+0
| |\
| | * remove the config option that is no longer neededFrank Karlitschek2013-08-311-3/+0
| | * remove knowledgebase calls that are no longer used in ownCloud 5/6Frank Karlitschek2013-08-311-49/+0
| * | Merge pull request #4514 from owncloud/windows_sslOwen Winkler2013-09-024-12/+40
| |\ \
| | * | This function doesn't cache anymore. Adjusted PHPDoc to suit.ringmaster2013-09-021-1/+1
| | * | Don't cache the pkey, skip generation if the keyfile existsringmaster2013-09-022-13/+11
| | * | Employ config option for OpenSSL config file, if provided.Owen Winkler2013-09-023-7/+21
| | * | Start a branch for easier OpenSSL configuration.Owen Winkler2013-09-023-1/+17
| |/ /
| * | Merge pull request #4673 from owncloud/ocsapi_cleanupJörn Friedrich Dreyer2013-09-022-36/+0
| |\ \
| | * | remove the activity call here. it is not implemented anyways. This will be pr...Frank Karlitschek2013-08-312-36/+0
| | |/
| * | Merge pull request #4663 from owncloud/fix-sticky-appsMorris Jobke2013-09-021-4/+4
| |\ \
| | * | fix issues caused by introduction of sticky Apps management footerJan-Christoph Borchardt2013-08-301-4/+4
| * | | 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-015-11/+12
| |\ \ \ \
| | * | | | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-313-8/+8
| | * | | | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-313-8/+9
| | |/ / /
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-01228-1751/+1919
* | | | | 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
|\| | | |
| * | | | Merge pull request #4329 from owncloud/fix_4258Christopher2013-09-012-145/+192
| |\ \ \ \
| | * | | | Check for $this->fileInfo and @depend on testData()kondou2013-09-012-2/+5
| | * | | | Merge branch 'master' into fix_4258kondou2013-08-31145-120/+4872
| | |\| | |
| | * | | | Fix #4258, clean up \OC_Image and improve its unittestkondou2013-08-302-145/+189
| * | | | | fixing this obvious typo directlyFrank Karlitschek2013-09-011-1/+1
| | |/ / / | |/| | |
* | | | | 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
|\| | | |
| * | | | Merge pull request #4022 from owncloud/oc_previewThomas Müller2013-08-31145-120/+4872
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix issue with filetable backgroundGeorg Ehrke2013-08-301-1/+1