]>
source.dussan.org Git - nextcloud-server.git/log
Robin McCorkell [Wed, 23 Jul 2014 20:53:04 +0000 (21:53 +0100)]
Comment out mount_file config option
Prevents sample config issues with external storages. Fixes #9734
Thomas Müller [Wed, 23 Jul 2014 20:41:55 +0000 (22:41 +0200)]
Merge pull request #9815 from owncloud/update-preventupdatethroughcron
Prevent cron.php to trigger apps updating
Thomas Müller [Wed, 23 Jul 2014 19:35:54 +0000 (21:35 +0200)]
Merge pull request #9809 from owncloud/check-transaction-before-commit-migration-master
only commit in case a transaction is active
Vincent Petry [Wed, 23 Jul 2014 19:29:24 +0000 (21:29 +0200)]
Prevent cron.php to trigger apps updating
Thomas Müller [Wed, 23 Jul 2014 18:13:19 +0000 (20:13 +0200)]
only commit in case a transaction is active
Vincent Petry [Wed, 23 Jul 2014 16:39:12 +0000 (18:39 +0200)]
Merge pull request #9788 from owncloud/design-app-styles
Simplify app navigation look
icewind1991 [Wed, 23 Jul 2014 13:35:55 +0000 (15:35 +0200)]
Merge pull request #9789 from owncloud/external-share-root
Fix remote share when remote server is installed at the root
Robin Appelman [Wed, 23 Jul 2014 11:45:56 +0000 (13:45 +0200)]
Fix remote share when remote server is installed at the root
Jan-Christoph Borchardt [Wed, 23 Jul 2014 11:06:43 +0000 (13:06 +0200)]
fix settings entry width
Jan-Christoph Borchardt [Wed, 23 Jul 2014 11:02:35 +0000 (13:02 +0200)]
remove superfluous border from settings entry
Jan-Christoph Borchardt [Wed, 23 Jul 2014 10:59:40 +0000 (12:59 +0200)]
simplify app navigation look, remove superfluous border as it is distinguished enough via background color
Jenkins for ownCloud [Wed, 23 Jul 2014 05:54:36 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Sander [Tue, 22 Jul 2014 17:45:01 +0000 (19:45 +0200)]
Revert change
Sander [Tue, 22 Jul 2014 14:07:43 +0000 (16:07 +0200)]
Allow getAppFolder to get another apps path
cc @Raydiation
Thomas Müller [Tue, 22 Jul 2014 13:47:55 +0000 (15:47 +0200)]
Merge pull request #9772 from owncloud/fix-chunked-upload-master-2
adding special handling of checkPrecondition() for chunked upload
Thomas Müller [Tue, 22 Jul 2014 13:06:23 +0000 (15:06 +0200)]
Merge pull request #9738 from owncloud/remove-uneeded-strip
Remove uneeded strip_tags
Thomas Müller [Tue, 22 Jul 2014 11:06:20 +0000 (13:06 +0200)]
adding special handling of checkPrecondition() for chunked upload
Vincent Petry [Tue, 22 Jul 2014 08:11:00 +0000 (10:11 +0200)]
Merge pull request #9683 from owncloud/fix_#8819_sorting
Fix #8819 sorting
Jenkins for ownCloud [Tue, 22 Jul 2014 05:54:29 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Remco Brenninkmeijer [Mon, 21 Jul 2014 21:07:52 +0000 (23:07 +0200)]
Sorting triangles pointing up for ascending, down for descending
Vincent Petry [Mon, 21 Jul 2014 18:45:24 +0000 (20:45 +0200)]
Merge pull request #9750 from owncloud/issue/9745
Correctly use groups parameter only when its not empty
Joas Schilling [Mon, 21 Jul 2014 14:50:48 +0000 (16:50 +0200)]
Merge pull request #9757 from owncloud/issue/9756
Add language parameter to public API for getL10N()
Matthias Rieber [Tue, 15 Jul 2014 20:04:31 +0000 (22:04 +0200)]
use the minimum of configured session_livetime and session.gc_maxlifetime for session hearbeat interval calculation
Morris Jobke [Mon, 21 Jul 2014 13:18:40 +0000 (15:18 +0200)]
Merge pull request #9755 from owncloud/fix-webdav-attribute-permissions-master
perm -> permissions
Joas Schilling [Mon, 21 Jul 2014 12:50:34 +0000 (14:50 +0200)]
Add language parameter to public API for getL10N()
Fix #9756
Vincent Petry [Mon, 21 Jul 2014 12:22:11 +0000 (14:22 +0200)]
Merge pull request #9751 from owncloud/issue/9748
Fix username for subadmins and only send subadmin groups
Thomas Müller [Mon, 21 Jul 2014 11:39:01 +0000 (13:39 +0200)]
perm -> permissions
Vincent Petry [Mon, 21 Jul 2014 10:22:06 +0000 (12:22 +0200)]
Merge pull request #9406 from philfry/master
silently discard the response body, needed for apache/mod_dav and maybe ...
Joas Schilling [Mon, 21 Jul 2014 09:30:47 +0000 (11:30 +0200)]
Do not force isAdmin as true and so the list is filtered correctly
Joas Schilling [Mon, 21 Jul 2014 09:20:55 +0000 (11:20 +0200)]
Fix username for subadmins and only send subadmin groups
Fix #9748
Joas Schilling [Mon, 21 Jul 2014 08:43:29 +0000 (10:43 +0200)]
Correctly use groups parameter only when its not empty
Fix #9745
Jenkins for ownCloud [Mon, 21 Jul 2014 05:54:30 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sun, 20 Jul 2014 19:40:53 +0000 (21:40 +0200)]
Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master
check if $tables is an array
Andreas Fischer [Sun, 20 Jul 2014 19:29:16 +0000 (21:29 +0200)]
Merge pull request #9672 from owncloud/mysql-affectedrows
Make MySQL affected row count consistent with other DBMSes
* owncloud/mysql-affectedrows:
Added test of OCS privatedata to trigger key duplication
Document why we have to check with defined() first.
Make MySQL return "number of found rows" instead of number of "affected rows".
Morris Jobke [Sun, 20 Jul 2014 14:08:39 +0000 (16:08 +0200)]
Merge pull request #9732 from owncloud/fix-9716
do not show selected groups twice after user creation
Jenkins for ownCloud [Sun, 20 Jul 2014 05:54:40 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Sat, 19 Jul 2014 18:23:38 +0000 (20:23 +0200)]
check if $tables is an array
Lukas Reschke [Sat, 19 Jul 2014 08:17:24 +0000 (10:17 +0200)]
Remove uneeded `strip_tags`
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
Jenkins for ownCloud [Sat, 19 Jul 2014 05:54:42 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Andreas Fischer [Sat, 19 Jul 2014 00:16:28 +0000 (02:16 +0200)]
Extract Auth Header logic into new function handleAuthHeaders().
Andreas Fischer [Sat, 19 Jul 2014 00:06:37 +0000 (02:06 +0200)]
Deduplicate user/password extraction from alternative HTTP headers.
Arthur Schiwon [Fri, 18 Jul 2014 19:10:19 +0000 (21:10 +0200)]
$.unique works only for DOM elements
Vincent Petry [Fri, 18 Jul 2014 17:27:04 +0000 (19:27 +0200)]
Merge pull request #9700 from owncloud/ie8-fixes
[OC 7] IE8 styling fixes
Vincent Petry [Fri, 18 Jul 2014 17:19:33 +0000 (19:19 +0200)]
Merge pull request #9720 from owncloud/sftp-stream-wrapper-new-connection
Pass existing Net_SFTP object into Net_SFTP_Stream.
blizzz [Fri, 18 Jul 2014 17:15:36 +0000 (19:15 +0200)]
Merge pull request #9576 from owncloud/bcmath-check
LDAP Active Directory Primary Groups support depends on bcmath module
Vincent Petry [Thu, 17 Jul 2014 09:43:25 +0000 (11:43 +0200)]
Fixed IE8 style issues in files app
- fixed missing scrollbar in personal page
- fixed controls bar transparency: opaque white in IE8
- fixed files table borders in IE8
Andreas Fischer [Sat, 12 Jul 2014 20:45:53 +0000 (22:45 +0200)]
Pass existing Net_SFTP object into Net_SFTP_Stream.
blizzz [Fri, 18 Jul 2014 11:34:28 +0000 (13:34 +0200)]
Merge pull request #9718 from owncloud/sftp-early-login
SFTP: login() must be called after getServerPublicHostKey().
Jenkins for ownCloud [Fri, 18 Jul 2014 05:54:43 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Frank Karlitschek [Fri, 18 Jul 2014 01:54:46 +0000 (21:54 -0400)]
update appstore api url
Thomas Müller [Thu, 17 Jul 2014 20:40:59 +0000 (22:40 +0200)]
Merge pull request #9691 from owncloud/kill-too-long-index-master
Revert add-share-index
Remco Brenninkmeijer [Thu, 17 Jul 2014 19:31:54 +0000 (21:31 +0200)]
Before I get spanked ;)
Thomas Müller [Thu, 17 Jul 2014 07:32:51 +0000 (09:32 +0200)]
Revert "add share index"
This reverts commit
e19b3a8794a2cadc86b0f3b01a516814b600026b .
Remco Brenninkmeijer [Thu, 17 Jul 2014 18:27:55 +0000 (20:27 +0200)]
Adjusted tests for new default sorting
Thomas Müller [Thu, 17 Jul 2014 15:17:58 +0000 (17:17 +0200)]
Merge pull request #9710 from owncloud/fix-failing-unit-test-on-MapperTestUtility.php-master
kill unused require of MapperTestUtility.php
blizzz [Thu, 17 Jul 2014 14:42:19 +0000 (16:42 +0200)]
Merge pull request #9705 from owncloud/ie8-userspagefix
Fixed JS and CSS issues in users page
Thomas Müller [Thu, 17 Jul 2014 14:35:00 +0000 (16:35 +0200)]
kill unused require of MapperTestUtility.php
Vincent Petry [Fri, 2 May 2014 11:21:31 +0000 (13:21 +0200)]
Added test of OCS privatedata to trigger key duplication
Vincent Petry [Thu, 17 Jul 2014 11:17:07 +0000 (13:17 +0200)]
Merge pull request #9668 from owncloud/enc_fix_folder_move
[encryption] update keys recursively if a folder was moved
Vincent Petry [Thu, 17 Jul 2014 11:13:03 +0000 (13:13 +0200)]
Fixed JS and CSS issues in users page
- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
Remco Brenninkmeijer [Thu, 17 Jul 2014 11:05:58 +0000 (13:05 +0200)]
While busy cleaning, also removed extra enters
Remco Brenninkmeijer [Thu, 17 Jul 2014 10:48:50 +0000 (12:48 +0200)]
Corrected (Netbeans?) inserted spaces
Thomas Müller [Thu, 17 Jul 2014 10:42:39 +0000 (12:42 +0200)]
Merge pull request #9696 from owncloud/fix-appframework-test-namespaces-master
fixing namespace of MapperTestUtility
Thomas Müller [Thu, 17 Jul 2014 09:21:25 +0000 (11:21 +0200)]
fixing namespace of MapperTestUtility
and rename file to be lowercase
Bjoern Schiessle [Wed, 16 Jul 2014 14:04:56 +0000 (16:04 +0200)]
check that the file proxies are enabled after each test
Bjoern Schiessle [Wed, 16 Jul 2014 11:30:58 +0000 (13:30 +0200)]
update keys recursively if a folder was moved
Thomas Müller [Thu, 17 Jul 2014 08:56:47 +0000 (10:56 +0200)]
Merge pull request #9694 from owncloud/fix-failing-tests
fix syntax
Morris Jobke [Thu, 17 Jul 2014 07:51:44 +0000 (09:51 +0200)]
fix syntax
Vincent Petry [Thu, 17 Jul 2014 07:19:17 +0000 (09:19 +0200)]
Merge pull request #9682 from owncloud/mappedlocal-rename
Fix renaming files in the root folder of a MappedLocal storage
Jenkins for ownCloud [Thu, 17 Jul 2014 05:55:09 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Remco Brenninkmeijer [Wed, 16 Jul 2014 20:53:14 +0000 (22:53 +0200)]
Fixed comments from PVince81
Morris Jobke [Wed, 16 Jul 2014 20:44:00 +0000 (22:44 +0200)]
Merge pull request #9517 from brantje/Add-webapp-meta-tags
Add webapp support
Remco Brenninkmeijer [Wed, 16 Jul 2014 20:08:03 +0000 (22:08 +0200)]
Cleanup of unnecesary addition
Remco Brenninkmeijer [Wed, 16 Jul 2014 19:52:08 +0000 (21:52 +0200)]
Show sorting icons when hovering over
Robin Appelman [Wed, 16 Jul 2014 19:24:18 +0000 (21:24 +0200)]
Fix renaming files in the root folder of a MappedLocal storage
Björn Schießle [Wed, 16 Jul 2014 14:55:17 +0000 (16:55 +0200)]
Merge pull request #9654 from owncloud/enctest-fileproxydisabledfix
Reenable proxies if a test failed to restore it
Vincent Petry [Wed, 16 Jul 2014 14:52:08 +0000 (16:52 +0200)]
Merge pull request #9653 from owncloud/fix-9590
external storage table layout fixes
icewind1991 [Wed, 16 Jul 2014 14:06:14 +0000 (16:06 +0200)]
Merge pull request #9550 from kofemann/dcache-fixes-for-upstream
storage: do not check file mode on rename
Björn Schießle [Wed, 16 Jul 2014 13:31:20 +0000 (15:31 +0200)]
Merge pull request #9662 from owncloud/enc_error_handling_master
[encryption] improved error handling
Andreas Fischer [Wed, 16 Jul 2014 13:06:59 +0000 (15:06 +0200)]
Document why we have to check with defined() first.
Robin McCorkell [Wed, 16 Jul 2014 12:42:12 +0000 (13:42 +0100)]
Merge pull request #9647 from owncloud/files_external_multiuser_tests
Add unit test for multi-user configuration loading
Morris Jobke [Wed, 16 Jul 2014 12:39:48 +0000 (14:39 +0200)]
Merge pull request #9664 from owncloud/enc-removelegacytests
[OC8] Removed legacy encryption tests
Andreas Fischer [Wed, 16 Jul 2014 12:35:47 +0000 (14:35 +0200)]
Make MySQL return "number of found rows" instead of number of "affected rows".
Morris Jobke [Wed, 16 Jul 2014 12:30:58 +0000 (14:30 +0200)]
fix CSS coding style
Morris Jobke [Wed, 16 Jul 2014 12:25:48 +0000 (14:25 +0200)]
Merge pull request #9661 from owncloud/share-ownerdisplaynamefix
Correctly return the owner display name for children of shares
Vincent Petry [Wed, 16 Jul 2014 10:38:41 +0000 (12:38 +0200)]
Removed legacy encryption tests
Bjoern Schiessle [Wed, 16 Jul 2014 10:06:00 +0000 (12:06 +0200)]
introduce some encryption exceptions and catch additional error cases
Stephan Peijnik [Fri, 11 Jul 2014 05:12:04 +0000 (07:12 +0200)]
Port of #9584
Fixes #9583
lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Fix indentation.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Renamed $grp to $group in foreach loop.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Use is_null() instead of empty() when checking the return value of GroupManager::get().
Additionally, $grp was renamed to $group inside
\OC\Group\MetaData::fetchGroups().
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Updated code to reflect changes introduced to \OC\Group\MetaData.
Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Bjoern Schiessle [Wed, 16 Jul 2014 09:46:13 +0000 (11:46 +0200)]
make sure that the crypt library is loaded
Vincent Petry [Wed, 16 Jul 2014 10:07:02 +0000 (12:07 +0200)]
Correctly return the owner display name for children of shares
Björn Schießle [Wed, 16 Jul 2014 08:12:52 +0000 (10:12 +0200)]
Merge pull request #9640 from owncloud/fix_9627
make sure that 'OC_Theme' exists before checking if the method exists
Jenkins for ownCloud [Wed, 16 Jul 2014 05:55:55 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Tue, 15 Jul 2014 21:57:02 +0000 (23:57 +0200)]
Merge pull request #9644 from owncloud/fix_user_api
Fix user api
Vincent Petry [Tue, 15 Jul 2014 21:05:01 +0000 (23:05 +0200)]
Reenable proxies if a test failed to restore it
Stephane V [Tue, 15 Jul 2014 20:33:30 +0000 (22:33 +0200)]
Fix #9590. Fix #9612.
For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters.
The rows of the table are now always visible until the end (the trash icon is accessible).
(Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.)
blizzz [Tue, 15 Jul 2014 17:49:36 +0000 (19:49 +0200)]
Merge pull request #9540 from owncloud/use_fileinfo_in_search_results
use fileinfo object in search results
Robin McCorkell [Tue, 15 Jul 2014 17:39:09 +0000 (18:39 +0100)]
Add unit test for multi-user configuration loading
blizzz [Tue, 15 Jul 2014 17:10:01 +0000 (19:10 +0200)]
Merge pull request #9628 from edozzo/master
Userlist: async load doesnt fill checked group/subadmin array
Bjoern Schiessle [Tue, 15 Jul 2014 13:39:44 +0000 (15:39 +0200)]
make sure that 'OC_Theme' exists before checking if the method exists
Jörn Friedrich Dreyer [Tue, 15 Jul 2014 15:42:17 +0000 (17:42 +0200)]
use UserSession service to resolve user id