]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Fri, 13 Sep 2013 21:31:59 +0000 (23:31 +0200)]
Merge branch 'master' into appframework-master
Thomas Müller [Fri, 13 Sep 2013 21:31:11 +0000 (14:31 -0700)]
Merge pull request #4712 from owncloud/fileapi-foreward
Provide an implementation of the fileapi for oc6 build on top of the old api
Thomas Müller [Fri, 13 Sep 2013 19:44:31 +0000 (21:44 +0200)]
- giving the user a new id for each test run in order to prevent reuse of e.g. permissions data in the database
- setting the current user id because \OC\FilesView relies on \OC_User::getUser()
Thomas Müller [Fri, 13 Sep 2013 18:57:18 +0000 (20:57 +0200)]
Merge branch 'appframework-master' of github.com:owncloud/core into appframework-master
Thomas Müller [Fri, 13 Sep 2013 18:56:49 +0000 (20:56 +0200)]
Merge branch 'master' into appframework-master
Thomas Müller [Fri, 13 Sep 2013 17:29:35 +0000 (10:29 -0700)]
Merge pull request #4840 from owncloud/adding-tb-master
adding TB and GB to OC_Helper::humanFileSize
Thomas Müller [Fri, 13 Sep 2013 15:41:09 +0000 (17:41 +0200)]
remove unused OC_L10N
Thomas Müller [Fri, 13 Sep 2013 15:22:45 +0000 (17:22 +0200)]
adding TB and GB to OC_Helper::humanFileSize
ringmaster [Thu, 12 Sep 2013 14:50:26 +0000 (10:50 -0400)]
Allow numeric group names
Thomas Müller [Thu, 12 Sep 2013 22:44:20 +0000 (15:44 -0700)]
Merge pull request #4719 from owncloud/port_4701_master
Always check variable type before using readdir to avoid surprises
Robin Appelman [Thu, 12 Sep 2013 19:58:32 +0000 (21:58 +0200)]
cleanup public storage interface a bit
Robin Appelman [Thu, 12 Sep 2013 19:43:35 +0000 (21:43 +0200)]
Merge branch 'master' into fileapi-foreward
Jan-Christoph Borchardt [Thu, 12 Sep 2013 14:48:00 +0000 (07:48 -0700)]
Merge pull request #4816 from owncloud/fixing-723-master
Fixing 723 master
Thomas Tanghus [Thu, 12 Sep 2013 00:18:04 +0000 (17:18 -0700)]
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
Thomas Müller [Wed, 11 Sep 2013 22:40:35 +0000 (00:40 +0200)]
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
Thomas Müller [Wed, 11 Sep 2013 22:39:52 +0000 (00:39 +0200)]
added determineIcon to \OCA\files\lib\Helper
Thomas Müller [Wed, 11 Sep 2013 22:39:03 +0000 (00:39 +0200)]
remove unused $relativePath
kondou [Wed, 11 Sep 2013 22:21:01 +0000 (00:21 +0200)]
Clean up rawlist.php and fix non-array request
Thomas Müller [Wed, 11 Sep 2013 22:13:19 +0000 (00:13 +0200)]
move icon generation logic out of the template
Thomas Müller [Wed, 11 Sep 2013 22:12:20 +0000 (00:12 +0200)]
adding icons for shared folders and external folders
Thomas Tanghus [Wed, 11 Sep 2013 19:20:17 +0000 (12:20 -0700)]
Merge pull request #4784 from owncloud/ocdialog_option_setter
Fix setting ocdialog options after initialization.
Thomas Tanghus [Wed, 11 Sep 2013 15:13:39 +0000 (17:13 +0200)]
Fix double destroy on escape.
VicDeo [Wed, 11 Sep 2013 12:58:07 +0000 (05:58 -0700)]
Merge pull request #4798 from owncloud/fixing-variable-typos-master
no further comment - which dev did not test this BEFORE submitting the p...
Jenkins for ownCloud [Wed, 11 Sep 2013 10:50:06 +0000 (06:50 -0400)]
[tx-robot] updated from transifex
kondou [Wed, 11 Sep 2013 10:12:40 +0000 (12:12 +0200)]
Split some lines, use ===, avoid unnecessary operation
Bart Visscher [Wed, 11 Sep 2013 07:01:55 +0000 (00:01 -0700)]
Merge pull request #4788 from owncloud/fixin-irods-session-master
Fixing session handling in iRODS
Thomas Müller [Tue, 10 Sep 2013 23:23:37 +0000 (01:23 +0200)]
no further comment - which dev did not test this BEFORE submitting the pull request?
which reviewer did not test the pull request?
Thomas Müller [Tue, 10 Sep 2013 23:11:57 +0000 (01:11 +0200)]
never hack late night
Thomas Müller [Tue, 10 Sep 2013 22:49:45 +0000 (00:49 +0200)]
fixing boolean handling
Robin Appelman [Tue, 10 Sep 2013 20:21:49 +0000 (22:21 +0200)]
adjust test cases to namespace changes
Andreas Fischer [Tue, 10 Sep 2013 19:48:56 +0000 (21:48 +0200)]
Merge pull request #4472 from owncloud/remove-disconnect
Remove disconnect function from OC_DB
* owncloud/remove-disconnect:
Remove disconnect function from OC_DB
Robin Appelman [Tue, 10 Sep 2013 18:13:47 +0000 (20:13 +0200)]
add storage backend interface to public namespace
Robin Appelman [Tue, 10 Sep 2013 18:02:15 +0000 (20:02 +0200)]
improve phpdoc for the public files interface
Robin Appelman [Tue, 10 Sep 2013 17:44:23 +0000 (19:44 +0200)]
move filesystem expceptions to global namespace
Robin Appelman [Tue, 10 Sep 2013 17:34:38 +0000 (19:34 +0200)]
move public files api to a clearer namespace
Jenkins for ownCloud [Tue, 10 Sep 2013 14:42:16 +0000 (10:42 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 10 Sep 2013 11:53:22 +0000 (04:53 -0700)]
Merge pull request #4787 from owncloud/fixing-php-end-tags-irods-master
Fixing php end tags irods master
Thomas Müller [Tue, 10 Sep 2013 10:35:14 +0000 (12:35 +0200)]
proper test for use_logon_credentials
Thomas Müller [Tue, 10 Sep 2013 10:34:41 +0000 (12:34 +0200)]
use \OC::$session instead of $_SESSION
Thomas Müller [Tue, 10 Sep 2013 09:25:40 +0000 (11:25 +0200)]
removing all ?> jutt in case
Thomas Müller [Tue, 10 Sep 2013 09:16:43 +0000 (11:16 +0200)]
removing ?> followed by whitespaces
Thomas Müller [Tue, 10 Sep 2013 08:22:25 +0000 (01:22 -0700)]
Merge pull request #4647 from owncloud/fix_4619
Workaround for IE 9 & 10 for clicking filelist after adding new item
Thomas Tanghus [Tue, 10 Sep 2013 01:25:37 +0000 (18:25 -0700)]
Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
Fixed missing checkboxes in IE8
Thomas Tanghus [Mon, 9 Sep 2013 22:25:07 +0000 (00:25 +0200)]
Remove console logging
Thomas Tanghus [Mon, 9 Sep 2013 22:21:42 +0000 (00:21 +0200)]
Fix setting ocdialog options after initialization.
Thomas Müller [Mon, 9 Sep 2013 22:08:18 +0000 (15:08 -0700)]
Merge pull request #4757 from owncloud/deleteAll-alias
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
Thomas Müller [Mon, 9 Sep 2013 19:32:45 +0000 (12:32 -0700)]
Merge pull request #4772 from owncloud/preview_improvements
oc\preview use avconv instead of ffmpeg
Jenkins for ownCloud [Mon, 9 Sep 2013 01:37:53 +0000 (21:37 -0400)]
[tx-robot] updated from transifex
Vincent Petry [Wed, 4 Sep 2013 19:32:45 +0000 (21:32 +0200)]
Fixed missing checkboxes in IE8
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.
Replace it with a more compatible selector.
Christopher [Sun, 8 Sep 2013 12:50:41 +0000 (05:50 -0700)]
Merge pull request #4761 from owncloud/fix_language_selection-kondou
Fix language selection
kondou [Sat, 7 Sep 2013 14:28:51 +0000 (16:28 +0200)]
Fix language selection; Fix #4756
Robin Appelman [Sat, 7 Sep 2013 12:10:51 +0000 (14:10 +0200)]
change View->deleteAll to an alias of View->rmdir since rmdir works recursive
Jenkins for ownCloud [Sat, 7 Sep 2013 08:46:57 +0000 (04:46 -0400)]
[tx-robot] updated from transifex
Robin Appelman [Fri, 6 Sep 2013 18:55:47 +0000 (20:55 +0200)]
update phpdoc for public fileapi
Robin Appelman [Fri, 6 Sep 2013 18:38:59 +0000 (20:38 +0200)]
extract interfaces from fileapi for public namespace
Robin Appelman [Fri, 6 Sep 2013 18:20:17 +0000 (20:20 +0200)]
use ===
Bjoern Schiessle [Fri, 6 Sep 2013 08:58:42 +0000 (10:58 +0200)]
remove some more debug output
Bjoern Schiessle [Thu, 5 Sep 2013 09:50:36 +0000 (11:50 +0200)]
remove some error_logs
Bjoern Schiessle [Thu, 5 Sep 2013 09:45:36 +0000 (11:45 +0200)]
remove error logs
Bjoern Schiessle [Thu, 5 Sep 2013 08:11:09 +0000 (10:11 +0200)]
coding style fixes
Bjoern Schiessle [Thu, 5 Sep 2013 08:08:13 +0000 (10:08 +0200)]
if the files doesn't exist yet we start with the parent to search for shares
Bjoern Schiessle [Wed, 4 Sep 2013 19:15:06 +0000 (21:15 +0200)]
fix part file handling and real size calculation, this should also solve #4581
Conflicts:
apps/files_encryption/lib/stream.php
Bjoern Schiessle [Tue, 27 Aug 2013 14:29:54 +0000 (16:29 +0200)]
check shares for the real file and not for the .part file
Bjoern Schiessle [Tue, 27 Aug 2013 12:19:30 +0000 (14:19 +0200)]
first check if a extension exists before comparing it
Bjoern Schiessle [Thu, 22 Aug 2013 15:55:10 +0000 (17:55 +0200)]
handle part files correctly
kondou [Fri, 6 Sep 2013 11:33:17 +0000 (13:33 +0200)]
Use shorter array-conversion
Pete McFarlane [Fri, 6 Sep 2013 09:01:11 +0000 (10:01 +0100)]
prefix #filestable to tbody tr
kondou [Fri, 6 Sep 2013 04:44:49 +0000 (06:44 +0200)]
Use usort() instead of uasort() to not maintain keys
Thomas Müller [Thu, 5 Sep 2013 22:28:13 +0000 (00:28 +0200)]
Revert "fixes #4574"
This reverts commit
81a45cfcf1c7064615429bb3f9759e9455868614 .
Bart Visscher [Thu, 5 Sep 2013 21:38:03 +0000 (14:38 -0700)]
Merge pull request #4704 from owncloud/rename-lostpassword-controller
Use the namespaced variation of the classname.
kondou [Thu, 5 Sep 2013 21:17:53 +0000 (23:17 +0200)]
Sort files by name, not by mimetype
kondou [Thu, 5 Sep 2013 16:40:55 +0000 (18:40 +0200)]
Only use mimetype_list and clean up a bit
kondou [Thu, 5 Sep 2013 14:54:12 +0000 (16:54 +0200)]
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
Jenkins for ownCloud [Thu, 5 Sep 2013 11:37:32 +0000 (07:37 -0400)]
[tx-robot] updated from transifex
Arthur Schiwon [Thu, 5 Sep 2013 09:58:57 +0000 (11:58 +0200)]
more is_resource checks before readdir
Georg Ehrke [Thu, 5 Sep 2013 07:53:35 +0000 (09:53 +0200)]
use avconv instead of ffmpeg
Bernhard Posselt [Wed, 4 Sep 2013 23:09:22 +0000 (16:09 -0700)]
Merge pull request #4477 from owncloud/hooks-view
also emit hooks for views that are a subfolder of the user folder
Thomas Müller [Wed, 4 Sep 2013 21:45:11 +0000 (23:45 +0200)]
adding public interface for preview
Thomas Müller [Wed, 4 Sep 2013 21:15:17 +0000 (23:15 +0200)]
Merge branch 'master' into appframework-master
Thomas Müller [Wed, 4 Sep 2013 18:50:38 +0000 (11:50 -0700)]
Merge pull request #4683 from owncloud/publicuploadjserror
Fixed public upload error that prevents upload
Thomas Müller [Wed, 4 Sep 2013 18:46:32 +0000 (20:46 +0200)]
Merge branch 'master' into rename-lostpassword-controller
Conflicts:
core/lostpassword/controller.php
Arthur Schiwon [Wed, 4 Sep 2013 11:06:04 +0000 (13:06 +0200)]
Always check variable type before using readdir to avoid surprises
Morris Jobke [Wed, 4 Sep 2013 05:53:03 +0000 (22:53 -0700)]
Merge pull request #4449 from owncloud/clean_up_util
Clean up \OC\Util
Morris Jobke [Wed, 4 Sep 2013 05:35:58 +0000 (22:35 -0700)]
Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepicker
Add previews to OC.dialogs.filepicker()
Christopher [Tue, 3 Sep 2013 13:27:08 +0000 (06:27 -0700)]
Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bind
use on to add event listener instead of deprecated jquery bind
kondou [Tue, 3 Sep 2013 13:15:20 +0000 (15:15 +0200)]
Add previews to OC.dialogs.filepicker(); Fix #4697
Jörn Friedrich Dreyer [Tue, 3 Sep 2013 12:38:59 +0000 (05:38 -0700)]
Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
Jenkins for ownCloud [Tue, 3 Sep 2013 11:46:55 +0000 (07:46 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Tue, 3 Sep 2013 11:17:16 +0000 (13:17 +0200)]
Revert "remove editor div in filelist", add "is deprecated" comment
This reverts commit
64d09452f55c0c73fe0d55a70f82d8ad7a386d7c .
Jörn Friedrich Dreyer [Tue, 3 Sep 2013 11:12:19 +0000 (13:12 +0200)]
use on to add event listener instead of deprecated jquery bind
Morris Jobke [Tue, 3 Sep 2013 09:27:52 +0000 (02:27 -0700)]
Merge pull request #4702 from owncloud/center-utils
center utils
Morris Jobke [Tue, 3 Sep 2013 09:18:39 +0000 (02:18 -0700)]
Merge pull request #4695 from owncloud/placeholder-hsl
RGB -> HSL
Christopher [Tue, 3 Sep 2013 02:36:03 +0000 (19:36 -0700)]
Merge pull request #4706 from owncloud/fix_filepicker_mimetype
Use provided mimetype on open. Fix #4696
Thomas Tanghus [Mon, 2 Sep 2013 21:53:45 +0000 (23:53 +0200)]
Use provided mimetype on open. Fix #4696
blizzz [Mon, 2 Sep 2013 21:24:46 +0000 (14:24 -0700)]
Merge pull request #4672 from owncloud/ocs_cleanup
Ocs cleanup
Bart Visscher [Mon, 2 Sep 2013 19:22:18 +0000 (21:22 +0200)]
Use the namespaced variation of the classname.
Bernhard Posselt [Mon, 2 Sep 2013 17:38:47 +0000 (19:38 +0200)]
center utils
Jan-Christoph Borchardt [Mon, 2 Sep 2013 16:29:16 +0000 (18:29 +0200)]
placeholder.js: fix typo
Jan-Christoph Borchardt [Mon, 2 Sep 2013 16:20:18 +0000 (18:20 +0200)]
placeholder.js: adjust saturation and lightness values
Owen Winkler [Mon, 2 Sep 2013 15:20:56 +0000 (08:20 -0700)]
Merge pull request #4514 from owncloud/windows_ssl
Allow Windows (or Linux) users to specify OpenSSL options in the ownCloud config