Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix some bugs and remove \OCP\Avatar for now | kondou | 2013-09-04 | 2 | -18/+6 |
* | fixing style, var name & PHPDoc | Thomas Müller | 2013-09-04 | 2 | -3/+5 |
* | Remove backgroundcolor on updating avatar, and add a missing parameter | kondou | 2013-09-04 | 1 | -3/+8 |
* | Merge branch 'master' into oc_avatars | kondou | 2013-09-04 | 58 | -468/+630 |
|\ | |||||
| * | Merge pull request #4449 from owncloud/clean_up_util | Morris Jobke | 2013-09-03 | 17 | -242/+318 |
| |\ | |||||
| | * | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 884 | -12621/+26367 |
| | |\ | |||||
| | * | | Fix some phpdoc and camelcase | kondou | 2013-08-23 | 1 | -15/+17 |
| | * | | fixing typos | Thomas Müller | 2013-08-22 | 1 | -9/+10 |
| | * | | Merge branch 'master' into clean_up_util | kondou | 2013-08-20 | 1069 | -19632/+16788 |
| | |\ \ | |||||
| | * | | | Fix some naming and spacing in lib/util.php | kondou | 2013-08-18 | 4 | -15/+20 |
| | * | | | Clean up \OC\Util | kondou | 2013-08-15 | 17 | -222/+290 |
| * | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker | Morris Jobke | 2013-09-03 | 1 | -1/+5 |
| |\ \ \ \ | |||||
| | * | | | | Add previews to OC.dialogs.filepicker(); Fix #4697 | kondou | 2013-09-03 | 1 | -1/+5 |
| * | | | | | Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind | Christopher | 2013-09-03 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | use on to add event listener instead of deprecated jquery bind | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -1/+2 |
| * | | | | | | Merge pull request #4473 from owncloud/texteditor_polishing | Jörn Friedrich Dreyer | 2013-09-03 | 2 | -21/+30 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 |
| | * | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering crum... | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -20/+29 |
| | * | | | | | | remove editor div in filelist | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -1/+0 |
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-03 | 35 | -193/+267 |
| * | | | | | | | Merge pull request #4702 from owncloud/center-utils | Morris Jobke | 2013-09-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | center utils | Bernhard Posselt | 2013-09-02 | 1 | -0/+1 |
| * | | | | | | | | Merge pull request #4695 from owncloud/placeholder-hsl | Morris Jobke | 2013-09-03 | 1 | -8/+5 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | placeholder.js: fix typo | Jan-Christoph Borchardt | 2013-09-02 | 1 | -1/+1 |
| | * | | | | | | | placeholder.js: adjust saturation and lightness values | Jan-Christoph Borchardt | 2013-09-02 | 1 | -2/+2 |
| | * | | | | | | | RGB -> HSL | Morris Jobke | 2013-09-02 | 1 | -7/+4 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4706 from owncloud/fix_filepicker_mimetype | Christopher | 2013-09-02 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Use provided mimetype on open. Fix #4696 | Thomas Tanghus | 2013-09-02 | 1 | -2/+2 |
| |/ / / / / / / | |||||
* | | | | | | | | Clean up oc_avatars | kondou | 2013-09-04 | 3 | -9/+10 |
* | | | | | | | | Don't update avatar on displayNameChange anymore | kondou | 2013-09-04 | 1 | -1/+0 |
* | | | | | | | | Have the header avatar to the left of the user name | kondou | 2013-09-03 | 2 | -9/+18 |
* | | | | | | | | Fix unwanted caching in IE8 | kondou | 2013-09-03 | 2 | -7/+20 |
* | | | | | | | | Partly fix cropper in IE8 and don't use a dialog for it | kondou | 2013-09-03 | 2 | -25/+34 |
* | | | | | | | | Don't use HTML5 <header> to support avatars in IE8 | kondou | 2013-09-03 | 2 | -2/+2 |
* | | | | | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-03 | 242 | -1875/+2007 |
|\| | | | | | | | |||||
| * | | | | | | | Merge pull request #4672 from owncloud/ocs_cleanup | blizzz | 2013-09-02 | 2 | -52/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | remove the config option that is no longer needed | Frank Karlitschek | 2013-08-31 | 1 | -3/+0 |
| | * | | | | | | | remove knowledgebase calls that are no longer used in ownCloud 5/6 | Frank Karlitschek | 2013-08-31 | 1 | -49/+0 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4514 from owncloud/windows_ssl | Owen Winkler | 2013-09-02 | 4 | -12/+40 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | This function doesn't cache anymore. Adjusted PHPDoc to suit. | ringmaster | 2013-09-02 | 1 | -1/+1 |
| | * | | | | | | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 2 | -13/+11 |
| | * | | | | | | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 3 | -7/+21 |
| | * | | | | | | Start a branch for easier OpenSSL configuration. | Owen Winkler | 2013-09-02 | 3 | -1/+17 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #4673 from owncloud/ocsapi_cleanup | Jörn Friedrich Dreyer | 2013-09-02 | 2 | -36/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | remove the activity call here. it is not implemented anyways. This will be pr... | Frank Karlitschek | 2013-08-31 | 2 | -36/+0 |
| | |/ / / / / | |||||
| * | | | | | | Merge pull request #4663 from owncloud/fix-sticky-apps | Morris Jobke | 2013-09-02 | 1 | -4/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | fix issues caused by introduction of sticky Apps management footer | Jan-Christoph Borchardt | 2013-08-30 | 1 | -4/+4 |
| * | | | | | | | Merge pull request #4657 from owncloud/files-controls-fixes | Morris Jobke | 2013-09-01 | 1 | -7/+13 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | adjust right padding of controls bar, fix #4650 | Jan-Christoph Borchardt | 2013-08-30 | 1 | -2/+2 |
| | * | | | | | | | fix coding style for controls bar | Jan-Christoph Borchardt | 2013-08-30 | 1 | -7/+13 |