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
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
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
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
Morris Jobke
e2fd6dc3ab
fixes the layout for error messages on the update page
2014-06-24 08:39:43 +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
Thomas Müller
f913b1629b
Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-master
...
fix recursion on rmdirr
2014-06-23 23:18:10 +02:00
Thomas Müller
fba694edae
update PHPDoc $fileInfo is a SplFileInfo
2014-06-23 23:15:30 +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
raghunayyar
720fa33274
Better Logic to display user count for everyone.
2014-06-24 00:50:36 +05:30
Joas Schilling
c98b7fe7fc
Merge if statements
2014-06-23 18:10:08 +02:00
Joas Schilling
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
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
0ab66d9b48
Added unit test for the helper's rmdirr
2014-06-23 16:48:25 +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
Vincent Petry
8c82098281
Merge pull request #8974 from owncloud/router-preventloadappsonupgrade
...
Prevent loadApps on upgrade
2014-06-23 15:15:50 +02:00
Robin Appelman
2547945779
Add comment
2014-06-23 15:14:35 +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
Thomas Müller
ed31f30afd
dir itself has to be removed as well
2014-06-23 14:40:55 +02:00
Robin Appelman
d24c0f4d42
Dont allow opening writable streams on a read only dav mount
2014-06-23 14:35:19 +02:00
Robin Appelman
8b41689fe6
Only cache enabled apps when logged in
2014-06-23 13:55:21 +02:00
Thomas Müller
f83821c388
fix recursion on rmdirr
2014-06-23 13:54:27 +02:00
Frank Karlitschek
65e4348080
Merge pull request #9150 from owncloud/remoteshare-fixsetuporder
...
Setup the external share manager in a hook
2014-06-23 07:29:20 -04:00
Vincent Petry
074d3a8f07
Clear file selection when list is repopulated
...
When calling FileList.setFiles() the current selection needs to be
cleared.
2014-06-23 12:55:42 +02:00
Vincent Petry
9b001ed903
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.
2014-06-23 11:57:43 +02:00
Arthur Schiwon
81ecbbb061
trusted domains shall not be ignored on autosetup
2014-06-23 10:33:15 +02:00
Vincent Petry
53ad15e0e3
Merge pull request #9138 from owncloud/fix-documentation
...
Add explanation about the current implementation of updateApp
2014-06-23 10:32:41 +02:00
Jenkins for ownCloud
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
Bart Visscher
089139f8ea
Add explanation about the current implementation of updateApp
2014-06-22 12:45:59 +02:00
Jenkins for ownCloud
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -04:00
Frank Karlitschek
e30dac9afb
7.0.0 alpha 2
2014-06-21 18:52:47 -04:00
Morris Jobke
436d022316
Merge pull request #9120 from owncloud/fileactions-filelistfallback
...
Fixed file actions fallback
2014-06-21 11:28:11 +02:00
Jenkins for ownCloud
da0e4b0af0
[tx-robot] updated from transifex
2014-06-21 01:54:37 -04:00
Morris Jobke
1f17814e40
Merge pull request #9121 from owncloud/filepicker-avoidtwice
...
Prevent showing the file picker twice
2014-06-20 22:41:57 +02:00
Morris Jobke
0c2447e487
Merge pull request #9102 from owncloud/viewermode-controls
...
Fixed controls bar in viewer mode
2014-06-20 22:37:26 +02:00
Arthur Schiwon
93edacb357
Backport subset of #4179 , re-established Oracle compatibility for LDAP
...
Conflicts:
apps/user_ldap/lib/access.php
2014-06-20 20:49:34 +02:00
Morris Jobke
d5819a5ecd
Merge pull request #9108 from owncloud/uploadintofolderfix
...
Fix many issues with drag and drop upload
2014-06-20 19:01:05 +02:00
Vincent Petry
763d9ded1d
Prevent showing the file picker twice
...
In case the filepicker function is called twice, only show it once.
2014-06-20 13:39:46 +02:00
Vincent Petry
502573eb2e
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)
2014-06-20 12:58:04 +02:00
Jenkins for ownCloud
ca96b9d3d5
[tx-robot] updated from transifex
2014-06-20 01:54:32 -04:00
Vincent Petry
8ae2468345
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.
2014-06-19 18:21:42 +02:00
Vincent Petry
9ef7410abe
Fixed uploading by drag and drop into folder
2014-06-19 16:14:10 +02:00
Morris Jobke
e8e53c81f8
Merge pull request #9105 from owncloud/fix_8874
...
Make sure last seen tooltip always appears even after searching and filt...
2014-06-19 15:16:33 +02:00
Arthur Schiwon
85894654ae
Make sure last seen tooltip always appears even after searching and filtering
2014-06-19 14:30:22 +02:00
Jenkins for ownCloud
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00