Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | 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 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | 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 | |
* | | | | | | | | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-icons | Morris Jobke | 2013-09-01 | 2 | -2/+19 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | IE8 fixes | Morris Jobke | 2013-09-02 | 1 | -0/+4 | |
| * | | | | | | | | | | Fit filesummary for \OC\Preview's ne mimetype-icons | kondou | 2013-08-31 | 1 | -2/+15 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #4671 from owncloud/emptycontent | Bernhard Posselt | 2013-09-01 | 5 | -11/+12 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | rename emptyfolder to emptycontent | Alessandro Cosentino | 2013-08-31 | 3 | -8/+8 | |
| * | | | | | | | | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 3 | -8/+9 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-01 | 228 | -1751/+1919 | |
* | | | | | | | | | Merge pull request #4329 from owncloud/fix_4258 | Christopher | 2013-09-01 | 2 | -145/+192 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Check for $this->fileInfo and @depend on testData() | kondou | 2013-09-01 | 2 | -2/+5 | |
| * | | | | | | | | | Merge branch 'master' into fix_4258 | kondou | 2013-08-31 | 145 | -120/+4872 | |
| |\| | | | | | | | | ||||||
| * | | | | | | | | | Fix #4258, clean up \OC_Image and improve its unittest | kondou | 2013-08-30 | 2 | -145/+189 | |
* | | | | | | | | | | fixing this obvious typo directly | Frank Karlitschek | 2013-09-01 | 1 | -1/+1 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4022 from owncloud/oc_preview | Thomas Müller | 2013-08-31 | 145 | -120/+4872 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix issue with filetable background | Georg Ehrke | 2013-08-30 | 1 | -1/+1 | |
| * | | | | | | | | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 320 | -5280/+7824 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #4661 from owncloud/separate-app-styles | Jan-Christoph Borchardt | 2013-08-30 | 4 | -284/+285 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | move CSS for browser-specific fixes out of styles.css into new fixes.css | Jan-Christoph Borchardt | 2013-08-30 | 3 | -44/+47 | |
| * | | | | | | | | | move CSS for apps out of styles.css into new apps.css | Jan-Christoph Borchardt | 2013-08-30 | 3 | -240/+238 |