| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | adding public interface for preview | Thomas Müller | 2013-09-04 | 6 | -35/+123 |
| | | |||||
| * | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-04 | 421 | -2591/+7685 |
| |\ | |||||
| | * | Merge pull request #4683 from owncloud/publicuploadjserror | Thomas Müller | 2013-09-04 | 1 | -0/+1 |
| | |\ | | | | | | | Fixed public upload error that prevents upload | ||||
| | | * | Fixed public upload error that prevents upload | Vincent Petry | 2013-09-01 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Public upload is broken because the file_upload_param variable expected to exist by public.js didn't. This fix sets the variable scope to the window to make it accessible outside. | ||||
| | * | | Merge pull request #4449 from owncloud/clean_up_util | Morris Jobke | 2013-09-03 | 17 | -242/+318 |
| | |\ \ | | | | | | | | | Clean up \OC\Util | ||||
| | | * \ | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 884 | -12621/+26367 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/base.php | ||||
| | | * | | | 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 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php | ||||
| | | * | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing | ||||
| | * | | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker | Morris Jobke | 2013-09-03 | 1 | -1/+5 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Add previews to OC.dialogs.filepicker() | ||||
| | | * | | | | | 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 | ||||
| | | * | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Texteditor polishing | ||||
| | | * | | | | | | | Revert "remove editor div in filelist", add "is deprecated" comment | Jörn Friedrich Dreyer | 2013-09-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 64d09452f55c0c73fe0d55a70f82d8ad7a386d7c. | ||||
| | | * | | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering ↵ | Jörn Friedrich Dreyer | 2013-08-16 | 1 | -20/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crumbs into full screen editor | ||||
| | | * | | | | | | | 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 | ||||
| | | * | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | RGB -> HSL | ||||
| | | * | | | | | | | 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 | ||||
| | | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Ocs cleanup | ||||
| | | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config | ||||
| | | * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS. | ||||
| | | * | | | | | | 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. | ||||
| | | * | | | | | | remove the activity call here. it is not implemented anyways. This will be ↵ | Frank Karlitschek | 2013-08-31 | 2 | -36/+0 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | provided by Activity app in the future. | ||||
| | * | | | | | | 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 | ||||
| | | * | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Files controls fixes | ||||
| | | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Fit filesummary for \OC\Preview's new mimetype-icons | ||||
| | | * | | | | | | | 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 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | centers text message in empty-content page (files and files_trashbin apps) | ||||
| | | * | | | | | | | 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 |
| | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |