wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
19012 commits 157 branches 562 tags 714 MiB
Commit graph

19012 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frank Karlitschek
2daffbc44e Merge pull request #9051 from owncloud/Bagera-master 
Fix delete action height
 2014-06-26 17:48:55 -04:00
icewind1991
1b1bebdcb2 Merge pull request #9236 from owncloud/sharing-settingswording 
Fix wording for remote shares in settings page
 2014-06-26 22:56:46 +02:00
Vincent Petry
c6b89cc55a Fix wording for remote shares in settings page 2014-06-26 19:35:57 +02:00
Raghu Nayyar
5b189315b5 Merge pull request #9234 from owncloud/fix-ellipsis-for-folders 
Fix ellipsis for folders on mobile screens
 2014-06-26 22:45:40 +05:30
Thomas Müller
7804bd010c Merge pull request #9230 from owncloud/fix-repair-step-php-53 
Redeclared as public to allow invocation from within the closure in php ...
 2014-06-26 17:20:09 +02:00
Vincent Petry
3d2fd7cd1a Merge pull request #9213 from owncloud/upgrade-donotloadappsinremote 
Prevent loading apps in remote when an upgrade is due
 2014-06-26 17:10:42 +02:00
Vincent Petry
8526556110 Merge pull request #9206 from owncloud/occ-scan-user 
Prevent running the files:scan command as the wrong user
 2014-06-26 17:03:23 +02:00
icewind1991
46adf8cb19 Merge pull request #9223 from owncloud/occ-scan-arguments 
Add error message when no users specified to files:scan command
 2014-06-26 17:01:39 +02:00
Morris Jobke
cbd5e31d33 fix padding for last cell in summary of trashbin 2014-06-26 16:58:49 +02:00
Morris Jobke
9eb7ed4925 Fix ellipsis for folders on mobile screens 
* fixes #9162
 2014-06-26 16:37:34 +02:00
Jan-Christoph Borchardt
1dc6e1767c Merge pull request #9211 from owncloud/fix-hidden-share-button 
Fix hidden share button and checkbox layout
 2014-06-26 16:23:39 +02:00
Vincent Petry
b7d79a90b0 Merge pull request #9210 from owncloud/better_validation_in_getAppPath 
better validation for OC_App::getAppPath()
 2014-06-26 15:52:12 +02:00
Björn Schießle
aabee3e4b0 Merge pull request #9171 from owncloud/enc_always_use_oc_view 
[encryption] always use oc view
 2014-06-26 15:11:08 +02:00
Thomas Müller
4c80c9595f Redeclared as public to allow invocation from within the closure in php 5.3 2014-06-26 14:27:41 +02:00
Vincent Petry
fd04b3070f Add error message when no users specified to files:scan command 2014-06-26 11:58:38 +02:00
Björn Schießle
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
Jenkins for ownCloud
a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Frank Karlitschek
63a50bb3f7 7.0 beta 1 2014-06-25 19:01:52 -04:00
Vincent Petry
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
Vincent Petry
4e43e3626e Prevent loading apps in remote when an upgrade is due 2014-06-25 18:17:17 +02:00
VicDeo
7c362ab55e Merge pull request #9194 from owncloud/revertloadapps 
Bring back loadApps() in base.php
 2014-06-25 18:52:56 +03:00
Morris Jobke
3da9003426 Fix hidden share button and checkbox layout 
fixes #9101
 2014-06-25 16:32:24 +02:00
Morris Jobke
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
Georg Ehrke
09356bc5b3 better validation for OC_App::getAppPath() 2014-06-25 16:24:55 +02:00
Robin Appelman
9a2ed86672 Prevent running the files:scan command as the wrong user 2014-06-25 15:22:49 +02:00
Bjoern Schiessle
38ff8173ab make sure that hooks are registered for the tests 2014-06-25 15:20:52 +02:00
Vincent Petry
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
icewind1991
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
icewind1991
c94c69aea1 Merge pull request #9189 from owncloud/sharing_fix_permissions 
Sharing fix permissions
 2014-06-25 15:01:34 +02:00
Robin Appelman
113749bd96 really always take root of the substorage 2014-06-25 13:00:11 +02:00
Bjoern Schiessle
d3d1955ef4 fix unit tests 2014-06-25 12:38:26 +02:00
Vincent Petry
9de3d8225b Fix parsing URL hash when no "?" was specified 2014-06-25 12:37:11 +02:00
Jenkins for ownCloud
b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Bjoern Schiessle
3d0805f27d always use a \OC\Files\View 2014-06-25 12:27:30 +02:00
Bjoern Schiessle
709691548d always use oc filesystem for rename operation 2014-06-25 12:27:30 +02:00
Vincent Petry
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
Bjoern Schiessle
a0b85fc5e4 make sure that during share and unshare the etags get propagated correctly 2014-06-25 12:11:56 +02:00
Arthur Schiwon
89f2691515 adjust access constructor to master 2014-06-25 11:46:21 +02:00
Arthur Schiwon
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
blizzz
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
Bjoern Schiessle
92a82f02b3 always take root of the substorage 2014-06-24 18:53:51 +02:00
Vincent Petry
dd2ef47ed3 Merge pull request #9168 from owncloud/files-phpwarningondelete 
Remove warning when deleting all entries
 2014-06-24 18:18:14 +02:00
Vincent Petry
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
Vincent Petry
a120d6e9a3 Bring back loadApps() in base.php 
loadApps() had been deleted by mistake in
799205488c
 2014-06-24 17:37:58 +02:00
Morris Jobke
6be236913c Merge pull request #9181 from owncloud/enc_recursive_mkdir 
always use '/' as directory seperator
 2014-06-24 16:37:42 +02:00
Bjoern Schiessle
3fc7357ade add/update unit tests 2014-06-24 14:00:15 +02:00
Bjoern Schiessle
70ca292fd9 only the mount point has delete and update permissions to enable rename operation 2014-06-24 13:55:04 +02:00
Bjoern Schiessle
84d36df70b make sure that we always return the correct permissions 2014-06-24 13:39:37 +02:00
Bjoern Schiessle
9c45a3196b add unit tests 2014-06-24 10:43:07 +02:00
Bjoern Schiessle
6b85fe819c always use '/' as directory seperator 2014-06-24 09:29:11 +02:00