Commit Graph

13338 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer e2c0fe8296 fix upload of multiple files 2013-09-06 18:16:40 +02:00
Jörn Friedrich Dreyer 238d92b11c refactor replace and autorename resolution in upload.php 2013-09-06 17:53:58 +02:00
Jörn Friedrich Dreyer 02d14aee17 completely remove dialog on cancel/continue 2013-09-06 16:50:45 +02:00
Jörn Friedrich Dreyer 4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
Pete McFarlane 83afba5070 prefix #filestable to tbody tr 2013-09-06 10:01:11 +01:00
Thomas Müller e9849270e3 Revert "fixes #4574"
This reverts commit 81a45cfcf1.
2013-09-06 00:28:13 +02:00
Bart Visscher 4629d6ad67 Merge pull request #4704 from owncloud/rename-lostpassword-controller
Use the namespaced variation of the classname.
2013-09-05 14:38:03 -07:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Jörn Friedrich Dreyer 03ddf8da80 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-05 10:31:43 +02:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
Bernhard Posselt fbedd643f7 Merge pull request #4477 from owncloud/hooks-view
also emit hooks for views that are a subfolder of the user folder
2013-09-04 16:09:22 -07:00
Thomas Müller 3b25babe35 Merge pull request #4683 from owncloud/publicuploadjserror
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
Thomas Müller e43e8b0db8 Merge branch 'master' into rename-lostpassword-controller
Conflicts:
	core/lostpassword/controller.php
2013-09-04 20:46:32 +02:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
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
2013-09-04 14:11:40 +02:00
Morris Jobke 09187f3b3b Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
2013-09-03 22:53:03 -07:00
Morris Jobke 6435e18e95 Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
Add previews to OC.dialogs.filepicker()
2013-09-03 22:35:58 -07:00
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
2013-09-03 06:27:08 -07:00
kondou d62c5063f4 Add previews to OC.dialogs.filepicker(); Fix #4697 2013-09-03 15:15:20 +02:00
Jörn Friedrich Dreyer 85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
2013-09-03 05:38:59 -07:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Jörn Friedrich Dreyer 449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment
This reverts commit 64d09452f5.
2013-09-03 13:20:20 +02:00
Jörn Friedrich Dreyer b0c6f990e4 use on to add event listener instead of deprecated jquery bind 2013-09-03 13:12:19 +02:00
Morris Jobke 84aba4542d Merge pull request #4702 from owncloud/center-utils
center utils
2013-09-03 02:27:52 -07:00
Morris Jobke 2da6f6b4ce Merge pull request #4695 from owncloud/placeholder-hsl
RGB -> HSL
2013-09-03 02:18:39 -07:00
Christopher a7de0e9652 Merge pull request #4706 from owncloud/fix_filepicker_mimetype
Use provided mimetype on open. Fix #4696
2013-09-02 19:36:03 -07:00
Thomas Tanghus 53a7f80ac3 Use provided mimetype on open. Fix #4696 2013-09-02 23:53:45 +02:00
blizzz 431cf06e99 Merge pull request #4672 from owncloud/ocs_cleanup
Ocs cleanup
2013-09-02 14:24:46 -07:00
Bart Visscher 5539b9e843 Use the namespaced variation of the classname. 2013-09-02 21:25:32 +02:00
Bernhard Posselt 87035fc478 center utils 2013-09-02 19:38:47 +02:00
Jan-Christoph Borchardt 9eeb27c91a placeholder.js: fix typo 2013-09-02 18:29:16 +02:00
Jan-Christoph Borchardt 57a1219ca0 placeholder.js: adjust saturation and lightness values 2013-09-02 18:20:18 +02:00
Owen Winkler f81a205f12 Merge pull request #4514 from owncloud/windows_ssl
Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config
2013-09-02 08:20:56 -07:00
Morris Jobke e7a14ea32d RGB -> HSL 2013-09-02 16:41:18 +02:00
ringmaster 39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 2013-09-02 09:59:01 -04:00
ringmaster df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 2013-09-02 09:59:00 -04:00
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.
2013-09-02 09:59:00 -04:00
Owen Winkler fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
Jörn Friedrich Dreyer 06870a6e39 Merge pull request #4673 from owncloud/ocsapi_cleanup
remove the activity call here. it is not implemented anyways.
2013-09-02 01:46:29 -07:00
Morris Jobke 91c0923cce Merge pull request #4663 from owncloud/fix-sticky-apps
fix issues caused by introduction of sticky Apps management footer
2013-09-02 01:11:09 -07:00
Morris Jobke a2f18eabb1 Merge pull request #4657 from owncloud/files-controls-fixes
Files controls fixes
2013-09-01 23:08:23 -07:00
Morris Jobke 8a4acf263e Merge pull request #4674 from owncloud/fit-filepicker-new-icons
Fit filesummary for \OC\Preview's new mimetype-icons
2013-09-01 23:06:59 -07:00
Morris Jobke 1e501a8521 IE8 fixes 2013-09-02 08:05:47 +02:00
kondou e5fc7b9dbe Merge branch 'master' into clean_up_util
Conflicts:
	lib/base.php
2013-09-02 07:58:06 +02:00
Bernhard Posselt f038cb9aea Merge pull request #4671 from owncloud/emptycontent
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
Jenkins for ownCloud e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
Christopher 36424580b0 Merge pull request #4329 from owncloud/fix_4258
Fix #4258 and improve unittest
2013-09-01 08:46:27 -07:00
Vincent Petry 307b673b79 Fixed public upload error that prevents upload
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.
2013-09-01 16:14:46 +02:00
kondou 2d6a400381 Check for $this->fileInfo and @depend on testData() 2013-09-01 15:50:58 +02:00