Jan-Christoph Borchardt
b975f0e718
Merge pull request #9174 from owncloud/breadcrumbfix
...
Breadcrumb width calculation fix
2014-06-27 13:51:18 +02:00
Thomas Müller
4d6019b73f
Merge pull request #9247 from owncloud/move-webdav-class-to-core-master
...
Move webdav class to core master
2014-06-27 12:59:59 +02:00
Vincent Petry
4b5bf606cb
Merge pull request #9215 from owncloud/officemimetypesupdatefix
...
Office mime types update fix
2014-06-27 11:23:19 +02:00
Vincent Petry
ec4cf96f0d
Breadcrumb width calculation fix
...
Rewrote the breadcrumb calculation to be more readable.
Breadcrumb now has a setMaxWidth() method to set the maximum allowed
width which is used to fit the breadcrumbs.
The breadcrumb width is now based on the container width, passed through
setMaxWidth() by the FileList class.
Now using fixed widths for the test crumbs to simulate consistent
widths across browsers which rendering engines might usually yield
different results.
2014-06-27 11:11:34 +02:00
Thomas Müller
ef4057d382
remove pointless require - we should kill all require_once like that in our tests
2014-06-27 09:30:42 +02:00
Thomas Müller
171475b95a
fix autoloader
2014-06-27 08:52:40 +02:00
Thomas Müller
c745240543
Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies
2014-06-27 08:52:28 +02:00
Jenkins for ownCloud
36f771e9f0
[tx-robot] updated from transifex
2014-06-27 01:55:44 -04:00
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
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
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
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
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
b1e778d5fd
Moved office mimetype update to a repair step
2014-06-25 19:49:18 +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
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
c94c69aea1
Merge pull request #9189 from owncloud/sharing_fix_permissions
...
Sharing fix permissions
2014-06-25 15:01:34 +02:00
Bjoern Schiessle
d3d1955ef4
fix unit tests
2014-06-25 12:38:26 +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
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
Bjoern Schiessle
3fc7357ade
add/update unit tests
2014-06-24 14:00:15 +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
Jenkins for ownCloud
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
Morris Jobke
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
Lukas Reschke
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
Joas Schilling
c98b7fe7fc
Merge if statements
2014-06-23 18:10:08 +02:00
Vincent Petry
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
Vincent Petry
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
Vincent Petry
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
Vincent Petry
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
icewind1991
4d216e8e2a
Merge pull request #9153 from owncloud/files-unselectafterdelete
...
Clear file selection when list is repopulated
2014-06-23 14:42:00 +02:00
Robin Appelman
d24c0f4d42
Dont allow opening writable streams on a read only dav mount
2014-06-23 14:35:19 +02:00