a49610e18a
change logic in displayNamesInGroup and add some unit tests
2014-08-28 13:51:48 +02:00
5d30ed9ad1
fix in displayNamesInGroup: when specified limit N, we did complex search only in the first N users
2014-06-26 12:38:33 +02:00
1822bba5e9
Merge pull request #9193 from owncloud/sharing_etag_propagation
...
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
a5154450cf
[tx-robot] updated from transifex
2014-06-26 01:54:40 -04:00
63a50bb3f7
7.0 beta 1
2014-06-25 19:01:52 -04:00
93a6792da7
Merge pull request #9205 from owncloud/remoteshare-fixurlpath
...
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
7c362ab55e
Merge pull request #9194 from owncloud/revertloadapps
...
Bring back loadApps() in base.php
2014-06-25 18:52:56 +03:00
a9d0e9a5d5
Merge pull request #9202 from owncloud/urlhashfix
...
Do not clear URL hash when no external mount params given
2014-06-25 16:28:52 +02:00
38ff8173ab
make sure that hooks are registered for the tests
2014-06-25 15:20:52 +02:00
d22559200c
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.
2014-06-25 15:11:43 +02:00
16396e2e33
Merge pull request #9123 from owncloud/webdav-move-permissions
...
Fix permissions check when moving a file to a different directory over webdav
2014-06-25 15:09:58 +02:00
c94c69aea1
Merge pull request #9189 from owncloud/sharing_fix_permissions
...
Sharing fix permissions
2014-06-25 15:01:34 +02:00
113749bd96
really always take root of the substorage
2014-06-25 13:00:11 +02:00
9de3d8225b
Fix parsing URL hash when no "?" was specified
2014-06-25 12:37:11 +02:00
b1116880f8
[tx-robot] updated from transifex
2014-06-25 06:33:53 -04:00
363f8f3205
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.
2014-06-25 12:24:46 +02:00
a0b85fc5e4
make sure that during share and unshare the etags get propagated correctly
2014-06-25 12:11:56 +02:00
89f2691515
adjust access constructor to master
2014-06-25 11:46:21 +02:00
452efa5fab
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
2014-06-25 11:45:55 +02:00
c6bcb07f83
Merge pull request #9145 from owncloud/everyonecount
...
Enhancement: Displays users and admin count in the Users Management.
2014-06-24 20:58:35 +02:00
92a82f02b3
always take root of the substorage
2014-06-24 18:53:51 +02:00
dd2ef47ed3
Merge pull request #9168 from owncloud/files-phpwarningondelete
...
Remove warning when deleting all entries
2014-06-24 18:18:14 +02:00
d18234112b
Merge pull request #9180 from owncloud/fix-error-on.update-page
...
fixes the layout for error messages on the update page
2014-06-24 17:48:17 +02:00
a120d6e9a3
Bring back loadApps() in base.php
...
loadApps() had been deleted by mistake in
799205488c
2014-06-24 17:37:58 +02:00
6be236913c
Merge pull request #9181 from owncloud/enc_recursive_mkdir
...
always use '/' as directory seperator
2014-06-24 16:37:42 +02:00
3fc7357ade
add/update unit tests
2014-06-24 14:00:15 +02:00
70ca292fd9
only the mount point has delete and update permissions to enable rename operation
2014-06-24 13:55:04 +02:00
84d36df70b
make sure that we always return the correct permissions
2014-06-24 13:39:37 +02:00
9c45a3196b
add unit tests
2014-06-24 10:43:07 +02:00
6b85fe819c
always use '/' as directory seperator
2014-06-24 09:29:11 +02:00
e2fd6dc3ab
fixes the layout for error messages on the update page
2014-06-24 08:39:43 +02:00
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
cc559c5b4b
Merge pull request #9074 from geez0x1/master
...
Update the modified date in UI on file reversion
2014-06-23 23:20:04 +02:00
f913b1629b
Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master
...
fix recursion on rmdirr
2014-06-23 23:18:10 +02:00
fba694edae
update PHPDoc $fileInfo is a SplFileInfo
2014-06-23 23:15:30 +02:00
e070e292bf
Merge pull request #9170 from owncloud/files-renamevalidationblur
...
Fix blurring of invalid file name on rename
2014-06-23 22:48:46 +02:00
720fa33274
Better Logic to display user count for everyone.
2014-06-24 00:50:36 +05:30
c98b7fe7fc
Merge if statements
2014-06-23 18:10:08 +02:00
167ba14af7
Merge pull request #9159 from owncloud/enabledapp-cache-loggedin
...
Only cache enabled apps when logged in
2014-06-23 18:02:57 +02:00
536a190846
Merge pull request #9124 from owncloud/move-permissions
...
Fix moving files into read only public shares
2014-06-23 17:05:35 +02:00
0ab66d9b48
Added unit test for the helper's rmdirr
2014-06-23 16:48:25 +02:00
7d4747ea16
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.
2014-06-23 16:35:11 +02:00
909e505c2e
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.
2014-06-23 15:57:45 +02:00
6850d0c6d7
Merge pull request #8931 from owncloud/filelist-usepathforaction
...
[master] Use actual file path on rename/delete
2014-06-23 15:53:23 +02:00
8c82098281
Merge pull request #8974 from owncloud/router-preventloadappsonupgrade
...
Prevent loadApps on upgrade
2014-06-23 15:15:50 +02:00
2547945779
Add comment
2014-06-23 15:14:35 +02:00
4d216e8e2a
Merge pull request #9153 from owncloud/files-unselectafterdelete
...
Clear file selection when list is repopulated
2014-06-23 14:42:00 +02:00
ed31f30afd
dir itself has to be removed as well
2014-06-23 14:40:55 +02:00
d24c0f4d42
Dont allow opening writable streams on a read only dav mount
2014-06-23 14:35:19 +02:00
8b41689fe6
Only cache enabled apps when logged in
2014-06-23 13:55:21 +02:00
voxsim
Björn Schießle
Jenkins for ownCloud
Frank Karlitschek
Vincent Petry
VicDeo
Morris Jobke
icewind1991
Robin Appelman
Arthur Schiwon
Morris Jobke
Thomas Müller
Lukas Reschke
raghunayyar
Joas Schilling