Commit Graph

31457 Commits

Author SHA1 Message Date
Joshua Ruehlig 329849f2c2 To be safe don't unload until end (#23752)
* To be safe don't unload until end

* unlink needs to be before return to actually do anything
2016-04-11 14:04:57 +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
Thomas Müller e2c4a0cecd Merge pull request #23860 from owncloud/followup-23304-opening-empty-file
Correctly return an empty string for empty files
2016-04-11 10:08:24 +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 4d09e2453e Merge pull request #23891 from owncloud/add-download-icon-white
Added white download icons
2016-04-10 21:59:21 +02:00
Thomas Müller 7fc1d52b75 Merge pull request #23893 from owncloud/add-VCFExportPlugin
Adding VCFExportPlugin
2016-04-10 20:35:13 +02:00
skjnldsv 408bdd65c2 Added white download icons 2016-04-10 13:54:17 +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 2a0244df27
Fix mappertest 2016-04-08 15:23:09 +02:00
Roeland Jago Douma f9ade49c7e
Fix notification tests 2016-04-08 15:23:06 +02:00
Roeland Jago Douma b9b19cef41
Fix avatar controller tests 2016-04-08 15:23:00 +02:00
Roeland Jago Douma e65e7a5ad7
Fix ShareManager tests 2016-04-08 15:22:57 +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
Thomas Müller 88a366b314 Merge pull request #23839 from owncloud/sabre-dav-3.0.9
Update 3rdparty with 3.0.9 sabre/dav
2016-04-08 15:00:26 +02:00
Thomas Müller 1d3d43b1e9 Merge pull request #23553 from owncloud/lock-ttl-execution-time
Make lock ttl configurable
2016-04-08 14:53:26 +02:00
Thomas Müller 53acb4a65f Merge pull request #23736 from owncloud/move_public_webdav_auth_to_share_manager
Move public webdav auth to share manager
2016-04-08 14:52:15 +02:00
Thomas Müller 6fb1008e1b Merge pull request #23848 from stweil/master
lib: Fix typos (found by codespell)
2016-04-08 14:51:23 +02:00
Joas Schilling 178ad23d80
Correctly return an empty string for empty files 2016-04-08 14:50:42 +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
Roeland Jago Douma bd3bde2f3b
Set proper permissions on link share
If we do not allow public upload we should limit the permissions on
links shares upon retrieval.

* Added unit test
* Allow fetching federated shares by token as well
2016-04-08 14:17:05 +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
Stefan Weil b1a856d7b7 lib: Fix typos (found by codespell)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-07 19:51:27 +02:00
Joas Schilling 0825ad3ab9
Update 3rdparty with sabre/dav 3.0.9 2016-04-07 17:23:35 +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
Thomas Müller f5c5f45572 Also use Javascript as language in l10n.pl - fixes #13924 2016-04-07 12:59:59 +02:00
Thomas Müller 8932ec64a5 Merge pull request #23833 from owncloud/remove-xxx
Remove xxx from ownCloud we dont want to see that 🙈
2016-04-07 12:53:29 +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
Robin Appelman cdedda99e4 Make lock ttl configurable 2016-04-07 08:24:13 +02:00
Jenkins for ownCloud 1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
John Molakvoæ fade4796e7 Merge pull request #23768 from owncloud/skjnldsv-color-generator-edit
Updated color generator
2016-04-07 05:03:38 +02:00
John Molakvoæ 28571e6361 Updated color generator
Separated the main function to allow special use without dom manipulation.
2016-04-06 19:34:50 +02:00
Lukas Reschke 9b930cd01d Merge pull request #23766 from owncloud/replace-getid-3
Replace getid3 with ID3Parser
2016-04-06 18:32:18 +02:00
Thomas Müller 90c853614d Merge pull request #23822 from stweil/master
tests: Fix typos (found by codespell)
2016-04-06 15:11:51 +02:00
Stefan Weil 02e226a6b3 tests: Fix typos (found by codespell)
Fix also a small grammar issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-06 15:08:27 +02: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