summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / /
* | | | 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
* | | | | 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
| |/ / / / |/| | | |
* | | | | Merge pull request #4022 from owncloud/oc_previewThomas Müller2013-08-31145-120/+4872
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix issue with filetable backgroundGeorg Ehrke2013-08-301-1/+1
| * | | | Merge master into oc_previewGeorg Ehrke2013-08-30320-5280/+7824
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-304-284/+285
|\ \ \ \ \
| * | | | | move CSS for browser-specific fixes out of styles.css into new fixes.cssJan-Christoph Borchardt2013-08-303-44/+47
| * | | | | move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-303-240/+238
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-30308-4962/+7462
* | | | | | Merge pull request #4578 from houbaastef/masterStephane Martin2013-08-301-5/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fixes #4574Stephane Martin2013-08-261-5/+10
* | | | | | Merge pull request #4660 from owncloud/apps-management-stickyMorris Jobke2013-08-302-2/+25
|\ \ \ \ \ \