summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #4449 from owncloud/clean_up_utilMorris Jobke2013-09-0317-242/+318
| |\
| | * Merge branch 'master' into clean_up_utilkondou2013-09-02884-12621/+26367
| | |\
| | * | Fix some phpdoc and camelcasekondou2013-08-231-15/+17
| | * | fixing typosThomas Müller2013-08-221-9/+10
| | * | Merge branch 'master' into clean_up_utilkondou2013-08-201069-19632/+16788
| | |\ \
| | * | | Fix some naming and spacing in lib/util.phpkondou2013-08-184-15/+20
| | * | | Clean up \OC\Utilkondou2013-08-1517-222/+290
| * | | | 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-032-21/+30
| |\ \ \ \ \ \
| | * | | | | | Revert "remove editor div in filelist", add "is deprecated" commentJörn Friedrich Dreyer2013-09-031-0/+1
| | * | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering crum...Jörn Friedrich Dreyer2013-08-161-20/+29
| | * | | | | | remove editor div in filelistJörn Friedrich Dreyer2013-08-161-1/+0
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-0335-193/+267
| * | | | | | | 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
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #4706 from owncloud/fix_filepicker_mimetypeChristopher2013-09-021-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Use provided mimetype on open. Fix #4696Thomas Tanghus2013-09-021-2/+2
| |/ / / / / / /
* | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 11:01:39 +0000