Joas Schilling
e73d811425
Move Proxy to PSR-4
2016-05-25 16:04:57 +02:00
Joas Schilling
d16a97a273
lib/user
2016-05-25 16:04:57 +02:00
Joas Schilling
d4e828f39e
Move wizard
2016-05-25 16:04:57 +02:00
Joas Schilling
3f5e76162d
Move lib\user to PSR-4
2016-05-25 16:04:56 +02:00
Joas Schilling
b7fa527791
Move User_LDAP and User_Proxy to PSR-4
2016-05-25 16:04:56 +02:00
Joas Schilling
cbba55a26c
Move Group_LDAP and Group_Proxy to PSR-4
2016-05-25 16:04:56 +02:00
Joas Schilling
4ac283ecd3
Move Command namespace to PSR-4
2016-05-25 16:04:56 +02:00
Joas Schilling
9d61acb27d
Move User_LDAP to PSR-4
2016-05-25 16:04:55 +02:00
Vincent Petry
d22aeb749d
Merge pull request #24661 from owncloud/files_sharing-psr4
...
Move Files_Sharing to PSR-4
2016-05-25 15:40:05 +02:00
Vincent Petry
e1b89f0957
Merge pull request #24838 from owncloud/fix-failing-updatenotifications-tests
...
Fix failing update notifications tests
2016-05-25 15:14:29 +02:00
Joas Schilling
9c734dcba7
Fix missing use statements in ext. str. tests
2016-05-25 15:10:27 +02:00
Vincent Petry
eddc222369
Merge pull request #24815 from owncloud/fix-autotest-external-psr4
...
Fix ext storage test class name in test script
2016-05-25 15:09:33 +02:00
Joas Schilling
3f0b2d148d
Move tests to PSR-4
2016-05-25 15:00:00 +02:00
Joas Schilling
b72706b450
Move background job to PSR-4
2016-05-25 14:59:59 +02:00
Joas Schilling
3a716ae91c
Move lib/ to PSR-4
2016-05-25 14:59:59 +02:00
Joas Schilling
5001036fd4
Move classes from outside lib/ to PSR-4
2016-05-25 14:59:59 +02:00
Joas Schilling
338106124f
Fix failing update notifications tests
2016-05-25 12:11:51 +02:00
Björn Schießle
0f728b4cd1
don't fail on "bad signature" during login. Most likely this happens because
...
the login password changed at the user back-end (e.g ldap). Such failures will
be handled after login correctly by allowing the user to adjust the passwords
2016-05-25 11:39:44 +02:00
Joas Schilling
25f3110730
Fix ShareControllerTest ( #24824 )
2016-05-25 10:21:07 +02:00
Vincent Petry
c36cf30ade
Merge pull request #24444 from owncloud/update-notifications-for-core-and-apps
...
Update notifications for core and apps
2016-05-25 09:13:10 +02:00
Vincent Petry
ae4ee56997
Merge pull request #24814 from owncloud/fix-psr4-external-maste
...
Move Stuff to PSR-4 again
2016-05-25 09:12:17 +02:00
Vincent Petry
5f1ddf1f7f
Merge pull request #24811 from owncloud/client-login-token-2fa
...
do not allow client password logins if token auth is enforced or 2FA …
2016-05-25 09:07:39 +02:00
Jenkins for ownCloud
6972f4dc50
[tx-robot] updated from transifex
2016-05-25 02:03:38 -04:00
Jenkins for ownCloud
f1f7511c61
[tx-robot] updated from transifex
2016-05-24 15:24:38 -04:00
Christoph Wurst
28ce7dd262
do not allow client password logins if token auth is enforced or 2FA is enabled
2016-05-24 17:54:02 +02:00
Vincent Petry
d3fb5d618e
Merge pull request #24748 from owncloud/login-explicitly
...
Log in explicitly, save login name when generating browser/device tokens
2016-05-24 17:51:49 +02:00
Joas Schilling
9382cd1d8e
Fix the names of the tests so the script discovers them again
2016-05-24 16:37:06 +02:00
Vincent Petry
e8c3794308
Merge pull request #7897 from owncloud/ext-swiftcaching
...
Added object cache for Swift ext storage
2016-05-24 16:21:30 +02:00
Joas Schilling
794c566244
Move Stuff to PSR-4 again
2016-05-24 16:10:22 +02:00
Vincent Petry
f7d102ccc5
Merge pull request #24799 from owncloud/altyr-117-upstream
...
Update google-api-php-client to 1.1.7
2016-05-24 14:46:10 +02:00
Vincent Petry
648fc8d916
skip google map files ( #24807 )
2016-05-24 14:45:29 +02:00
Dmitry Popov
83aa28ed1d
My fix for #24272 , #23613 , File not found when single file in a folder ( #24800 )
...
* Fixed group share searching for members of
multiple group. Issue #11808 .
* Fixed group share searching, continued.
Avoid searching for empty group list in getItemSharedWithUser().
Broke tests in previous commit, #12030 .
* Simler check for group count.
* Fix for https://github.com/owncloud/core/issues/24783 , described there
* Now it's #24272 , 24783 was a duplicate. Previous change was also not very good. Now we don't create ZIP with a single file inside.
2016-05-24 14:09:05 +02:00
Robin Appelman
8a40003169
fix phpdoc
2016-05-24 13:58:08 +02:00
Vincent Petry
465cf9fe9b
Merge pull request #24346 from lenz1111/fix_24331
...
Fix: Bugs in shared link with video #24331
2016-05-24 13:49:02 +02:00
Robin Appelman
c031eafd84
Fix cert bundle path
2016-05-24 13:44:43 +02:00
Vincent Petry
f77a11a876
Added object cache for Swift ext storage
...
This avoid calling the remote API for repeated calls to is_dir,
filetype, etc
2016-05-24 13:29:29 +02:00
Piotr Filiciak
df59c5d1ee
bug fix
2016-05-24 12:43:43 +02:00
Piotr Filiciak
11b2e98a30
video poster
2016-05-24 12:34:37 +02:00
Vincent Petry
4635ed7748
Fix autoloading for new google SDK lib
2016-05-24 12:22:30 +02:00
Francesco Rovelli
c23bc91198
Add new files
2016-05-24 12:22:30 +02:00
Francesco Rovelli
49bec94959
enable autoload of lib in google storage
2016-05-24 12:22:30 +02:00
Francesco Rovelli
c1583f03ab
Update google-api-php-client from 1.0.6-beta to 1.1.7
2016-05-24 12:22:30 +02:00
Joas Schilling
3eba0c479f
Fix import path for 3rdparty dropbox autoloader
...
We moved the file by one level
2016-05-24 12:15:53 +02:00
Vincent Petry
c60ef7deb8
Merge pull request #24619 from owncloud/files_external-psr4
...
Move files_external to PSR-4
2016-05-24 11:54:12 +02:00
Christoph Wurst
ad10485cec
when generating browser/device token, save the login name for later password checks
2016-05-24 11:49:15 +02:00
Vincent Petry
f8bbbba306
Merge pull request #24682 from f4bsch/master
...
dont update search onResize
2016-05-24 11:47:47 +02:00
Joas Schilling
a1e872aad6
Add a URL to the notifications
2016-05-24 11:26:54 +02:00
Joas Schilling
12ec0dfe3c
The setting only affects available core updates
2016-05-24 11:26:54 +02:00
Joas Schilling
823e4911c9
Add tests for the Notifier
2016-05-24 11:26:53 +02:00
Joas Schilling
96691138df
Add tests for the background job
2016-05-24 11:26:53 +02:00
Joas Schilling
c34788918d
Make the group selectable
2016-05-24 11:26:52 +02:00
Joas Schilling
d2553a4f6e
Dismiss the notifications when the update is already installed
2016-05-24 11:26:52 +02:00
Joas Schilling
752ec68e18
Add a notifier that parses the notifications
2016-05-24 11:26:52 +02:00
Joas Schilling
aac990eddf
Add a background job that generates notifications when an update is available
2016-05-24 11:26:51 +02:00
Joas Schilling
64538740ec
Fix missing imports
2016-05-24 08:41:22 +02:00
Joas Schilling
f14dff680d
Move remaining classes to PSR-4
2016-05-24 08:41:22 +02:00
Joas Schilling
4576891f10
Move Lib\Storage to PSR-4
2016-05-24 08:41:22 +02:00
Joas Schilling
b9fd7d4cc7
Move Config to PSR-4
2016-05-24 08:41:21 +02:00
Joas Schilling
6ea54e73e8
Move Lib\Backend to PSR-4
2016-05-24 08:41:21 +02:00
Joas Schilling
6d7a1b9bd4
Move Lib\Auth to PSR-4
2016-05-24 08:41:21 +02:00
Joas Schilling
328b3c47d7
Move stuff from outside lib/ to PSR-4
2016-05-24 08:41:20 +02:00
Vincent Petry
adcf942901
Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support
...
Http Range requests support in downloads
2016-05-23 21:01:26 +02:00
Vincent Petry
87fa86a69a
Merge pull request #24559 from owncloud/2fa
...
two factor auth
2016-05-23 20:50:03 +02:00
Vincent Petry
c10d8a37f7
Merge pull request #22690 from owncloud/fix-comments-href-remote.php-files
...
ensure comments-href returns a value also when propfind is done again…
2016-05-23 14:47:03 +02:00
Vincent Petry
bd87f67473
Merge pull request #24349 from owncloud/nfd-storagewrapper
...
Add wrapper for NFD encoding workaround
2016-05-23 13:45:33 +02:00
Christoph Wurst
dfb4d426c2
Add two factor auth to core
2016-05-23 11:21:10 +02:00
Vincent Petry
9264674b36
Merge pull request #24514 from owncloud/federation-psr4
...
Move federation app to PSR-4
2016-05-23 09:52:38 +02:00
Vincent Petry
5ba1add03c
Merge pull request #24603 from owncloud/federated_reshare
...
flat federated re-share
2016-05-23 09:52:13 +02:00
Joas Schilling
54f8822670
Fix unit tests
2016-05-23 09:03:48 +02:00
Joas Schilling
c9fda84841
Make the root collection neutral so it does not only work for files
2016-05-23 09:03:48 +02:00
Joas Schilling
3a8e537946
Remove unused UserFolder
2016-05-23 09:03:47 +02:00
Jenkins for ownCloud
357d342467
[tx-robot] updated from transifex
2016-05-23 01:55:10 -04:00
Jenkins for ownCloud
88328000b1
[tx-robot] updated from transifex
2016-05-22 01:56:56 -04:00
Vincent Petry
6934840083
Merge pull request #24307 from owncloud/systemtags-perminterface
...
Add interface methods for permission check for system tags
2016-05-21 19:06:54 +02:00
Jenkins for ownCloud
bca7586574
[tx-robot] updated from transifex
2016-05-21 01:55:53 -04:00
Pellaeon Lin
72ac5dd8a1
Make entire file tr droppable,
...
so that .canDrop will highlight the entire row when drag hover
2016-05-21 12:54:29 +08:00
Pellaeon Lin
d3ff3c589b
Add visual cue when moving draggable item over droppable item,
...
ie. breadcrumb and filenameTd
2016-05-21 12:54:29 +08:00
Björn Schießle
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self
2016-05-20 21:15:16 +02:00
Björn Schießle
bc8f659d06
add missung return value
2016-05-20 21:15:16 +02:00
Björn Schießle
06b6e2bff5
improved error messages
2016-05-20 21:15:16 +02:00
Björn Schießle
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app
2016-05-20 21:15:16 +02:00
Björn Schießle
92fa0c7dfd
fall back to old re-sharing behaviour in case the remote server doesn't support flat-reshares
2016-05-20 21:15:16 +02:00
Björn Schießle
2dc26aada7
update share permissions
2016-05-20 21:15:15 +02:00
Björn Schießle
7b25839bd5
use share initiator as fall back to access the file
...
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
2016-05-20 21:15:15 +02:00
Björn Schießle
81e3787f9c
close cursor after select to avoid db lock
2016-05-20 21:15:11 +02:00
Björn Schießle
d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request
...
correctly accross share owner and share initiator
2016-05-20 21:15:11 +02:00
Björn Schießle
8f87e1104d
use query builder for getShare and add tests
2016-05-20 21:15:11 +02:00
Björn Schießle
5a1641bed2
move request handler for federated shares to the federated sharing app
2016-05-20 21:15:08 +02:00
Piotr Filiciak
9999e05660
Http Range requests support in downloads
...
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
Vincent Petry
66e93561da
Rename "not-assignble" to "restricted"
2016-05-20 17:56:02 +02:00
Vincent Petry
5963128342
Adjust DAV SystemTagPlugin unit tests for groups
2016-05-20 17:56:02 +02:00
Vincent Petry
91d4249ed8
Fix system tags DAV plugin tests
2016-05-20 17:56:02 +02:00
Vincent Petry
10fae3994a
Fix system tag update code
2016-05-20 17:56:02 +02:00
Vincent Petry
d7727cdc74
Add admin-only system tag groups property
...
For setting/getting system tag groups
2016-05-20 17:56:02 +02:00
Vincent Petry
88740f035d
Act on effective system tag canAssign permission
...
Whenever the server returns true for the can-assign Webdav property of
a system tag, it means the current user is allowed to assign,
regardless of the value of user-assignable.
This commit brings the proper logic to the web UI to make it possible
for users to assign when they have the permission.
2016-05-20 17:56:02 +02:00
Vincent Petry
03d32bc39b
Fix system tags DAV unit tests
2016-05-20 17:56:02 +02:00
Vincent Petry
bede872dbc
Bring back admin permissions to change system tag permissions
2016-05-20 17:56:02 +02:00
Vincent Petry
09b3883d9c
Updated canUser* functions in SystemTagManager to accept objects
2016-05-20 17:56:02 +02:00
Vincent Petry
8343cfb64b
Add interface methods for permission check
...
Instead of checking for admin perm, use interface method
canUserAssignTag and canUserSeeTag to check for permissions.
Allows for more flexible implementation.
2016-05-20 17:56:02 +02:00
Arthur Schiwon
2b30136ae9
ensure comments-href returns a value also when propfind is done against remote.php/files
2016-05-20 16:22:13 +02:00
Vincent Petry
59a85a4c76
Merge pull request #22576 from owncloud/folder_scroll_fix
...
Add scrolling when dragging files. Fixes #12329
2016-05-20 16:19:01 +02:00
Vincent Petry
e8d082208d
Fixes for encoding wrapper
...
Improved label
Fixed rename/copy/moveFromStorage/copyFromStorage and added tests
Improved findPathToUse algo
2016-05-20 09:33:59 +02:00
Vincent Petry
db4c7fe743
Add encoding wrapper as opt-in mount option
...
The encoding wrapper is now only applied when the mount option is set,
disabled by default.
2016-05-20 09:33:59 +02:00
Vincent Petry
63bbbf29f4
Add wrapper for NFD encoding workaround
2016-05-20 09:33:59 +02:00
Vincent Petry
2ef751b1ec
Merge pull request #24702 from owncloud/background-scan-occ
...
add --unscanned option to files:scan to triger a background scan
2016-05-20 09:29:37 +02:00
Jenkins for ownCloud
67162e636e
[tx-robot] updated from transifex
2016-05-20 01:54:52 -04:00
Vincent Petry
4728308a9e
Merge pull request #24585 from owncloud/files_external_lazy
...
Load external storage backends/auth mechanisms lazily
2016-05-19 18:08:17 +02:00
Robin Appelman
f313105dbd
add "unscanned" option to files:scan to triger a background scan
2016-05-19 14:19:09 +02:00
Joas Schilling
320b1c3abf
Fix more failures
2016-05-19 10:11:42 +02:00
Joas Schilling
a6b4ba9ba1
Fix errors in the tests
2016-05-19 09:48:00 +02:00
Joas Schilling
da332c134e
Move federation tests to PSR-4
2016-05-19 09:48:00 +02:00
Joas Schilling
0c727f1755
Move federation code to PSR-4
2016-05-19 09:48:00 +02:00
Jenkins for ownCloud
7ca5b35379
[tx-robot] updated from transifex
2016-05-19 01:54:58 -04:00
Joas Schilling
8dc25321d3
Move FederatedFileSharing to PSR-4
2016-05-18 15:28:50 +02:00
Jenkins for ownCloud
765782445a
[tx-robot] updated from transifex
2016-05-18 01:54:53 -04:00
blizzz
8ce8a05dab
Fixed dynamic group ldap access ( #23450 )
...
* Fixed dynamic group ldap access
getUserGroups:
Using $userDN instead of $uid to query LDAP
Converting groupDN to group name using API instead of substring
Removing cache processing at the end of the method
* Fixing group handling
added back the cache processing and fixed
* fixed possible indention problem
spaces -> tab conversion
* formatting, white-space changes only
2016-05-17 23:09:36 +02:00
Fabian
2a7d3dd831
dont update search onResize
...
this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
2016-05-17 22:57:07 +02:00
Roeland Douma
5c9103287f
Group fixup ( #24621 )
...
* Move used OC_Group_xx to \OC\Group
* Add (deprecated) legacy wrapper in legacy, OC_Group_xx
* Replace deprecated use of OC_Group_xx with \OC\Group\xx
2016-05-17 16:06:44 +02:00
Vincent Petry
5585fa0a68
Merge pull request #24630 from owncloud/one-shall-adjust-the-path
...
Use proper path
2016-05-17 10:11:21 +02:00
Jenkins for ownCloud
c24a685ab5
[tx-robot] updated from transifex
2016-05-17 01:54:56 -04:00
Jenkins for ownCloud
bafa02d312
[tx-robot] updated from transifex
2016-05-16 01:54:58 -04:00
Piotr Filiciak
53437ecced
Fix: Bugs in shared link with video #24331
2016-05-15 15:41:02 +02:00
Jenkins for ownCloud
7c28f62e20
[tx-robot] updated from transifex
2016-05-15 01:55:34 -04:00
Jenkins for ownCloud
83cd655675
[tx-robot] updated from transifex
2016-05-14 01:56:45 -04:00
Erik Pellikka
5dbb549bbe
added back the jquery animations
2016-05-13 21:01:13 +02:00
Erik Pellikka
4e5f37a05d
code style fix
2016-05-13 21:01:13 +02:00
Erik Pellikka
b94252e479
code style fix
2016-05-13 21:01:13 +02:00
Erik Pellikka
74dfc63b9a
code style fix
2016-05-13 21:01:13 +02:00
Erik Pellikka
d3467edb70
added elseif
2016-05-13 21:01:13 +02:00
Erik Pellikka
45ff21e8d5
fixed to work with share links as well
2016-05-13 21:01:13 +02:00
Erik Pellikka
e7366213f5
typo fix
2016-05-13 21:01:13 +02:00
Erik Pellikka
18b7b61f06
Tweaking
2016-05-13 21:01:13 +02:00
Morris Jobke
5711e88093
Avoids jumping if window is smaller than 300 pixels in height
...
* divides the area where the scroll should be triggered by 2
* uses the minimum value of the above and 300
2016-05-13 21:01:13 +02:00
Erik Pellikka
e03a09d189
Add scrolling when dragging files
2016-05-13 21:01:13 +02:00
Vincent Petry
88da2966b4
Merge pull request #22341 from owncloud/pellaeon-pr-breadcrumb-filelist-overlap-drop
...
Handle case when breadcrumb and filelist item overlap and both receive a drop
2016-05-13 17:12:36 +02:00
Vincent Petry
ddea34f959
Merge pull request #22214 from owncloud/ext-better-dropbox-gdrive
...
Direct links to Google Drive/Dropbox configuration pages from external storage config
2016-05-13 17:09:27 +02:00
Vincent Petry
9cba75ea8a
Merge pull request #24605 from owncloud/luckydonald-Superduper-Progressbar-branch-thingie
...
Luckydonald superduper progressbar branch thingie
2016-05-13 10:00:35 +02:00
Jenkins for ownCloud
cba4875e4d
[tx-robot] updated from transifex
2016-05-13 02:08:45 -04:00
Vincent Petry
5f6fb45704
Merge branch 'Superduper-Progressbar-branch-thingie' of https://github.com/luckydonald/core into luckydonald-Superduper-Progressbar-branch-thingie
2016-05-12 18:15:54 +02:00
Joas Schilling
b34bacd071
Move Files app to PSR-4 ( #24569 )
...
* Move lib/ of Files app to PSR-4
* Move tests to PSR-4
2016-05-12 12:07:06 +02:00
Joas Schilling
eea98f1d74
Background jobs from info.xml ( #24582 )
...
* Move background job registration of Federation to info.xml
* Move background registration of Files app to info.xml
* Move background job registration of files_sharing to info.xml
* Move background job registration of files_trashbin to info.xml
* Move background job registration of files_versions to info.xml
* Move background job registration from user_ldap to info.xml
2016-05-12 10:43:43 +02:00
Joas Schilling
1def89b2c5
Move the testing app to PSR-4 ( #24580 )
2016-05-12 09:49:37 +02:00
Joas Schilling
b57f3126eb
Move files_versions to PSR-4 ( #24571 )
2016-05-12 09:49:15 +02:00
Joas Schilling
d5dee80580
Move files_trashbin to PSR-4 ( #24570 )
2016-05-12 09:48:53 +02:00
Joas Schilling
dd9ee10bc0
Move dav app to PSR-4 ( #24527 )
...
* Move Application to correct namespace and PSR-4 it
* Move dav app to PSR-4
2016-05-12 09:42:40 +02:00
Joas Schilling
4a3311f430
Move Encryption app to PSR-4 ( #24524 )
...
* Move Encryption to PSR-4
* Move encryption tests to PSR-4
* Fix the tests
2016-05-12 09:42:19 +02:00
Jenkins for ownCloud
c5ae14453a
[tx-robot] updated from transifex
2016-05-12 02:08:58 -04:00
Robin McCorkell
8f58b89c3f
Add tests for backend/auth mechanism providers
2016-05-11 21:24:53 +01:00
Robin McCorkell
711bc7469a
Use backend/auth mechanism providers in files_external
2016-05-11 21:16:31 +01:00
Robin McCorkell
af0930fe59
Introduce backend/auth mechanism providers
...
Direct registration of backends/auth mechanisms is now deprecated
2016-05-11 21:16:26 +01:00
Vincent Petry
ceaac03bb5
Make permalinks work for trashed files ( #24537 )
...
Opening a permalink that points to a trashed file will now display the
file within the "Deleted Files" section in the files web UI.
2016-05-11 19:41:36 +02:00
Joas Schilling
2a05035339
Move Provisioning api to PSR-4 ( #24510 )
...
* Move app to PSR-4
* Fix setUp method
* Fix the tests
2016-05-11 19:38:49 +02:00
Thomas Müller
3333c4c0b9
Merge pull request #24568 from owncloud/fix_24566
...
Fix etag propegation test race condition
2016-05-11 16:29:00 +02:00
Roeland Jago Douma
8bfa532075
Fix test race condition
...
E-tag propagation replies on the mtime of the file. Order of events:
1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.
Now this goes right often when 1 and 2 happen in the same second.
However imagine
1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)
Now the mtime will be set to the same time. Thus not chaning the etag.
2016-05-11 14:07:37 +02:00
Christoph Wurst
0486d750aa
use the UID for creating the session token, not the login name
2016-05-11 13:36:46 +02:00
Christoph Wurst
5e55dfb2d6
create session token for DAV clients (sync clients)
2016-05-11 13:36:46 +02:00
Thomas Müller
9eea062004
Merge pull request #24433 from owncloud/user_psr4
...
lib/private/user to PSR-4
2016-05-11 11:16:56 +02:00
Thomas Müller
199b447527
Yo-ho-oh - Murder all band 'o pirates
2016-05-11 09:16:17 +02:00
Jenkins for ownCloud
7da5331782
[tx-robot] updated from transifex
2016-05-11 01:55:55 -04:00
Morris Jobke
e2748e4cbf
fix usage of legacy class in LDAP
2016-05-10 19:53:36 +02:00
Vincent Petry
510724716d
Merge pull request #24401 from owncloud/trash-list-cache
...
use the cache for trash listing
2016-05-10 17:12:49 +02:00
Lukas Reschke
e8e72aa910
Merge pull request #24434 from owncloud/permalinks
...
Permalinks
2016-05-10 09:44:50 +02:00
Jenkins for ownCloud
1fb7be42e5
[tx-robot] updated from transifex
2016-05-10 03:30:51 -04:00
Morris Jobke
fdda980c2f
Merge pull request #24466 from owncloud/issue_13936_wording_ldap
...
wording in LDAP wizard
2016-05-09 08:27:00 +02:00
Jenkins for ownCloud
10e0fc0629
[tx-robot] updated from transifex
2016-05-09 02:08:23 -04:00
Jenkins for ownCloud
5d35844aff
[tx-robot] updated from transifex
2016-05-08 01:54:53 -04:00
Jenkins for ownCloud
956c3f2719
[tx-robot] updated from transifex
2016-05-07 01:54:56 -04:00
Vincent Petry
254576e1f7
Do not encode slashes in "dir" URL param in files JS
2016-05-06 17:00:22 +02:00
Vincent Petry
112b703df0
Add anchor icon in sidebar to copy permalink
2016-05-06 16:46:59 +02:00
Vincent Petry
fdeafef6a0
Auto-add fileid in URL for currently displayed folder
2016-05-06 16:46:59 +02:00
Vincent Petry
093e9dd422
Add route to resolve fileid to files app URL
...
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
2016-05-06 16:46:59 +02:00
Vincent Petry
47157bcd76
Merge pull request #24400 from owncloud/cache_shareManager
...
Cache shareManager
2016-05-06 14:25:30 +02:00
Jenkins for ownCloud
6a95af0a4b
[tx-robot] updated from transifex
2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a
[tx-robot] updated from transifex
2016-05-05 01:55:08 -04:00
davicente
452eeeb344
wording in LDAP wizard
2016-05-04 17:25:44 +01:00
Jenkins for ownCloud
cd7f4ed96f
[tx-robot] updated from transifex
2016-05-04 02:11:59 -04:00
Roeland Douma
2e4b41550e
Merge pull request #24406 from owncloud/psr4-comments-systemtags-updatenotifications
...
Move comments, systemtags and updatenotifications to PSR-4
2016-05-04 08:03:11 +02:00
blizzz
2fd4f1a775
Merge pull request #24396 from owncloud/ctrlEnter-submit-comment
...
Adds functionality to submit comment on ctrl+Enter
2016-05-03 22:24:17 +02:00
Thomas Müller
4b2544925f
Merge pull request #23844 from owncloud/disable-user
...
Add occ commands to enable and disable a user + a disabled user can n…
2016-05-03 15:22:41 +02:00
Lukas Reschke
0d8393178b
Use proper path
...
Fixes https://github.com/owncloud/core/issues/24407
2016-05-03 14:37:50 +02:00
Robin Appelman
435cd31fa6
use the cache for trash listing
2016-05-03 14:36:46 +02:00
Lukas Reschke
df2eb96cc4
Merge pull request #24389 from owncloud/login-by-email
...
Allow login by email address
2016-05-03 13:44:38 +02:00
Robin McCorkell
ac27163f68
Move Dropbox/GDrive link to icon
2016-05-03 11:30:02 +01:00
Robin McCorkell
a09ef66eea
Change colour of input fields instead of printing 'Access granted'
2016-05-03 11:30:02 +01:00
Robin McCorkell
43abe2b648
Add links to load GDrive/Dropbox configuration pages
2016-05-03 11:30:02 +01:00
Robin McCorkell
de98a6e54c
Allow multiple custom JS files
2016-05-03 11:30:02 +01:00
Vincent Chan
5f2a19e965
fixes indentation
2016-05-03 12:29:43 +02:00
Vincent Chan
bc0d136511
adds functionality to submit comments with cmd+Enter
2016-05-03 12:26:05 +02:00
Thomas Müller
f8c04a4219
Merge pull request #24392 from owncloud/declare-cron-jobs-in-info.xml
...
Declare cron jobs in info.xml
2016-05-03 12:03:28 +02:00
Joas Schilling
9ad4a89816
Move comments, systemtags and updatenotifications to PSR-4
2016-05-03 10:20:59 +02:00
Morris Jobke
547830d97e
Merge pull request #22989 from owncloud/lock_sharing_ops
...
Add locking to modifying operation of the OCS Share API
2016-05-03 10:15:54 +02:00
Thomas Müller
cc1d948c2e
Add background job declaration of dav app to info.xml
2016-05-03 08:58:12 +02:00
Jenkins for ownCloud
1974ae8da7
[tx-robot] updated from transifex
2016-05-03 01:57:34 -04:00
Roeland Douma
3835d94d41
Merge pull request #24394 from owncloud/cleanup_share_classmap
...
Cleanup Files_Sharing CLASSPATH
2016-05-03 07:40:52 +02:00
Roeland Jago Douma
3c2fee8775
Cache shareManager
...
There is no need to call \OC::$server->getShareManager for each Node.
We have it available so better pass it around.
2016-05-02 22:27:24 +02:00
Vincent Chan
7ac1cb68f6
Submit comment on ctrl+Enter
...
closes #24302
2016-05-02 19:52:13 +02:00
Roeland Jago Douma
354329acf2
Cleanup Files_Sharing CLASSPATH
...
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
2016-05-02 16:15:40 +02:00
Thomas Müller
b10dcfc3b7
Fixing local event delivery for calendar events based on the email address
2016-05-02 14:20:59 +02:00
Joas Schilling
7bfc617b03
Move activity manager to the namespace
2016-05-02 11:57:24 +02:00
Joas Schilling
b8650be732
Merge pull request #24238 from owncloud/caldav-test-event-in-far-future
...
Test an event in the far future
2016-05-02 10:42:47 +02:00
Roeland Douma
5a62c74495
Merge pull request #24376 from owncloud/remove_dead_code
...
Remove dead code
2016-05-02 09:57:28 +02:00
Morris Jobke
6b12f96b14
Merge pull request #24341 from owncloud/scan-nfd-showwarning
...
Add files:scan warning when NFD or incompatible encoding found
2016-05-02 09:41:12 +02:00
Thomas Müller
8486926a14
Add provisioning api to enable and disable users
2016-05-02 09:31:22 +02:00
Roeland Jago Douma
45d618a133
Remove dead code
...
Ancient files_sharing updater code I came across.
2016-05-02 08:20:42 +02:00
Jenkins for ownCloud
a323111bd1
[tx-robot] updated from transifex
2016-05-02 02:08:49 -04:00
Jenkins for ownCloud
ff8980d59c
[tx-robot] updated from transifex
2016-05-01 01:55:00 -04:00
Roeland Jago Douma
8a652d1238
Unlock before all returns
2016-04-30 11:34:06 +02:00
Roeland Jago Douma
420b5273b1
There is no need to do old etag propagation
...
Etags are calculated differently now and don't require manual updating.
2016-04-30 10:40:45 +02:00
Roeland Jago Douma
62bc53143e
Add locking to modifying operation of the OCS Share API
...
Fixes #17243
This is done in the OCS Share API instead of the share manager since we
want lazy shares in general. However when doing modifying calls via the
OCS Share API it is fine to force real nodes.
* Updated unit tests to work with logging
2016-04-30 10:32:35 +02:00
Jenkins for ownCloud
023c8b0eac
[tx-robot] updated from transifex
2016-04-30 01:55:54 -04:00
Vincent Petry
4326d73ff6
Fix SMB storage to not normalize UTF8
...
This makes sure that even if a NFD file name exists, it is found by the
storage and will be visible to higher layers. Even though the file will
be discarded anyway there, it gives the scanner a chance to display a
warning at least.
2016-04-29 16:19:53 +02:00
Vincent Petry
61203eee04
Add files:scan warning when NFD or incompatible encoding found
2016-04-29 16:18:59 +02:00
Thomas Müller
dda942a917
firstoccurence and lastoccurence have a length now - triggering BIGINT on postgres - refs #24221
2016-04-29 14:57:19 +02:00
Thomas Müller
22ff97256e
Test an event in the far future - refs #24221
2016-04-29 14:57:19 +02:00
Jenkins for ownCloud
1f63e8df61
[tx-robot] updated from transifex
2016-04-29 01:54:56 -04:00
Vincent Petry
6ec835c1da
Merge pull request #24287 from owncloud/smb-110
...
update icewind/streams to 1.1.0
2016-04-28 14:08:51 +02:00
Jenkins for ownCloud
ba0099f73a
[tx-robot] updated from transifex
2016-04-28 01:55:14 -04:00
Thomas Müller
44709276c0
Merge pull request #22777 from owncloud/encrypt_all_master_key
...
improved encrypt-all script
2016-04-27 09:48:46 +02:00
Jenkins for ownCloud
2b67f87ea8
[tx-robot] updated from transifex
2016-04-27 01:55:59 -04:00
Robin Appelman
1cc17436f7
update icewind/streams to 1.1.0
2016-04-26 15:43:30 +02:00
Thomas Müller
887045b790
Merge pull request #24027 from owncloud/translate_ocs_share
...
Translate OCS Share API error messages
2016-04-26 14:42:18 +02:00
Bjoern Schiessle
d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away
2016-04-26 11:06:55 +02:00
Bjoern Schiessle
088ffd05d7
don't create a private-/public-key pair for each user if the master key is enabled
2016-04-26 11:06:55 +02:00
Jenkins for ownCloud
14c3491977
[tx-robot] updated from transifex
2016-04-26 04:50:32 -04:00
Thomas Müller
d8f327831e
Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator
...
LDAP Wizard: reset connection status indicator when switching LDAP co…
2016-04-25 23:02:23 +02:00
Thomas Müller
f6e1b43a38
Merge pull request #22648 from owncloud/propagate-single
...
do propagation in a single query
2016-04-25 23:01:45 +02:00
Vincent Petry
5e57d3a0b9
Merge pull request #24244 from owncloud/mount-unique
...
don't get the config for the same mount multiple times
2016-04-25 17:42:20 +02:00
Arthur Schiwon
3e26e1ec16
LDAP Wizard: reset connection status indicator when switching LDAP config
2016-04-25 16:24:44 +02:00
Robin Appelman
dbfdc6282a
do propagation in a single query
2016-04-25 16:18:59 +02:00
Thomas Müller
6321596134
Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions
...
Fix LDAP race conditions
2016-04-25 14:55:20 +02:00
Thomas Müller
972ce1fe6e
Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement
...
Add missing use statement
2016-04-25 14:46:29 +02:00
Robin Appelman
ca5b189522
add test
2016-04-25 14:28:01 +02:00
Robin Appelman
7e8fd2c639
don't get the config for the same mount multiple times
2016-04-25 14:21:15 +02:00
Joas Schilling
9491d0f65b
Add missing use statement
2016-04-25 13:22:54 +02:00
Lukas Reschke
604b7a49f6
Merge pull request #24230 from owncloud/you-form-of-activities
...
Translate the current user with "You ..."
2016-04-25 12:57:34 +02:00
Vincent Petry
7a22e3f083
Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login
...
on clone Connection, do not take over the existing LDAP resource
2016-04-25 12:38:09 +02:00
Roeland Jago Douma
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
Joas Schilling
d4c9566cd5
Translate the current user with "You ..."
2016-04-25 10:30:58 +02:00
Björn Schießle
74de72e75e
Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
...
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
Jenkins for ownCloud
dab4633300
[tx-robot] updated from transifex
2016-04-25 01:54:53 -04:00
Jenkins for ownCloud
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c
[tx-robot] updated from transifex
2016-04-23 01:56:02 -04:00
Arthur Schiwon
203b0e9cba
on clone Connection, do not take over the existing LDAP resource
...
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-22 21:43:41 +02:00
Thomas Müller
a3813c55da
Merge pull request #24124 from owncloud/encryped-size-progation
...
dont do optimized size propagation for encrypted files
2016-04-22 15:23:42 +02:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
Björn Schießle
606b756a94
Merge pull request #23918 from owncloud/cruds-for-federated-shares
...
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
Thomas Müller
3b3cff4f79
Merge pull request #24151 from owncloud/create-personal-calendar
...
Personal calendar should be generated even if the birthday calendar a…
2016-04-22 11:09:45 +02:00
Jenkins for ownCloud
ded84bf571
[tx-robot] updated from transifex
2016-04-22 01:54:58 -04:00
Thomas Müller
a1da081c62
Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-page
...
OCA.Files.App is not available on public page
2016-04-21 23:21:18 +02:00
Thomas Müller
6e4a28ae86
Merge pull request #24155 from owncloud/fix-birthday_calendar-acl
...
Birthday calendar should never have write acl
2016-04-21 16:49:21 +02:00
Björn Schießle
80959ad95a
Merge pull request #24111 from owncloud/chunk-users-in-background-jobs
...
Chunk the users correctly in the trashbin and versions background job
2016-04-21 14:26:41 +02:00
Christoph Wurst
df2a9d1733
OCA.Files.App is not available on public page
2016-04-21 14:23:18 +02:00
Thomas Müller
1d1247069f
Birthday calendar should never have write acl - fixes #24154
2016-04-21 13:36:52 +02:00
Robin Appelman
b7867e9368
Add unit tests for shared size propagation with encryption
2016-04-21 13:13:18 +02:00
Thomas Müller
38c7296867
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082
2016-04-21 12:34:20 +02:00
Vincent Petry
b50d3255fb
Merge pull request #22791 from owncloud/enc_master_key_improvements
...
Enc master key improvements
2016-04-21 11:48:26 +02:00
Jenkins for ownCloud
02ecd040e6
[tx-robot] updated from transifex
2016-04-21 01:58:49 -04:00
Morris Jobke
62a59854f0
Fix LDAP race conditions
...
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
return only non-null values
2016-04-20 21:50:28 +02:00
Thomas Müller
1ab27ddd4a
Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions
...
migrate deprecated jQuery 1.x functions
2016-04-20 20:38:38 +02:00
Thomas Müller
cd01c440a0
Merge pull request #23919 from owncloud/cyclyc-share-dep-example
...
SharedStorage to new sharing code + cleanup
2016-04-20 20:37:27 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind
2016-04-20 17:47:32 +02:00
Thomas Müller
34b753baa0
Merge pull request #23952 from owncloud/hide-hidden-files
...
Add option to hide hidden files
2016-04-20 11:58:38 +02:00
Thomas Müller
aa33ab0c03
Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test
...
Move the group dummy backend to test
2016-04-20 11:55:00 +02:00
Thomas Müller
a6676f31ec
Merge pull request #24097 from owncloud/fix_23632
...
init users mount point before recovery
2016-04-20 11:54:45 +02:00
Joas Schilling
9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job
2016-04-20 10:36:15 +02:00
Björn Schießle
17eb11cce8
Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments
...
Always add activities for comments to the stream
2016-04-20 10:21:09 +02:00
Björn Schießle
a3381b1d0c
we need to initialize the mount points of the given user before we recover
...
access to his files
2016-04-19 17:04:21 +02:00
Christoph Wurst
e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked')
2016-04-19 16:20:17 +02:00
Christoph Wurst
6c5696d3a8
filter hidden files on the web interface
...
add checkbox to toggle show/hide hidden files
persist show hidden setting
fix settings menu layout
test ApiController::showHiddenFiles
don't show hidden files by default
Store config in Backbone model and inject it into FileList
Filter files only temporarily when rending the file list
Fix file rename validation
2016-04-19 16:08:56 +02:00
Thomas Müller
5b2ef92eb2
Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user
...
Introduce isReadyForUser and verify in file transfer ownership
2016-04-19 15:56:47 +02:00
Roeland Jago Douma
dd7e0d13e5
Move the group dummy backend to test
...
The dummy backend is only used for testing and should thus reside in
tests.
2016-04-19 15:13:31 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse()
2016-04-19 15:06:42 +02:00
Lukas Reschke
a86fd873d6
Merge pull request #24076 from owncloud/fix-initial-calendar-and-addressbook-names
...
Fix displayname for initial calendars and address books
2016-04-19 14:30:35 +02:00
Roeland Douma
0c5f915377
Merge pull request #24054 from owncloud/data_fingerprint
...
Add data-fingerprint property
2016-04-19 14:24:27 +02:00
Roeland Jago Douma
b53d6598f1
Move moveFromCache to CacheJail
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
f27d7cbf99
Move copy- and moveFromStorage to jail
2016-04-19 14:04:00 +02:00
Robin Appelman
2f1c62ce0b
Only construct the storage when we start using it
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
c98fef8a51
Fix resolve path
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
92abb5f23d
Fix tests
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
afa37d363f
Fix related logic
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
6123badbfa
Move SharedStorage et al over to the shareManager and jail
2016-04-19 14:04:00 +02:00
Christoph Wurst
37530f27f0
migrate jQuery.fn.unload()
2016-04-19 12:05:09 +02:00
Jenkins for ownCloud
f812f51c5d
[tx-robot] updated from transifex
2016-04-19 01:55:59 -04:00
Thomas Müller
1773dcbef2
Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook
...
Move post_removeFromGroup to shareManager
2016-04-19 06:59:58 +02:00
Thomas Müller
748134bd90
Fix displayname for initial calendars and address books - fixes #24057
2016-04-18 23:08:37 +02:00
Thomas Müller
d0ad8e6e69
Revert "Fix displayname for initial calendars and address books - fixes #24057"
...
This reverts commit a5d3e5ed68
.
2016-04-18 23:07:49 +02:00
Thomas Müller
a5d3e5ed68
Fix displayname for initial calendars and address books - fixes #24057
2016-04-18 23:06:38 +02:00
Thomas Müller
1626850fc9
Remove deprecated HTTPHelper
2016-04-18 17:28:10 +02:00
Thomas Müller
5c3183cedd
Move version check code out of class Updater
2016-04-18 17:12:59 +02:00
Roeland Jago Douma
dcb2b37e24
Add data-fingerprint property to webdav
2016-04-18 16:08:11 +02:00
Björn Schießle
52669d0ea3
return correct share permissions on propfind
2016-04-18 12:02:06 +02:00
Björn Schießle
d1d80b4f9e
set correct permissions in shareinfo
2016-04-18 12:02:06 +02:00
Thomas Müller
85d809c0d3
Merge pull request #23268 from owncloud/range-requests-should-not-block-the-session
...
Close session for publicwebdav
2016-04-18 09:23:39 +02:00
Thomas Müller
56a37d315b
Merge pull request #24017 from owncloud/share-permissions-namespace
...
Move share-permissions property namespace
2016-04-15 20:12:01 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786
2016-04-15 15:07:40 +02:00
Thomas Müller
63a385d2b8
Merge pull request #23933 from owncloud/remember-file-sorting
...
remember file sort order
2016-04-15 14:06:21 +02:00
Robin Appelman
baff79cc63
Fix loading the dropbox autoloader
2016-04-15 12:46:47 +02:00
Roeland Jago Douma
0cebb16e7c
Move share-permissions property namespace
...
Fixes https://github.com/owncloud/core/issues/23741
2016-04-15 10:22:18 +02:00
Thomas Müller
b23037ec5c
Merge pull request #23998 from owncloud/translate-birthday
...
Translate contacts birthday
2016-04-14 23:41:03 +02:00
C. Montero Luque
5911ce530b
Merge pull request #23527 from owncloud/fix-21136
...
disable Paged Search when chunksize is set to 0, fixes #21136
2016-04-14 11:14:19 -04:00
Thomas Müller
55735e1450
Translate contacts birthday - fixes #23982
2016-04-14 16:58:45 +02:00
Morris Jobke
dba08f5fca
Merge pull request #23985 from owncloud/ext-fix-namespaces
...
Fix namespaces for files_external
2016-04-14 16:32:01 +02:00
Thomas Müller
068e73cc47
Merge pull request #23975 from owncloud/change-default-calendar-and-contacts-names
...
Use better names for the default calendars and addressbooks
2016-04-14 11:57:43 +02:00
Roeland Douma
411fac892a
On mount make sure multiple shares with same target map to unique ones ( #23937 )
...
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in
Before: show only the 'foo' from user1
After: show both.
* Added intergration tests
2016-04-14 11:50:27 +02:00
Robin McCorkell
9a78cac2eb
Fix OCA\Files\External\Api namespace
2016-04-14 00:49:47 +01:00
Robin McCorkell
4717605d22
Fix storage backend class namespaces and move to subdir
...
All classes that were previously \OC\Files\Storage\FooBar are now
\OCA\Files_External\Lib\Storage\FooBar
2016-04-14 00:44:28 +01:00
Thomas Müller
439de52534
Remove dav migration for 9.1
2016-04-13 15:53:57 +02:00
Thomas Müller
353449bff7
Use better names for the default calendars and addressbooks - fixes #23720
2016-04-13 15:44:59 +02:00
Roeland Jago Douma
6144ced7a0
Move post_removeFromGroup to shareManager
...
The last sharing hook to be moved over.
* Added unit tests
* Removed old tests that relied on old behaviour
* Removed old hooks.php
2016-04-13 15:00:12 +02:00
Thomas Müller
3c0a1d4241
Merge pull request #20118 from owncloud/chunked-upload-dav
...
Initial implementation of the new chunked upload
2016-04-13 14:37:10 +02:00
Christoph Wurst
576f7244e6
fix default value, update js/php tests
2016-04-13 14:25:23 +02:00
Christoph Wurst
a4683bcfa9
persist file sorting changes
2016-04-13 11:28:42 +02:00
Christoph Wurst
3f492dd826
load file sorting mode from the db
2016-04-13 11:28:42 +02:00
Christoph Wurst
4d02233faa
restore selection after re-rendering file rows
2016-04-13 11:20:26 +02:00
Joas Schilling
739542816a
Merge pull request #23945 from owncloud/fix_oc_share_permissions
...
always return the complete permissions the file was shared with
2016-04-13 10:20:25 +02:00
Jenkins for ownCloud
a2da7614a0
[tx-robot] updated from transifex
2016-04-13 01:54:59 -04:00
Björn Schießle
499d131a09
always return the complete permissions the file was shared with
2016-04-12 17:56:56 +02:00
Thomas Müller
e21642ca31
Fix unit test of file plugin
2016-04-12 15:51:09 +02:00
Thomas Müller
bb2e68f72b
Fix chunk file move
2016-04-12 14:26:42 +02:00
Stefan Weil
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
Thomas Müller
72f5c539e8
Initial implementation of the new chunked upload - as specified in https://dragotin.wordpress.com/2015/06/22/owncloud-chunking-ng/
2016-04-12 12:32:04 +02:00
Roeland Douma
495a964ca2
Migrate post_groupDelete hook to share manager ( #23841 )
...
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.
* Unit tests added
Again nothing should change it is just to cleanup old code
2016-04-12 09:46:25 +02:00
Joas Schilling
48c41b888c
Always add activities for comments to the stream
2016-04-11 14:57:51 +02:00
Morris Jobke
929a28421a
Merge pull request #23798 from owncloud/federated-unshare-background-job
...
re-try to send unshare notification if remote server is not available
2016-04-11 11:13:00 +02:00
Thomas Müller
8652ef28aa
Merge pull request #23868 from owncloud/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2016-04-11 10:38:02 +02:00
Thomas Müller
35b8c0dd68
Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilities
...
Add blacklisted_files to capabilities
2016-04-11 10:10:10 +02:00
Jenkins for ownCloud
c6f65a3c79
[tx-robot] updated from transifex
2016-04-11 01:54:50 -04:00
Thomas Müller
f9683aaf3d
Merge pull request #23863 from owncloud/fix_unit_tests
...
Fix unit tests warnings
2016-04-10 21:59:39 +02:00
Thomas Müller
24c2252ff4
Adding VCFExportPlugin
2016-04-10 12:43:15 +02:00
Jenkins for ownCloud
a29e732607
[tx-robot] updated from transifex
2016-04-10 01:54:49 -04:00
Jenkins for ownCloud
e68c4b1d73
[tx-robot] updated from transifex
2016-04-09 12:28:39 -04:00
Scrutinizer Auto-Fixer
3ebeb07a30
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-08 15:11:37 +00:00
Roeland Jago Douma
2c77bfa0d0
Fix dav comments
2016-04-08 15:23:23 +02:00
Roeland Jago Douma
7f4f0b20ad
Fix encryption tests
2016-04-08 15:23:17 +02:00
Roeland Jago Douma
4c9e257b27
Fix filesplugin
2016-04-08 15:23:13 +02:00
Roeland Jago Douma
db0c3bd535
Fix Share20OCSTest
2016-04-08 15:22:49 +02:00
Thomas Müller
6f3eeeeb36
Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooks
...
Propagate birthdays of shared addressbooks to the sharee's birthday c…
2016-04-08 15:19:38 +02:00
Roeland Jago Douma
eda71240e2
Add unit tests for public auth webdav
2016-04-08 14:17:24 +02:00
Roeland Jago Douma
375f6fcab1
Move public webdav auth over to share manager
...
The public webdav auth should use the shiny new share manager.
2016-04-08 14:17:13 +02:00
Bjoern Schiessle
fbd5c28c39
re-try to send unshare notification if remote server is not available
2016-04-08 11:32:04 +02:00
Thomas Müller
6eefea1bb6
Merge pull request #23806 from owncloud/multiline-javascript-strings-for-translations
...
Also use Javascript as language in l10n.pl - fixes #13924
2016-04-07 14:13:37 +02:00
Jan-Christoph Borchardt
be9b685926
Merge pull request #23444 from owncloud/add-loading-spinner
...
Add loading spinner to "Add to owncloud"
2016-04-07 13:52:34 +02:00
Joas Schilling
0de15a86f0
Merge pull request #23773 from owncloud/share_move_delete_user_hook
...
Migrate post_userDelete hook to share manager
2016-04-07 13:01:10 +02:00
Thomas Müller
a5a48ae65c
Move some translation stings around to enable xgettext to detect them
2016-04-07 12:59:59 +02:00
Joas Schilling
bba28590b7
Remove xxx from ownCloud we dont want to see that 🙈
2016-04-07 12:18:44 +02:00
Erik Pellikka
73d5889c5d
add loading spinner to add to owncloud input field
...
Update public.js
Update public.js
2016-04-07 04:33:46 -04:00
Jenkins for ownCloud
1576a9a10b
[tx-robot] updated from transifex
2016-04-07 01:56:01 -04:00
Thomas Müller
dda739c0cc
Merge pull request #23501 from owncloud/alarms_for_birthdayevents
...
add VALARM for birthday events
2016-04-06 14:31:07 +02:00
Lukas Reschke
e2ea289943
Merge pull request #23777 from owncloud/ldap-null-user
...
Handle case where the user is not known
2016-04-06 12:58:08 +02:00
Morris Jobke
22898fa107
Use proper shortcut methods in templates
2016-04-06 10:25:04 +02:00
Thomas Müller
01b26d78a0
Merge pull request #23793 from owncloud/hard-code-dav-endpoints
...
All webdav endpoints within remote.php are now hardcoded - helps to p…
2016-04-06 08:34:37 +02:00
Jenkins for ownCloud
fb8c8ef38b
[tx-robot] updated from transifex
2016-04-06 01:56:24 -04:00
Thomas Müller
7bdde98617
All webdav endpoints within remote.php are now hardcoded - helps to prevent migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know
2016-04-05 09:59:43 +02:00
Robin McCorkell
d47824f4cf
Remove any stray socket files before creating new ones
2016-04-05 09:17:21 +02:00
Roeland Jago Douma
db5ea95e29
Add capability to show if group sharing is enabled
...
fixes #23477
Now clients can correct wording to properly reflect who a user can share
with.
2016-04-04 19:35:01 +02:00
Thomas Müller
f6b846584b
Handle case where the user is not known - fixes #23759
2016-04-04 16:56:59 +02:00
Joas Schilling
a4dfc7194d
Add blacklisted_files to capabilities
2016-04-04 15:00:31 +02:00
Roeland Jago Douma
e0cee43cf0
Migrate post_userDelete hook to share manager
...
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.
* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)
Unit tests are added for the defaultshare provider as well as the
federated share provider
2016-04-04 14:15:38 +02:00
Thomas Müller
f6cea3c9c4
Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page
...
In case of exception we return an html page in case the client is a b…
2016-04-04 13:51:23 +02:00
Björn Schießle
53c1902706
Merge pull request #23743 from owncloud/issue-23686-files-transferownership-share-unmount
...
Unmount the share before deleting it, so we don't try to use it later on
2016-04-04 11:11:24 +02:00
Joas Schilling
ac330daef2
Inject the Mount Manager
2016-04-04 09:08:55 +02:00
Jenkins for ownCloud
deca08a683
[tx-robot] updated from transifex
2016-04-02 01:55:25 -04:00
Joas Schilling
3dac3a01c5
Unmount the share before deleting it, so we don't try to use it later on
2016-04-01 21:05:55 +02:00
Jenkins for ownCloud
cce6194368
[tx-robot] updated from transifex
2016-04-01 01:56:19 -04:00
Thomas Müller
63b01a3616
Merge pull request #22834 from owncloud/webdav_property_for_share_permissions
...
Add sharePermissions webdav property
2016-03-31 23:18:53 +02:00
Thomas Müller
690eef26dd
Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp
...
Add urlencode to username part of ftp and sftp links
2016-03-31 23:18:10 +02:00
Morris Jobke
1fac22c2c8
Merge pull request #23564 from owncloud/public-ajaxbasicauth
...
Return 401 DummyBasicAuth in case of ajax call in public link page
2016-03-31 22:23:12 +02:00
Morris Jobke
3b4903a3ea
Merge pull request #23655 from owncloud/better-ldap-design
...
Design LDAP wizard to better integrate into the design
2016-03-31 22:22:55 +02:00
Roeland Jago Douma
89478a0961
Fix unit tests
2016-03-31 21:25:23 +02:00
Frank Karlitschek
6d40e69e29
Merge pull request #23517 from owncloud/gdrive-stream-download
...
GDrive stream download with RetryWrapper
2016-03-31 21:17:10 +02:00
Frank Karlitschek
3142dcc331
Merge pull request #23397 from paurisa/Fixed_23316
...
Fixed Issue 23316 - Invisible buttons should be visible
2016-03-31 21:15:59 +02:00
Roeland Jago Douma
5334bcce66
Correct share permissions for external storages
2016-03-31 20:17:59 +02:00
Roeland Jago Douma
8c0ef4c4bd
Add sharePermissions webdav property
...
This property can be queries by the clients so they know the max
permissions they can use to share a file with. This will improve the UX.
The oc:permissions proptery is not enough since mountpoints have
different permissions (delete + move by default).
By making it a new property the clients can just request it. On older
servers it will just return a 404 for that property (and thus they know
they have to fall back to their hacky work arounds). But if the property
is returned the client can show proper info.
* unit tests
* intergration test
2016-03-31 20:12:34 +02:00
Thomas Müller
dea3985e86
Merge pull request #23516 from owncloud/dropbox-stream-download
...
Dropbox stream download with RetryWrapper
2016-03-31 20:07:36 +02:00
Lukas Reschke
ba69a90ab5
Enforce type
2016-03-31 19:32:30 +02:00
Vincent Petry
262547ba3d
Return 401 DummyBasicAuth in case of ajax call
2016-03-31 19:31:31 +02:00
Jan-Christoph Borchardt
a8a98d42cb
improve emptycontent styles
2016-03-31 15:31:04 +02:00
Thomas Müller
8394985e14
Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftp
...
Use RetryWrapper for SFTP storage
2016-03-31 11:24:47 +02:00
Jenkins for ownCloud
82da373ee7
[tx-robot] updated from transifex
2016-03-31 01:55:24 -04:00
Thomas Müller
d7072ee8e5
Merge pull request #23642 from stweil/master
...
apps: Fix some typos found by codespell
2016-03-30 23:47:00 +02:00
Thomas Müller
395c3d852d
Merge pull request #23508 from owncloud/text-columns-should-have-length
...
Text columns should really have a length 🙈
2016-03-30 23:46:26 +02:00
Lukas Reschke
3dc5c59e57
Use RetryWrapper for SFTP storage
...
Equivalent to https://github.com/owncloud/core/pull/23442
Required for making encryption work with external storage reliable.
2016-03-30 22:45:09 +02:00
Thomas Müller
00c9974d94
Merge pull request #23663 from owncloud/share-displayownerfix
...
Fix displaying owner before share icon in file list
2016-03-30 18:42:25 +02:00
Vincent Petry
7be541bda1
GDrive stream download with RetryWrapper
2016-03-30 18:39:41 +02:00
Vincent Petry
a9aa39efbf
Fix displaying owner before share icon in file list
...
Initial display of owner was missing
2016-03-30 18:09:02 +02:00
Lukas Reschke
bd93722e12
Use the shipped cacerts.pem instead of the global one
...
The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
2016-03-30 16:58:39 +02:00
Morris Jobke
6ffaf726d8
Design LDAP wizard to better integrate into the design
...
* mostly replaces gray background with white one
2016-03-30 15:24:14 +02:00
Stefan Weil
524b374f02
apps/files_external: Fix typos in comments (found and fixed by codespell)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-30 13:27:12 +02:00
Stefan Weil
217d9e8e95
apps/files_trashbin: Fix typos in comments (found and fixed by codespell)
...
Fix also a wrong word.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-30 10:14:26 +02:00
Stefan Weil
65b0127241
apps/dav: Fix typos in comments (found and fixed by codespell)
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-30 10:14:26 +02:00
Jenkins for ownCloud
fc708c1e04
[tx-robot] updated from transifex
2016-03-30 01:57:41 -04:00
Thomas Müller
cd850dc325
Merge pull request #23568 from owncloud/finally-fix-23328-now-for-addressbooks-as-well
...
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
2016-03-29 18:41:40 +02:00
Jenkins for ownCloud
dd5bbc31f2
[tx-robot] updated from transifex
2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8
[tx-robot] updated from transifex
2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
1079554284
[tx-robot] updated from transifex
2016-03-27 01:55:45 -04:00
Achim Königs
596a8416c2
Merge branch 'master' into alarms_for_birthdayevents
2016-03-26 14:27:38 +01:00
Jenkins for ownCloud
3e33b686b1
[tx-robot] updated from transifex
2016-03-26 01:55:15 -04:00
Jenkins for ownCloud
ae97b8e1c2
[tx-robot] updated from transifex
2016-03-25 01:55:47 -04:00
Thomas Müller
ab0db65b23
Merge pull request #23549 from owncloud/dav-sharetypes-remote
...
Return remote shares in oc:share-types Webdav property
2016-03-24 22:44:19 +01:00
Lukas Reschke
95820fbd5b
Add magical regex to catch browsers
2016-03-24 19:02:16 +01:00
Thomas Müller
c46f480031
In case of exception we return an html page in case the client is a browser
2016-03-24 19:02:16 +01:00
Thomas Müller
89cd6e228d
Handle group shares of addressbooks on v1 as well ... now FINALLY ....
2016-03-24 17:11:07 +01:00
Thomas Müller
a7e7f5e180
Merge pull request #23511 from owncloud/sidebar-click
...
sidebar click modification
2016-03-24 13:30:27 +01:00
Thomas Müller
3d51682440
Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-carddav
...
Fix group shares on v1 caldav and carddav
2016-03-24 12:47:18 +01:00
Vincent Petry
9ee1f506f2
Return remote shares in oc:share-types Webdav property
...
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
2016-03-24 12:16:57 +01:00
Erik Pellikka
50655cbf7f
sidebar click modification
2016-03-24 11:57:40 +01:00
Thomas Müller
06e8c70400
Fix acls for calendar objects and cards - fixes #23273
2016-03-24 09:53:36 +01:00
Thomas Müller
8c2b19d2bc
Return proper current-user-principal on v1 endpoints - fixes #23306
2016-03-24 09:53:36 +01:00
Thomas Müller
4c738ea9c4
Fix group shares on v1 caldav and carddav - fixes #23328
2016-03-24 09:53:36 +01:00
Lukas Reschke
cc8c0b6a90
Check if request is sent from official ownCloud client
...
There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check)
While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
2016-03-24 08:59:56 +01:00
Jenkins for ownCloud
4b3af9dfe7
[tx-robot] updated from transifex
2016-03-24 01:57:28 -04:00
Achim Königs
4b2f9e4027
add VALARM for birthday events
...
ACTION=DISPLAY *should* prevents audible alarms.
2016-03-23 23:21:10 +01:00
Arthur Schiwon
c9587cea76
disable Paged Search when chunksize is set to 0, fixes #21136
2016-03-23 19:47:31 +01:00
Vincent Petry
02c2568442
Dropbox stream download with RetryWrapper
2016-03-23 18:06:01 +01:00
Thomas Müller
765cff49fa
Merge pull request #23507 from owncloud/fix-23496-master
...
Avoid fatal php error dring cron execution
2016-03-23 17:21:49 +01:00
Thomas Müller
c8d6a9594a
Propagate birthday to group shares as well
2016-03-23 14:12:50 +01:00
Thomas Müller
ea07a428f4
Merge pull request #22506 from owncloud/node-get-from-cache
...
Query the cache when checking if a node exists
2016-03-23 13:08:17 +01:00
Thomas Müller
e979b9c735
Propagate birthdays of shared addressbooks to the sharee's birthday calendar as well
2016-03-23 12:29:45 +01:00
Thomas Müller
1da18a8ceb
Text columns should really have a length 🙈
2016-03-23 12:03:54 +01:00
Thomas Müller
765c64c73e
fixes #23496
2016-03-23 11:37:00 +01:00
Thomas Müller
24331be991
Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2
...
Fix display of vcard and calendar object details page in browser plugin
2016-03-23 11:03:55 +01:00
Thomas Müller
164282c72e
Fix display of vcard and calendar object details page in browser plugin
2016-03-23 10:35:21 +01:00
Thomas Müller
61c5717281
Merge pull request #23463 from owncloud/lets-consistently-use-no-referer
...
Consistently use rel=noreferrer
2016-03-23 09:14:54 +01:00
Thomas Müller
a25872e034
Merge pull request #23495 from owncloud/disable-paste-zone
...
Disable pastezone for jquery.fileupload
2016-03-23 09:03:50 +01:00
Jenkins for ownCloud
e6fb139eb9
[tx-robot] updated from transifex
2016-03-23 01:57:22 -04:00
Thomas Müller
d5be21fe81
Merge pull request #23398 from owncloud/block_group_sharing
...
Allow blocking of group sharing
2016-03-22 21:28:13 +01:00
Lukas Reschke
f8ae1bb36e
Disable pastezone for jquery.fileupload
...
jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone ) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS.
This implementation triggers some problems:
1. The pastezone is defined globally by default (🙈 ). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads.
2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>.
3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created.
Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled.
Lesson learned: Third-party JS libraries can have some weird details.
2016-03-22 20:28:57 +01:00
Roeland Jago Douma
00f48ec37b
When the Share API is disabled do not return shares
...
Fixes #22668
Block everything in the OCS Share API
2016-03-22 19:43:23 +01:00
Roeland Jago Douma
e69a09756b
Respect disabled group sharing in sharee endpoint
...
* Fix tests
2016-03-22 17:13:34 +01:00
Roeland Jago Douma
52826d0e24
Block group sharing in API and in share manager
...
* Fix tests
2016-03-22 17:13:34 +01:00
Thomas Müller
48ec8ab3d3
Merge pull request #23404 from owncloud/fix-22988
...
adjust PrincipalUri as returned from Sabre to effective username
2016-03-22 14:49:54 +01:00
Thomas Müller
9fc371e436
Merge pull request #23320 from owncloud/early-creation-of-birthday-calendar
...
Create the contact birthday calendar right away as soon as the comman…
2016-03-22 10:31:01 +01:00
Thomas Müller
5e4f9b8627
Merge pull request #23440 from owncloud/fix_22286
...
apply retry wrapper to make sure that we always read/write a complete block
2016-03-22 09:50:05 +01:00
Thomas Müller
ac799a40e3
Merge pull request #23422 from owncloud/icon-and-you-translation-for-comments
...
Add comment icon and "You commented" translations to activities
2016-03-22 09:49:30 +01:00
Jenkins for ownCloud
aa5bb56010
[tx-robot] updated from transifex
2016-03-22 01:55:40 -04:00
Arthur Schiwon
be572de7f0
fix unittest
2016-03-21 21:53:16 +01:00
Thomas Müller
2357bbf80a
Merge pull request #23439 from owncloud/smb-permissions
...
properly use smb permissions
2016-03-21 18:05:45 +01:00
Thomas Müller
36e1476270
Merge pull request #23388 from owncloud/issue-22887-infinite-background-job-loop-for-old-versions
...
Do not create a new job when federation failed to connect but use existing job
2016-03-21 18:04:02 +01:00
Thomas Müller
736b80f0cb
Merge pull request #23323 from owncloud/gdrive-chunkupload
...
Chunk upload for GDrive
2016-03-21 18:02:55 +01:00
Thomas Müller
beef371398
Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonce
...
Do not fire pre/post hooks twice on chunk upload
2016-03-21 18:02:30 +01:00
Thomas Müller
492a1ded1c
Merge pull request #23083 from owncloud/generate-birthdays-on-upgrade
...
Birthday events are generated on upgrade
2016-03-21 17:48:02 +01:00
Bjoern Schiessle
f761733f17
apply retry wrapper to make sure that we always read/write a complete block
2016-03-21 17:39:43 +01:00
Vincent Petry
f28f538029
Do not fire pre/post hooks twice on chunk upload
2016-03-21 15:14:58 +01:00
Robin Appelman
8ab70b1231
properly use smb permissions
2016-03-21 14:35:41 +01:00
Robin Appelman
792752772d
update icewind/smb to 1.0.8
2016-03-21 14:24:00 +01:00
Robin Appelman
dfbd85d723
update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_external
2016-03-21 14:24:00 +01:00
Robin Appelman
d0dd76bb8a
set watch policy in test
2016-03-21 13:53:33 +01:00
Thomas Müller
8852fdaee3
Merge pull request #22789 from owncloud/dav-sharesproperty
...
Add webdav property for share info in PROPFIND response
2016-03-21 11:15:00 +01:00
Joas Schilling
b7f7fc7241
Do not create a new job when it failed to connect atm
2016-03-21 10:29:53 +01:00
Thomas Müller
e983bd7db0
Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser
...
In debugging mode we enable Sabre's browser plugin since it helps a l…
2016-03-21 10:13:27 +01:00
Thomas Müller
c77412b1ac
Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled
...
disable the recovery key if the master key is enabled
2016-03-21 09:49:15 +01:00
Thomas Müller
8442516e10
Merge pull request #23329 from owncloud/fix-21555
...
Avatar must be saved after login is done and external storages set up…
2016-03-21 09:47:50 +01:00
Joas Schilling
b2f4e4559f
Add comment icons and "You commented" translations
2016-03-21 09:41:13 +01:00
Jenkins for ownCloud
35bc315f59
[tx-robot] updated from transifex
2016-03-21 01:55:40 -04:00
Lukas Reschke
6ad957906e
Consistently use rel=noreferrer
...
When linking to external entities we should consistently use rel=noreferrer
2016-03-20 15:27:20 +01:00
Jenkins for ownCloud
1f1d87d413
[tx-robot] updated from transifex
2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465
[tx-robot] updated from transifex
2016-03-19 01:55:39 -04:00
Arthur Schiwon
117c1bffa7
adjust PrincipilUri as returned from Sabre to effective username
2016-03-18 23:31:11 +01:00
Pau
3f3498164c
Fixed hidden settings and delete icons
2016-03-18 17:51:36 +01:00
Bjoern Schiessle
89223379ad
replaceUserKeys() actually deletes the users keys -> update method name and doc-block
2016-03-18 11:06:14 +01:00
Bjoern Schiessle
5e267589d4
only create and update user specific key if no master key is enabled
2016-03-18 11:06:14 +01:00
Jenkins for ownCloud
a6c921267e
[tx-robot] updated from transifex
2016-03-18 01:59:00 -04:00
Thomas Müller
0bc51b9118
Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory
...
Fix dropbox storage to not store the whole file in memory
2016-03-17 20:52:41 +01:00
Thomas Müller
31ee463690
Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap
...
fix writing to cache when fallback server should be used immediately
2016-03-17 20:52:22 +01:00
Thomas Müller
d6d59fe227
Merge pull request #23346 from owncloud/fix_23325
...
Set proper public webdav permissions when public upload disabled
2016-03-17 20:51:54 +01:00
Roeland Jago Douma
6e6e002280
Remove duplicated copyright
2016-03-17 19:24:25 +01:00
Thomas Müller
520724d757
Necessary code changes to make browser plugin properly work
2016-03-17 18:00:06 +01:00
Thomas Müller
7d638fdb34
In debugging mode we enable Sabre's browser plugin since it helps a lot when debugging
2016-03-17 16:51:19 +01:00
Vincent Petry
950530b162
Display share status info in favorite list
...
Returns the shareTypes share status info to the favorites file list.
2016-03-17 15:35:21 +01:00
Vincent Petry
f778e48ee5
Add webdav property for share info in PROPFIND response
2016-03-17 15:35:21 +01:00
Thomas Müller
8fb3e44610
Merge pull request #23287 from owncloud/issue-22786-absolute-paths
...
Fix absolute path creation for remote shares with /oc webroot
2016-03-17 14:29:57 +01:00
Vincent Petry
5db41dfbed
Only use GDrive chunks when needed
2016-03-17 12:36:47 +01:00
Roeland Jago Douma
533fdb4075
Set proper public webdav permissions when public upload disabled
...
Fixes #23325
It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.
To make sure this is handled correctly we need to check the config value
and reduce the permissions.
Fix is kept small to be easy backportable.
2016-03-17 11:35:31 +01:00
Pellaeon Lin
48430d4481
Handle case when breadcrumb and filelist item overlap
...
and both receive a drop.
Build breadcrumb over and out callback in filelist.js and
pass them as options to utilize local selectors of filelist
Re-enable td elements after drop to bread crumb
Fix# drop handler still being called after enable,
it seems that waiting for a short time before re-enabling solves the
problem
* Add explanations for setTimeout re-enable td.filename drop handler
2016-03-17 10:20:57 +01:00
Thomas Müller
828cb08d49
Merge pull request #23334 from owncloud/ext-user-mounting-gui
...
Display external storage GUI even if user mounting disabled
2016-03-17 09:55:23 +01:00
Thomas Müller
b5c56a7322
Merge pull request #23336 from owncloud/occ-typos
...
Some typo corrections in occ command output
2016-03-17 09:31:11 +01:00
Jenkins for ownCloud
ace1812026
[tx-robot] updated from transifex
2016-03-17 01:56:06 -04:00
Carla Schroder
0c9eaede41
Some typo corrections in occ command output
2016-03-16 16:14:25 -07:00
Robin McCorkell
a51ece97e3
Display external storage GUI even if user mounting disabled
2016-03-16 22:06:49 +00:00
Thomas Müller
f3f08cf910
Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff
...
Fallback for crappy ancient distributions
2016-03-16 21:56:36 +01:00
Arthur Schiwon
d8621c78ed
Avatar must be saved after login is done and external storages set up properly, fixes #21555
2016-03-16 20:51:03 +01:00
Vincent Petry
aa2674e7e2
Chunk upload for GDrive
...
Instead of storing the WHOLE file in memory in a PHP variable, use the
library's chunk upload support.
2016-03-16 17:57:54 +01:00
Thomas Müller
b4ea527fb2
Merge pull request #23253 from owncloud/give-swift-more-time
...
Give swift 15 seconds after startup
2016-03-16 17:32:55 +01:00
Thomas Müller
fdb7c59e6c
Create the contact birthday calendar right away as soon as the command is executed once - fixes #23203
2016-03-16 17:23:02 +01:00
Thomas Müller
d188ed938c
Merge pull request #23082 from owncloud/contacts_calendar_name_color
...
add title and color to birthday calendar
2016-03-16 17:17:21 +01:00
Morris Jobke
e7e743bdb4
Give swift 15 seconds after startup
2016-03-16 16:16:04 +01:00
Arthur Schiwon
8e0bd5630c
fix writing to cache when fallback server should be used immediately
2016-03-16 14:44:18 +01:00
Robin Appelman
d498282e12
handle connection errors as storage not available in smb
2016-03-16 13:15:54 +01:00
Thomas Müller
225eebd8f9
Merge pull request #23155 from owncloud/fed-unshare-with
...
Specify the target user when unsharing a federated share
2016-03-16 11:19:09 +01:00
Joas Schilling
140d5f7df3
Make sure to append the web root as per doc
2016-03-16 09:37:48 +01:00
Jenkins for ownCloud
631ae2f0f4
[tx-robot] updated from transifex
2016-03-16 01:55:43 -04:00
Senorsen
a6631eceb4
Add urlencode to username part of ftp and sftp links
...
according to #17796
2016-03-16 01:49:40 +08:00
Vincent Petry
ab50ba7a58
Fix dropbox storage to not store the whole file in memory
...
Since the library can only store the full response in memory on
download, we use an alternate client lib and set the correct headers to
be able to stream the content to a temp file.
2016-03-15 18:05:27 +01:00
Lukas Reschke
7183854509
Close session for publicwebdav
...
We need to close the session otherwise streaming will lead to a blocked ownCloud.
2016-03-15 16:08:55 +01:00
Thomas Müller
8feb42c22e
Merge pull request #23251 from owncloud/fix_22907
...
allow group shares, even if not all public keys are available
2016-03-15 16:00:47 +01:00
Thomas Müller
d4a8d5d2ea
Merge pull request #22998 from owncloud/delay-loading-the-scanner
...
Delay check till scanner is used
2016-03-15 12:16:02 +01:00
Thomas Müller
0f6ea9fd29
Merge pull request #23039 from owncloud/invalid-share-storage
...
dont break when there is an invalid share
2016-03-15 12:15:05 +01:00
Thomas Müller
e9eeb3607f
Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilder-api
...
Correctly escape join statements and use selectAlias
2016-03-15 12:14:17 +01:00
Bjoern Schiessle
9de4a8338e
allow group shares, even if not all public keys are available
2016-03-15 11:33:19 +01:00
Jenkins for ownCloud
2c6617da60
[tx-robot] updated from transifex
2016-03-15 01:55:47 -04:00
Robin Appelman
7d42bdfde0
Specify the target user when unsharing a federated share
2016-03-14 14:34:05 +01:00
Jenkins for ownCloud
e0998c27ff
[tx-robot] updated from transifex
2016-03-14 01:56:12 -04:00
Thomas Müller
31aeca32c2
Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1
...
Mark testing app as compatible with 9.1
2016-03-13 19:59:47 +01:00
Thomas Müller
101e446577
Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-search
...
Return the correct group casing in sharee api
2016-03-13 19:51:07 +01:00
Lukas Reschke
239f1c067c
Mark testing app as compatible with 9.1
2016-03-13 19:47:30 +01:00
Roeland Jago Douma
6509220f82
Fix intergration tests
2016-03-13 13:31:28 +01:00
Roeland Jago Douma
4b1fe0083a
Remove the old OCS Share API code
2016-03-13 13:31:28 +01:00
Lukas Reschke
3a5f58c9b0
Fallback for crappy ancient distributions
...
Fixes https://github.com/owncloud/core/issues/23181
2016-03-12 23:11:31 +01:00
Jenkins for ownCloud
5862a067d9
[tx-robot] updated from transifex
2016-03-12 01:55:36 -05:00
Joas Schilling
aad8aa0970
Correctly lower the search input as well
2016-03-11 14:08:13 +01:00
Joas Schilling
8cd52ed36d
Return the correct group casing in sharee api
2016-03-11 14:08:12 +01:00
Robin Appelman
a8db587b1f
move failedstorage to core
2016-03-11 13:15:45 +01:00
Robin Appelman
3bd6fc797d
dont break when there is an invalid share
2016-03-11 13:15:45 +01:00
Thomas Müller
750ec93394
Merge pull request #23080 from owncloud/use-non-localized-birthday-title
...
Use a birthday title which does not require translation because we ha…
2016-03-11 11:49:13 +01:00
Jenkins for ownCloud
1ed831564e
[tx-robot] updated from transifex
2016-03-11 01:55:49 -05:00
Thomas Müller
866de3c174
Merge pull request #23086 from owncloud/ldap-sort-deprecated
...
remove deprecated ldap_sort
2016-03-11 00:23:13 +01:00
Thomas Müller
07a1313114
Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master
...
getOwner is not available on FileHome
2016-03-10 23:12:51 +01:00
Thomas Müller
e0210058ef
Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10
...
Fake LOCK statement for Windows 7, 8 and 10 network mounts
2016-03-10 23:07:45 +01:00
Thomas Müller
b502667f3a
Merge pull request #23121 from owncloud/scrutinizer_share_fixes
...
Fix some scrutinizer warning in the sharing code
2016-03-10 22:17:06 +01:00
Roeland Jago Douma
e6712c47a6
Fix some scrutinizer warning in the sharing code
...
* Better phpdoc
* Promper use statements
* Unused parameter
2016-03-10 21:35:22 +01:00
Thomas Müller
8e51634e6d
Merge pull request #23056 from owncloud/fix_23044
...
Add mimetype to OCS Share API output
2016-03-10 21:18:19 +01:00
Georg Ehrke
856ca641d1
add title and color to birthday calendar
2016-03-10 21:02:54 +01:00
Thomas Müller
b7adf371c6
getOwner is not available on FileHome - fixes #23116
2016-03-10 20:53:56 +01:00
Thomas Müller
7f16aaefc8
Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-set
...
No fatal error if dstart is not set
2016-03-10 17:58:01 +01:00
Thomas Müller
ad61c552ea
Merge pull request #23087 from owncloud/allow-migrating-all-calendars
...
Allow to migrate calendars of all users
2016-03-10 17:44:23 +01:00
Roeland Jago Douma
517ef52560
Add mimetype to OCS Share API output
...
Fixes #23044
2016-03-10 15:41:17 +01:00
Morris Jobke
48e03e0c49
Fake LOCK statement for Windows 7, 8 and 10 network mounts
...
* fixes #22596
2016-03-10 15:02:37 +01:00
Thomas Müller
5fc859f7ea
Generate birthdays on upgrade from 8.2 as well
2016-03-10 14:17:21 +01:00
Joas Schilling
94915e39db
Allow to migrate calendars of all users
2016-03-10 13:42:09 +01:00
Arthur Schiwon
fe2a506e56
remove deprecated ldap_sort
2016-03-10 13:13:38 +01:00
Thomas Müller
b021c8c475
Birthday events are generated on upgrade
2016-03-10 13:04:50 +01:00
Thomas Müller
85521879cd
The birthday_calendar is read-only
2016-03-10 12:50:07 +01:00
Thomas Müller
fe7103506b
Use a birthday title which does not require translation because we have no idea about the target device language and forcing English upon all users is kind of bad
2016-03-10 12:41:37 +01:00
Thomas Müller
262ec35d50
Merge pull request #23017 from owncloud/first-stop-the-dockers
...
docker containers should be stopped before being removed - refs https…
2016-03-10 10:58:20 +01:00
Thomas Müller
41aae971a9
Merge pull request #23050 from owncloud/href-target-blank
...
make sure links open in new tabs
2016-03-10 10:54:53 +01:00
Joas Schilling
6b4117df34
Correctly escape join statements and use selectAlias
2016-03-10 10:24:08 +01:00
Thomas Müller
6133253a2c
fixes #23004
2016-03-10 09:20:53 +01:00
Thomas Müller
845a45ae4a
Merge pull request #23064 from owncloud/typo-comments-app-desc
...
fix typo in comments app meta data
2016-03-10 08:24:40 +01:00
Jenkins for ownCloud
96d70aa270
[tx-robot] updated from transifex
2016-03-10 01:55:35 -05:00
Arthur Schiwon
6aefc8fba7
fix typo
2016-03-09 22:31:30 +01:00
Jan-Christoph Borchardt
ecbe4aea31
make sure links open in new tabs
2016-03-09 18:49:46 +01:00
Thomas Müller
bc434b252c
fixes #23020
2016-03-09 18:12:39 +01:00
Thomas Müller
822541b689
Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendars
...
Fix syncing of all birthday calendars in one go
2016-03-09 16:44:19 +01:00
Thomas Müller
fe3ffcbfc3
Merge pull request #23026 from stweil/master
...
apps/files: Fix typos in comments (found and fixed by codespell)
2016-03-09 16:43:05 +01:00
Joas Schilling
8c4af74ce7
Fix syncing of all birthday calendars in one go
2016-03-09 16:14:33 +01:00
Lukas Reschke
80b91264e1
Delay check till scanner is used
...
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
2016-03-09 16:01:53 +01:00
Stefan Weil
692f312513
apps/files: Fix typos in comments (found and fixed by codespell)
...
This contribution is AGPL and MIT licensed.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-09 15:14:05 +01:00
Thomas Müller
42bcea1ef0
Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-file
...
Remove disabled autocorrect for new file names
2016-03-09 15:05:32 +01:00
Thomas Müller
cf3cb4d75e
docker containers should be stopped before being removed - refs https://github.com/docker/docker/issues/18758
2016-03-09 14:02:08 +01:00
Thomas Müller
290a16e5d7
Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length-zero
...
Public link share disabled if password length is equal to 0
2016-03-09 12:22:01 +01:00
Thomas Müller
447e8d2313
Merge pull request #22961 from owncloud/fix-gdrive-on-php54
...
Fix compatibility with PHP 5.4
2016-03-09 12:20:42 +01:00
Thomas Müller
30cec687ae
Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents
...
Use HTTPClient instead of file_get_contents
2016-03-09 12:20:06 +01:00
Thomas Müller
3608421800
Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun
...
Use "hasKey" instead of checking the value
2016-03-09 12:19:45 +01:00
Morris Jobke
52f02fe93e
Remove disabled autocorrect for new file names
...
* ref #22784
2016-03-09 08:38:05 +01:00
Jenkins for ownCloud
afe3fdbf49
[tx-robot] updated from transifex
2016-03-09 01:55:42 -05:00
Lukas Reschke
c0200bc5c3
Use "hasKey" instead of checking the value
...
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
2016-03-08 23:24:44 +01:00
Lukas Reschke
8214fae9ae
Use HTTPClient instead of file_get_contents
...
Allows us to catch exceptions like 404's and thus prevents stuff like:
```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
2016-03-08 22:13:00 +01:00
Lukas Reschke
d14adb2351
Fix compatibility with PHP 5.4
...
Fixes https://github.com/owncloud/core/issues/22960
2016-03-08 18:04:24 +01:00
Vincent Petry
e5a107cc45
Fix share mounting recursion
2016-03-08 14:46:42 +01:00
Thomas Müller
20db92c71a
Fix group sharing and sharing permissions - fixes #22932
2016-03-08 11:22:07 +01:00
Thomas Müller
31c89bd3a2
Merge pull request #22885 from owncloud/master-show-version-to-update-to
...
Show version to update to properly
2016-03-08 09:41:52 +01:00
Thomas Müller
2ebf512412
Merge pull request #22915 from owncloud/cleanup_ocs_share_api
...
Cleanup OCS Share Api
2016-03-08 09:41:20 +01:00
Jenkins for ownCloud
a8bafb9bf3
[tx-robot] updated from transifex
2016-03-08 01:55:39 -05:00
prastut
7e52aac771
Public link share disabled if password length is equal to 0
2016-03-08 04:25:35 +05:30
Thomas Müller
0487b541a0
Merge pull request #22880 from owncloud/fix-21656
...
improve log output when no LDAP user was found on login attempt
2016-03-07 17:12:01 +01:00
Roeland Jago Douma
b1dae2a4b9
Can't convert node to string
2016-03-07 16:15:01 +01:00
Roeland Jago Douma
218d042142
Move common code to function
...
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
2016-03-07 16:14:57 +01:00
Thomas Müller
deca1979aa
Calendar and addressbook migration commands are always available
2016-03-07 15:04:19 +01:00
Thomas Müller
3b25ccef65
Handle addressbook migration issue by writing the faulty event to the log and continue
2016-03-07 15:04:19 +01:00
Thomas Müller
d32b35fc7f
Handle calendar migration issue by writing the faulty event to the log and continue
2016-03-07 15:04:19 +01:00
Thomas Müller
a61fa5b526
Merge pull request #22902 from owncloud/share-archivenamedownloadall
...
Fix archive file name when downloading public share
2016-03-07 14:47:35 +01:00
Thomas Müller
8ef760eb5d
Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited
...
Fix uploading to fed share when free space is unlimited
2016-03-07 14:47:01 +01:00
Thomas Müller
e5b5eca5a9
Merge pull request #22787 from owncloud/versions-fixmtimetooltip
...
Fix tooltip for versions mtime
2016-03-07 14:41:46 +01:00
Thomas Müller
46af7db3e3
Merge pull request #22785 from owncloud/trash-returnfalseon401
...
Return false on 401 in file list + trash file list
2016-03-07 14:41:31 +01:00
Thomas Müller
bd4b61f52b
Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint
...
Correctly default to null and add type hint
2016-03-07 13:50:53 +01:00
Thomas Müller
296a46cc38
Merge pull request #22244 from owncloud/dont-update-shared-resource-properties
...
For 9.0 we don't have the possibility to store calendar and addressbo…
2016-03-07 12:42:52 +01:00
Vincent Petry
dbea268332
Remove "files" arg from download URL in public link page
...
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
2016-03-07 11:55:55 +01:00
Vincent Petry
d8e592d670
Fix archive file name when downloading public share
...
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.
This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 11:37:49 +01:00
Joas Schilling
c99ae62c33
Correctly default to null and add type hint
2016-03-07 10:48:16 +01:00
Vincent Petry
60d8046c35
Fix uploading when free space is unlimited
...
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
2016-03-07 10:42:36 +01:00
Jenkins for ownCloud
c07b731689
[tx-robot] updated from transifex
2016-03-07 01:56:53 -05:00
Thomas Müller
f2088cafb8
Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-owncloud
...
Cache results of testRemoteUrl
2016-03-06 20:00:47 +01:00
Thomas Müller
6dcf70f244
Merge pull request #22807 from owncloud/remove-empty-translations
...
ne, or_IN, uz and yo have been removed from transifex and will be rem…
2016-03-06 19:59:57 +01:00
Thomas Müller
6f6d659f56
Merge pull request #22888 from owncloud/use-custom-header
...
Use custom header
2016-03-06 19:53:35 +01:00
Jenkins for ownCloud
05d0d9e9e2
[tx-robot] updated from transifex
2016-03-06 01:55:08 -05:00
Lukas Reschke
4301e30741
Use custom header
...
PHP in CGI mode eats the Authorization header => 💣
2016-03-05 23:04:49 +01:00
Lukas Reschke
4caa9e18b0
Show version to update to properly
...
Properly shows the version that will be updated to.
2016-03-05 21:58:58 +01:00
Jenkins for ownCloud
a98f5c03dc
[tx-robot] updated from transifex
2016-03-05 01:56:08 -05:00
Arthur Schiwon
5d3183afcd
improve log output when no LDAP user was found on login attempt
2016-03-05 00:18:34 +01:00
C. Montero Luque
b3656f1434
Merge pull request #22878 from owncloud/use-clob-for-timezone
...
Use CLOB for timezone
2016-03-04 18:00:48 -05:00
C. Montero Luque
fe86e0c2f8
Merge pull request #22870 from owncloud/autoenable-federation-app
...
Automatically enable "federation" app
2016-03-04 17:44:50 -05:00
Lukas Reschke
b302ec8381
Use CLOB for timezone
...
TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long.
This changes it back to a CLOB as it has been before as well: 8d8bb68b01
. I'm not super convinced that CLOB is the best choice here but at least it seems to work.
Fixes https://github.com/owncloud/core/issues/22876
2016-03-04 21:59:08 +01:00
C. Montero Luque
89315722a1
Merge branch 'master' into autoenable-federation-app
2016-03-04 13:37:42 -05:00
C. Montero Luque
7a0720f300
Merge branch 'master' into fix-db-locking-cleanup
2016-03-04 13:35:04 -05:00
C. Montero Luque
45f49a090a
Merge pull request #22860 from owncloud/trashbin-checkpath
...
Properly check path validity before deleting to trash
2016-03-04 13:33:07 -05:00
Lukas Reschke
1b64982e27
Automatically enable "federation" app
2016-03-04 17:38:51 +01:00
Morris Jobke
138219d74a
Run cleanup of expired DB file locks to background job
...
* fixes #22819
The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.
This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 15:52:23 +01:00
Thomas Müller
e2642129a1
Merge pull request #22857 from owncloud/add-release-channel-selection
...
Add release channel selection back
2016-03-04 15:29:52 +01:00
Thomas Müller
b56dbd0607
Merge pull request #22816 from owncloud/external-unavailable-recheck
...
allow availability recheck for external storages
2016-03-04 15:29:17 +01:00
Vincent Petry
0eb5292aaf
Properly check path validity before deleting to trash
...
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:27:31 +01:00