]>
source.dussan.org Git - nextcloud-server.git/log
Raghu Nayyar [Thu, 26 Jun 2014 17:15:40 +0000 (22:45 +0530)]
Merge pull request #9234 from owncloud/fix-ellipsis-for-folders
Fix ellipsis for folders on mobile screens
Thomas Müller [Thu, 26 Jun 2014 15:20:09 +0000 (17:20 +0200)]
Merge pull request #9230 from owncloud/fix-repair-step-php-53
Redeclared as public to allow invocation from within the closure in php ...
Vincent Petry [Thu, 26 Jun 2014 15:10:42 +0000 (17:10 +0200)]
Merge pull request #9213 from owncloud/upgrade-donotloadappsinremote
Prevent loading apps in remote when an upgrade is due
Vincent Petry [Thu, 26 Jun 2014 15:03:23 +0000 (17:03 +0200)]
Merge pull request #9206 from owncloud/occ-scan-user
Prevent running the files:scan command as the wrong user
icewind1991 [Thu, 26 Jun 2014 15:01:39 +0000 (17:01 +0200)]
Merge pull request #9223 from owncloud/occ-scan-arguments
Add error message when no users specified to files:scan command
Morris Jobke [Thu, 26 Jun 2014 14:37:34 +0000 (16:37 +0200)]
Fix ellipsis for folders on mobile screens
* fixes #9162
Jan-Christoph Borchardt [Thu, 26 Jun 2014 14:23:39 +0000 (16:23 +0200)]
Merge pull request #9211 from owncloud/fix-hidden-share-button
Fix hidden share button and checkbox layout
Vincent Petry [Thu, 26 Jun 2014 13:52:12 +0000 (15:52 +0200)]
Merge pull request #9210 from owncloud/better_validation_in_getAppPath
better validation for OC_App::getAppPath()
Björn Schießle [Thu, 26 Jun 2014 13:11:08 +0000 (15:11 +0200)]
Merge pull request #9171 from owncloud/enc_always_use_oc_view
[encryption] always use oc view
Thomas Müller [Thu, 26 Jun 2014 12:27:41 +0000 (14:27 +0200)]
Redeclared as public to allow invocation from within the closure in php 5.3
Vincent Petry [Thu, 26 Jun 2014 09:58:38 +0000 (11:58 +0200)]
Add error message when no users specified to files:scan command
Björn Schießle [Thu, 26 Jun 2014 08:26:24 +0000 (10:26 +0200)]
Merge pull request #9193 from owncloud/sharing_etag_propagation
make sure that the etags get propagated correctly
Jenkins for ownCloud [Thu, 26 Jun 2014 05:54:40 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Frank Karlitschek [Wed, 25 Jun 2014 23:01:52 +0000 (19:01 -0400)]
7.0 beta 1
Vincent Petry [Wed, 25 Jun 2014 17:59:39 +0000 (19:59 +0200)]
Merge pull request #9205 from owncloud/remoteshare-fixurlpath
Fix parsing of remote URL when mounting remote shares
Vincent Petry [Wed, 25 Jun 2014 16:17:17 +0000 (18:17 +0200)]
Prevent loading apps in remote when an upgrade is due
VicDeo [Wed, 25 Jun 2014 15:52:56 +0000 (18:52 +0300)]
Merge pull request #9194 from owncloud/revertloadapps
Bring back loadApps() in base.php
Morris Jobke [Wed, 25 Jun 2014 14:32:24 +0000 (16:32 +0200)]
Fix hidden share button and checkbox layout
fixes #9101
Morris Jobke [Wed, 25 Jun 2014 14:28:52 +0000 (16:28 +0200)]
Merge pull request #9202 from owncloud/urlhashfix
Do not clear URL hash when no external mount params given
Georg Ehrke [Wed, 25 Jun 2014 14:24:55 +0000 (16:24 +0200)]
better validation for OC_App::getAppPath()
Robin Appelman [Wed, 25 Jun 2014 13:22:49 +0000 (15:22 +0200)]
Prevent running the files:scan command as the wrong user
Bjoern Schiessle [Wed, 25 Jun 2014 13:20:52 +0000 (15:20 +0200)]
make sure that hooks are registered for the tests
Vincent Petry [Wed, 25 Jun 2014 12:53:31 +0000 (14:53 +0200)]
Fix parsing of remote URL when mounting remote shares
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud".
Such URLs are now parsed correctly.
Added unit test for URL parsing.
icewind1991 [Wed, 25 Jun 2014 13:09:58 +0000 (15:09 +0200)]
Merge pull request #9123 from owncloud/webdav-move-permissions
Fix permissions check when moving a file to a different directory over webdav
icewind1991 [Wed, 25 Jun 2014 13:01:34 +0000 (15:01 +0200)]
Merge pull request #9189 from owncloud/sharing_fix_permissions
Sharing fix permissions
Robin Appelman [Wed, 25 Jun 2014 11:00:11 +0000 (13:00 +0200)]
really always take root of the substorage
Bjoern Schiessle [Wed, 25 Jun 2014 10:38:26 +0000 (12:38 +0200)]
fix unit tests
Vincent Petry [Wed, 25 Jun 2014 10:37:11 +0000 (12:37 +0200)]
Fix parsing URL hash when no "?" was specified
Jenkins for ownCloud [Wed, 25 Jun 2014 10:33:53 +0000 (06:33 -0400)]
[tx-robot] updated from transifex
Bjoern Schiessle [Mon, 23 Jun 2014 15:13:56 +0000 (17:13 +0200)]
always use a \OC\Files\View
Bjoern Schiessle [Mon, 23 Jun 2014 14:14:52 +0000 (16:14 +0200)]
always use oc filesystem for rename operation
Vincent Petry [Wed, 25 Jun 2014 10:24:46 +0000 (12:24 +0200)]
Do not clear URL hash when no external mount params given
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.
In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9
Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
Bjoern Schiessle [Tue, 24 Jun 2014 15:04:27 +0000 (17:04 +0200)]
make sure that during share and unshare the etags get propagated correctly
Arthur Schiwon [Wed, 25 Jun 2014 09:42:15 +0000 (11:42 +0200)]
adjust access constructor to master
Arthur Schiwon [Wed, 11 Jun 2014 11:35:35 +0000 (13:35 +0200)]
Port of LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups #9002
fix PHPdoc
Conflicts:
apps/user_ldap/lib/connection.php
add method to count groups on LDAP
Conflicts:
apps/user_ldap/lib/access.php
LDAP Wizard: count users and groups with the power of paged search
Conflicts:
apps/user_ldap/lib/wizard.php
consolidate requirement check
fix PHPdoc
Conflicts:
apps/user_ldap/lib/access.php
Wizard: get really all groups from LDAP by power of Paged Search
Conflicts:
apps/user_ldap/lib/wizard.php
make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state.
Conflicts:
apps/user_ldap/lib/connection.php
simplify two methods a bit, because they are not used for group search anymore
Conflicts:
apps/user_ldap/lib/wizard.php
remove unused vars; increase scrutinizer happiness
blizzz [Tue, 24 Jun 2014 18:58:35 +0000 (20:58 +0200)]
Merge pull request #9145 from owncloud/everyonecount
Enhancement: Displays users and admin count in the Users Management.
Bjoern Schiessle [Tue, 24 Jun 2014 16:53:51 +0000 (18:53 +0200)]
always take root of the substorage
Vincent Petry [Tue, 24 Jun 2014 16:18:14 +0000 (18:18 +0200)]
Merge pull request #9168 from owncloud/files-phpwarningondelete
Remove warning when deleting all entries
Vincent Petry [Tue, 24 Jun 2014 15:48:17 +0000 (17:48 +0200)]
Merge pull request #9180 from owncloud/fix-error-on.update-page
fixes the layout for error messages on the update page
Vincent Petry [Tue, 24 Jun 2014 15:37:58 +0000 (17:37 +0200)]
Bring back loadApps() in base.php
loadApps() had been deleted by mistake in
799205488cf82312586f99185e13df6015caa2ff
Morris Jobke [Tue, 24 Jun 2014 14:37:42 +0000 (16:37 +0200)]
Merge pull request #9181 from owncloud/enc_recursive_mkdir
always use '/' as directory seperator
Bjoern Schiessle [Tue, 24 Jun 2014 12:00:15 +0000 (14:00 +0200)]
add/update unit tests
Bjoern Schiessle [Tue, 24 Jun 2014 11:55:04 +0000 (13:55 +0200)]
only the mount point has delete and update permissions to enable rename operation
Bjoern Schiessle [Tue, 24 Jun 2014 11:39:37 +0000 (13:39 +0200)]
make sure that we always return the correct permissions
Bjoern Schiessle [Tue, 24 Jun 2014 08:43:07 +0000 (10:43 +0200)]
add unit tests
Bjoern Schiessle [Tue, 24 Jun 2014 07:29:11 +0000 (09:29 +0200)]
always use '/' as directory seperator
Morris Jobke [Tue, 24 Jun 2014 06:39:43 +0000 (08:39 +0200)]
fixes the layout for error messages on the update page
Jenkins for ownCloud [Tue, 24 Jun 2014 05:54:39 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 23 Jun 2014 21:20:04 +0000 (23:20 +0200)]
Merge pull request #9074 from geez0x1/master
Update the modified date in UI on file reversion
Thomas Müller [Mon, 23 Jun 2014 21:18:10 +0000 (23:18 +0200)]
Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master
fix recursion on rmdirr
Thomas Müller [Mon, 23 Jun 2014 21:15:30 +0000 (23:15 +0200)]
update PHPDoc $fileInfo is a SplFileInfo
Lukas Reschke [Mon, 23 Jun 2014 20:48:46 +0000 (22:48 +0200)]
Merge pull request #9170 from owncloud/files-renamevalidationblur
Fix blurring of invalid file name on rename
raghunayyar [Mon, 23 Jun 2014 19:20:36 +0000 (00:50 +0530)]
Better Logic to display user count for everyone.
Joas Schilling [Mon, 23 Jun 2014 16:10:08 +0000 (18:10 +0200)]
Merge if statements
Joas Schilling [Mon, 23 Jun 2014 16:02:57 +0000 (18:02 +0200)]
Merge pull request #9159 from owncloud/enabledapp-cache-loggedin
Only cache enabled apps when logged in
Vincent Petry [Mon, 23 Jun 2014 15:05:35 +0000 (17:05 +0200)]
Merge pull request #9124 from owncloud/move-permissions
Fix moving files into read only public shares
Vincent Petry [Mon, 23 Jun 2014 14:48:25 +0000 (16:48 +0200)]
Added unit test for the helper's rmdirr
Vincent Petry [Mon, 23 Jun 2014 14:35:11 +0000 (16:35 +0200)]
Fix blurring of invalid file name on rename
When renaming to an existing file name, blurring the field should not
remove it.
This fix keeps the field until escape is pressed instead of replacing it
with a broken empty space.
Vincent Petry [Mon, 23 Jun 2014 13:57:45 +0000 (15:57 +0200)]
Remove warning when deleting all entries
When deleting all entries, only "allfiles" is defined but not "file" or
"files", which caused a PHP warning to be logged.
Vincent Petry [Mon, 23 Jun 2014 13:53:23 +0000 (15:53 +0200)]
Merge pull request #8931 from owncloud/filelist-usepathforaction
[master] Use actual file path on rename/delete
Vincent Petry [Mon, 23 Jun 2014 13:15:50 +0000 (15:15 +0200)]
Merge pull request #8974 from owncloud/router-preventloadappsonupgrade
Prevent loadApps on upgrade
Robin Appelman [Mon, 23 Jun 2014 13:14:35 +0000 (15:14 +0200)]
Add comment
icewind1991 [Mon, 23 Jun 2014 12:42:00 +0000 (14:42 +0200)]
Merge pull request #9153 from owncloud/files-unselectafterdelete
Clear file selection when list is repopulated
Thomas Müller [Mon, 23 Jun 2014 12:40:10 +0000 (14:40 +0200)]
dir itself has to be removed as well
Robin Appelman [Fri, 20 Jun 2014 14:09:38 +0000 (16:09 +0200)]
Dont allow opening writable streams on a read only dav mount
Robin Appelman [Mon, 23 Jun 2014 11:55:21 +0000 (13:55 +0200)]
Only cache enabled apps when logged in
Thomas Müller [Mon, 23 Jun 2014 11:33:55 +0000 (13:33 +0200)]
fix recursion on rmdirr
Frank Karlitschek [Mon, 23 Jun 2014 11:29:20 +0000 (07:29 -0400)]
Merge pull request #9150 from owncloud/remoteshare-fixsetuporder
Setup the external share manager in a hook
Vincent Petry [Mon, 23 Jun 2014 10:55:42 +0000 (12:55 +0200)]
Clear file selection when list is repopulated
When calling FileList.setFiles() the current selection needs to be
cleared.
Vincent Petry [Mon, 23 Jun 2014 09:57:43 +0000 (11:57 +0200)]
Setup the external share manager in a hook
To make sure the external shares are initialized in the right order and
make sure the session is correctly initialized before, the external
share manager is now set up in a filesystem setup hook.
Arthur Schiwon [Tue, 17 Jun 2014 20:58:08 +0000 (22:58 +0200)]
trusted domains shall not be ignored on autosetup
Vincent Petry [Mon, 23 Jun 2014 08:32:41 +0000 (10:32 +0200)]
Merge pull request #9138 from owncloud/fix-documentation
Add explanation about the current implementation of updateApp
Jenkins for ownCloud [Mon, 23 Jun 2014 05:54:38 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Bart Visscher [Mon, 28 Oct 2013 17:01:54 +0000 (18:01 +0100)]
Add explanation about the current implementation of updateApp
Jenkins for ownCloud [Sun, 22 Jun 2014 05:54:36 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Frank Karlitschek [Sat, 21 Jun 2014 22:52:47 +0000 (18:52 -0400)]
7.0.0 alpha 2
Morris Jobke [Sat, 21 Jun 2014 09:28:11 +0000 (11:28 +0200)]
Merge pull request #9120 from owncloud/fileactions-filelistfallback
Fixed file actions fallback
Jenkins for ownCloud [Sat, 21 Jun 2014 05:54:37 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 20 Jun 2014 20:41:57 +0000 (22:41 +0200)]
Merge pull request #9121 from owncloud/filepicker-avoidtwice
Prevent showing the file picker twice
Morris Jobke [Fri, 20 Jun 2014 20:37:26 +0000 (22:37 +0200)]
Merge pull request #9102 from owncloud/viewermode-controls
Fixed controls bar in viewer mode
Arthur Schiwon [Fri, 20 Jun 2014 18:47:51 +0000 (20:47 +0200)]
Backport subset of #4179, re-established Oracle compatibility for LDAP
Conflicts:
apps/user_ldap/lib/access.php
Morris Jobke [Fri, 20 Jun 2014 17:01:05 +0000 (19:01 +0200)]
Merge pull request #9108 from owncloud/uploadintofolderfix
Fix many issues with drag and drop upload
Robin Appelman [Fri, 20 Jun 2014 13:40:38 +0000 (15:40 +0200)]
Fix unit tests
Robin Appelman [Fri, 20 Jun 2014 12:29:13 +0000 (14:29 +0200)]
Fix permissions check when moving a file to a different directory over webdav
Vincent Petry [Fri, 20 Jun 2014 11:39:46 +0000 (13:39 +0200)]
Prevent showing the file picker twice
In case the filepicker function is called twice, only show it once.
Vincent Petry [Fri, 20 Jun 2014 10:58:04 +0000 (12:58 +0200)]
Fixed file actions fallback
Some apps are calling FileActions.display() directly but omit the new
fileList argument.
This fix makes the fileList argument correctly fall back to the default
file list (the one from the "All files" section)
Jenkins for ownCloud [Fri, 20 Jun 2014 05:54:32 +0000 (01:54 -0400)]
[tx-robot] updated from transifex
Vincent Petry [Thu, 19 Jun 2014 15:19:28 +0000 (17:19 +0200)]
Fix appending of rows after upload
When uploading files or folders, they only need to be appended or
updated when their path or a section of their path is inside the current
directory (which happens for folder upload)
Fixes issue where file was appended when dragging on a parent directory
onto the breadcrumb.
Fixes appending issue when uploading folders.
Vincent Petry [Wed, 18 Jun 2014 18:38:51 +0000 (20:38 +0200)]
Fixed uploading by drag and drop into folder
Morris Jobke [Thu, 19 Jun 2014 13:16:33 +0000 (15:16 +0200)]
Merge pull request #9105 from owncloud/fix_8874
Make sure last seen tooltip always appears even after searching and filt...
Arthur Schiwon [Thu, 19 Jun 2014 12:30:22 +0000 (14:30 +0200)]
Make sure last seen tooltip always appears even after searching and filtering
Jenkins for ownCloud [Thu, 19 Jun 2014 05:55:38 +0000 (01:55 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 18 Jun 2014 23:21:21 +0000 (01:21 +0200)]
Merge pull request #9071 from owncloud/extstorage-list-unittests
Added JS unit tests for ext storage
Morris Jobke [Wed, 18 Jun 2014 23:17:36 +0000 (01:17 +0200)]
Merge pull request #9093 from owncloud/remove_unused_code
remove unused code
Vincent Petry [Wed, 18 Jun 2014 18:10:28 +0000 (20:10 +0200)]
Fixed controls bar in viewer mode
Björn Schießle [Wed, 18 Jun 2014 13:32:16 +0000 (15:32 +0200)]
Merge pull request #9068 from owncloud/trashbin_unittests_master
fix trash bin expire operation and add unit tests
Bjoern Schiessle [Tue, 17 Jun 2014 20:30:39 +0000 (22:30 +0200)]
adjust encryption tests to the trash bin changes
Bjoern Schiessle [Tue, 17 Jun 2014 20:30:11 +0000 (22:30 +0200)]
add additional tests for the trash bin
Bjoern Schiessle [Tue, 17 Jun 2014 18:08:40 +0000 (20:08 +0200)]
make sure that we always use the right user
Bjoern Schiessle [Wed, 18 Jun 2014 11:26:42 +0000 (13:26 +0200)]
remove unused code