Jörn Friedrich Dreyer
49fd7e9f1e
refactor dialog creation
10 lat temu
Jörn Friedrich Dreyer
4af5a8c483
Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
apps/files/ajax/upload.php
apps/files/js/file-upload.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/templates/part.list.php
10 lat temu
Morris Jobke
09187f3b3b
Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
10 lat temu
Morris Jobke
6435e18e95
Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
Add previews to OC.dialogs.filepicker()
10 lat temu
Christopher
c2eaf7589d
Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
use on to add event listener instead of deprecated jquery bind
11 lat temu
kondou
d62c5063f4
Add previews to OC.dialogs.filepicker(); Fix #4697
11 lat temu
Jörn Friedrich Dreyer
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
11 lat temu
Jenkins for ownCloud
fe0b8ac2c0
[tx-robot] updated from transifex
11 lat temu
Jörn Friedrich Dreyer
449fe8c75e
Revert "remove editor div in filelist", add "is deprecated" comment
This reverts commit 64d09452f5
.
11 lat temu
Jörn Friedrich Dreyer
b0c6f990e4
use on to add event listener instead of deprecated jquery bind
11 lat temu
Morris Jobke
84aba4542d
Merge pull request #4702 from owncloud/center-utils
center utils
11 lat temu
Morris Jobke
2da6f6b4ce
Merge pull request #4695 from owncloud/placeholder-hsl
RGB -> HSL
11 lat temu
Christopher
a7de0e9652
Merge pull request #4706 from owncloud/fix_filepicker_mimetype
Use provided mimetype on open. Fix #4696
11 lat temu
Thomas Tanghus
53a7f80ac3
Use provided mimetype on open. Fix #4696
11 lat temu
blizzz
431cf06e99
Merge pull request #4672 from owncloud/ocs_cleanup
Ocs cleanup
11 lat temu
Bernhard Posselt
87035fc478
center utils
11 lat temu
Jan-Christoph Borchardt
9eeb27c91a
placeholder.js: fix typo
11 lat temu
Jan-Christoph Borchardt
57a1219ca0
placeholder.js: adjust saturation and lightness values
11 lat temu
Owen Winkler
f81a205f12
Merge pull request #4514 from owncloud/windows_ssl
Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config
11 lat temu
Morris Jobke
e7a14ea32d
RGB -> HSL
11 lat temu
ringmaster
39f4538e0f
This function doesn't cache anymore. Adjusted PHPDoc to suit.
11 lat temu
ringmaster
df7bfa4bf0
Don't cache the pkey, skip generation if the keyfile exists
11 lat temu
Owen Winkler
9a263a500a
Employ config option for OpenSSL config file, if provided.
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.
11 lat temu
Owen Winkler
fb34f49913
Start a branch for easier OpenSSL configuration.
11 lat temu
Jörn Friedrich Dreyer
06870a6e39
Merge pull request #4673 from owncloud/ocsapi_cleanup
remove the activity call here. it is not implemented anyways.
11 lat temu
Morris Jobke
91c0923cce
Merge pull request #4663 from owncloud/fix-sticky-apps
fix issues caused by introduction of sticky Apps management footer
11 lat temu
Morris Jobke
a2f18eabb1
Merge pull request #4657 from owncloud/files-controls-fixes
Files controls fixes
11 lat temu
Morris Jobke
8a4acf263e
Merge pull request #4674 from owncloud/fit-filepicker-new-icons
Fit filesummary for \OC\Preview's new mimetype-icons
11 lat temu
Morris Jobke
1e501a8521
IE8 fixes
11 lat temu
kondou
e5fc7b9dbe
Merge branch 'master' into clean_up_util
Conflicts:
lib/base.php
11 lat temu
Bernhard Posselt
f038cb9aea
Merge pull request #4671 from owncloud/emptycontent
centers text message in empty-content page (files and files_trashbin apps)
11 lat temu
Jenkins for ownCloud
e68b5f8b0d
[tx-robot] updated from transifex
11 lat temu
Christopher
36424580b0
Merge pull request #4329 from owncloud/fix_4258
Fix #4258 and improve unittest
11 lat temu
kondou
2d6a400381
Check for $this->fileInfo and @depend on testData()
11 lat temu
Frank Karlitschek
c54994d2e9
fixing this obvious typo directly
11 lat temu
kondou
235638e5ab
Merge branch 'master' into fix_4258
Conflicts:
lib/image.php
11 lat temu
kondou
ebcd2a6b4d
Fit filesummary for \OC\Preview's ne mimetype-icons
11 lat temu
Frank Karlitschek
f1836a997f
remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future.
11 lat temu
Frank Karlitschek
a5633bb155
remove the config option that is no longer needed
11 lat temu
Frank Karlitschek
58e036e304
remove knowledgebase calls that are no longer used in ownCloud 5/6
11 lat temu
Alessandro Cosentino
b10a646bc8
rename emptyfolder to emptycontent
11 lat temu
Alessandro Cosentino
4b32d84314
text centered horizontally and vertically in emptycontent div
11 lat temu
Thomas Müller
92e90c8eb9
Merge pull request #4022 from owncloud/oc_preview
\OC\Preview
11 lat temu
Georg Ehrke
668c4c2652
fix issue with filetable background
11 lat temu
kondou
0869f9b655
Fix #4258, clean up \OC_Image and improve its unittest
11 lat temu
Georg Ehrke
8ef40277b2
Merge master into oc_preview
11 lat temu
Jan-Christoph Borchardt
0f5df181a3
Merge pull request #4661 from owncloud/separate-app-styles
Move CSS for apps and browser-specific fixes out of main styles.css
11 lat temu
Georg Ehrke
40cee5639e
use gerMimeTypeDetector detectPath instead of getMimeType
11 lat temu
Jenkins for ownCloud
dbc78b1a58
[tx-robot] updated from transifex
11 lat temu
Stephane Martin
95f42d6544
Merge pull request #4578 from houbaastef/master
fixes #4574
11 lat temu