Thomas Müller
d0eb8f8668
Merge pull request #8880 from owncloud/webdav-read-permissions
...
Use the permissions exposed by ownCloud for webdav external storages
2014-06-05 11:38:02 +02:00
Bernhard Posselt
844c6c3328
use slide toggle for files app
2014-06-05 11:26:24 +02:00
Vincent Petry
e0c4e960d9
Merge pull request #8861 from owncloud/share-overview-linklist
...
Added Shared with link sidebar section in files app
2014-06-05 10:59:54 +02:00
Thomas Müller
1c20c72efe
Merge pull request #8620 from owncloud/design-navigation-two
...
Toggle app navigation not only on mobile, but on desktop as well
2014-06-05 10:53:22 +02:00
icewind1991
09cc7c2d44
Merge pull request #8862 from owncloud/share-overview-fixmimetype
...
Fix mime type returning for shared with others files
2014-06-05 10:29:03 +02:00
Thomas Müller
ff3ded6cb2
Merge pull request #8852 from owncloud/kill-permissions-master
...
Kill permissions table
2014-06-05 10:05:05 +02:00
Thomas Müller
da3974bcb2
- drop permissions table and related code
...
- the file/folder's permission is now stored in the file cache
- BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs
- increase version to trigger database migration
2014-06-05 08:22:01 +02:00
Jenkins for ownCloud
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
Thomas Müller
c044ff99ce
Merge pull request #8724 from owncloud/update-sabre-2.0
...
Update SabreDAV to 1.8.10
2014-06-04 23:05:34 +02:00
Morris Jobke
7a20d22daa
Merge pull request #8824 from owncloud/mail_template_editing_in_webui
...
minimal mail template editor for administrators
2014-06-04 18:44:44 +02:00
Robin Appelman
9eb177e8bc
Use the permissions exposed by ownCloud for webdav external storages
2014-06-04 18:19:52 +02:00
Thomas Müller
a2db53b928
Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size
...
[versioning] let the file cache track the size of the versions
2014-06-04 18:19:48 +02:00
Morris Jobke
ca43fba513
Merge pull request #8791 from owncloud/share-overview-sharewithstatus
...
Update share action text to display owner/recipients
2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt
411e6525b1
remove obsolete position rule from files app
2014-06-04 16:50:55 +02:00
Thomas Müller
fc1d6f4c3c
fixes during test
2014-06-04 15:01:36 +02:00
Jan-Christoph Borchardt
e2e05c4798
adjust controls bar position for removed nav bar
2014-06-04 14:29:46 +02:00
Thomas Müller
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Vincent Petry
816db7aef1
Fixed wording to "Shared by link"
2014-06-04 11:32:30 +02:00
Vincent Petry
c88509902e
Fix mime type returning for "shared with others" files
...
Use "path" instead of "file_target", as the latter is not always set /
reliable.
2014-06-04 11:26:03 +02:00
Vincent Petry
b3fdda1751
Added "Shared with link" sidebar section in files app
...
Added section to only show link shares.
Please note that the filtering is currently done on the client side
which might not be the most efficient way of doing it.
2014-06-04 11:10:11 +02:00
Vincent Petry
af6a65cbf3
Do not update action icon recipients for file list
...
Since the files app doesn't have the recipient information on load it
cannot initially render the recipients in the action icons.
For this reason the action icon will not be updated with the recipients
after changing the shares, for consistency.
2014-06-04 10:48:01 +02:00
Vincent Petry
07f1b263c9
Use recipient display names when updating shares in the UI
...
Since OC.Share didn't have any array containing the list of shares for
the current file, OC.Share.currentShares has been introduced to contain
the full share item structure instead of the reduced one
OC.Share.itemShares.
The event "sharesChanged" is now passing OC.Share.currentShares, which
itself includes the display name to be displayed for the recipients in
the action icon.
2014-06-04 10:37:04 +02:00
Thomas Müller
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
Thomas Müller
9e31118675
Merge pull request #8842 from owncloud/ldap_cli_methods
...
command line tools to see, modify and test existing LDAP configurations
2014-06-04 09:37:04 +02:00
Thomas Müller
86623358f0
Merge pull request #8849 from owncloud/trash_expire_fix
...
get files in trash from file cache
2014-06-04 09:36:40 +02:00
Thomas Müller
9f3fcf036c
fixing typo
2014-06-04 09:36:27 +02:00
Jan-Christoph Borchardt
6b2b903ea6
Merge pull request #8468 from owncloud/remove-infieldlabels
...
Remove infieldlabels
2014-06-04 09:28:20 +02:00
Thomas Müller
917f389747
workaround to get the unit test going
2014-06-04 08:21:28 +02:00
Jenkins for ownCloud
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
Bjoern Schiessle
2c8288d8f9
get the storage from the view
2014-06-04 07:55:46 +02:00
Bjoern Schiessle
3a698bce6e
don't ask for fileInfo if we already have one
2014-06-04 07:55:45 +02:00
Bjoern Schiessle
e6712bc12e
make sure to close the stream at the end of each test
2014-06-04 07:55:45 +02:00
ringmaster
dc1e3620d2
Continued flock work.
2014-06-04 07:55:44 +02:00
ringmaster
5365ae416e
flock changes. Work in progress.
2014-06-04 07:55:44 +02:00
Thomas Müller
6764d5b122
Merge pull request #8698 from owncloud/sharing_improve_permissions
...
get permissions directly from share storage to avoid additional db calls
2014-06-03 19:13:51 +02:00
Thomas Müller
70ae7fa091
Fix casing and PHPDoc
2014-06-03 19:10:18 +02:00
blizzz
21d1e5eccc
Merge pull request #7930 from owncloud/fix_7785_master
...
LDAP: put out fetching of user meta data into a fully tested class of it...
2014-06-03 19:09:33 +02:00
Thomas Müller
8ee15025f0
Fix merge conflict
2014-06-03 19:05:21 +02:00
Jörn Friedrich Dreyer
b5a145b297
convert mail template editor to app framework for a restful api
2014-06-03 16:53:03 +02:00
Morris Jobke
f87a91fa00
Merge pull request #8837 from owncloud/issue/8720
...
Fix cursor and background of app navigation
2014-06-03 16:46:04 +02:00
Bjoern Schiessle
05cf34ea1f
get files in trash from file cache
2014-06-03 16:45:11 +02:00
Thomas Müller
cfc1d5623e
Merge pull request #8840 from owncloud/share_settings
...
by default don't show option to send mail notifications for shares
2014-06-03 16:42:44 +02:00
Jan-Christoph Borchardt
4ef94ddd2e
infield label removal: remove last occurences of infield labels
2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt
69e5d5b8c0
remove specific sidebar size from Files app
2014-06-03 13:24:44 +02:00
Arthur Schiwon
e962999896
get rid of @read in PHP doc after rebase
2014-06-03 13:01:14 +02:00
Arthur Schiwon
ba82d80f32
adjust group tests
2014-06-03 12:59:11 +02:00
Arthur Schiwon
3fed96af0e
clean up
2014-06-03 12:59:11 +02:00
Arthur Schiwon
f9a9085faf
class descriptions
2014-06-03 12:59:10 +02:00
Arthur Schiwon
5336e9a156
newlines
2014-06-03 12:59:10 +02:00
Arthur Schiwon
d52fbd7e55
adjust test to changed convention in storing quota
2014-06-03 12:59:10 +02:00