summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Split some lines, use ===, avoid unnecessary operationkondou2013-09-111-5/+7
|
* Use shorter array-conversionkondou2013-09-061-3/+1
|
* Use usort() instead of uasort() to not maintain keyskondou2013-09-061-1/+1
|
* Sort files by name, not by mimetypekondou2013-09-051-0/+9
|
* Only use mimetype_list and clean up a bitkondou2013-09-052-19/+22
|
* Make it possible to pass rawlist.php an JSON array, to filter by more than ↵kondou2013-09-052-9/+28
| | | | one mimetype
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-0557-438/+560
|
* Merge pull request #4477 from owncloud/hooks-viewBernhard Posselt2013-09-042-33/+87
|\ | | | | also emit hooks for views that are a subfolder of the user folder
| * test case for hooks send from a non-default viewRobin Appelman2013-08-291-1/+30
| |
| * also emit hooks for views that are a subfolder of the user folderRobin Appelman2013-08-171-32/+57
| |
* | Merge pull request #4683 from owncloud/publicuploadjserrorThomas Müller2013-09-041-0/+1
|\ \ | | | | | | Fixed public upload error that prevents upload
| * | Fixed public upload error that prevents uploadVincent Petry2013-09-011-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_utilMorris Jobke2013-09-0317-242/+318
|\ \ \ | | | | | | | | Clean up \OC\Util
| * \ \ Merge branch 'master' into clean_up_utilkondou2013-09-02884-12621/+26367
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/base.php
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | | | Fix some naming and spacing in lib/util.phpkondou2013-08-184-15/+20
| | | | | |
| * | | | | Clean up \OC\Utilkondou2013-08-1517-222/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing
* | | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepickerMorris Jobke2013-09-031-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add previews to OC.dialogs.filepicker()
| * | | | | | 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 bind
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Texteditor polishing
| * | | | | | | | Revert "remove editor div in filelist", add "is deprecated" commentJörn Friedrich Dreyer2013-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 64d09452f55c0c73fe0d55a70f82d8ad7a386d7c.
| * | | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering ↵Jörn Friedrich Dreyer2013-08-161-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crumbs into full screen editor
| * | | | | | | | 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 utils
| * | | | | | | | | center utilsBernhard Posselt2013-09-021-0/+1
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #4695 from owncloud/placeholder-hslMorris Jobke2013-09-031-8/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | RGB -> HSL
| * | | | | | | | 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 #4696
| * | | | | | | | Use provided mimetype on open. Fix #4696Thomas Tanghus2013-09-021-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #4672 from owncloud/ocs_cleanupblizzz2013-09-022-52/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ocs cleanup
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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.
| * | | | | | | remove the activity call here. it is not implemented anyways. This will be ↵Frank Karlitschek2013-08-312-36/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | provided by Activity app in the future.
* | | | | | | Merge pull request #4663 from owncloud/fix-sticky-appsMorris Jobke2013-09-021-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix issues caused by introduction of sticky Apps management footer
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Files controls fixes
| * | | | | | | | 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-02-05 22:38:54 +0000