]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agoMerge pull request #14809 from rullzer/avatarcontroller_cache_fix
Thomas Müller [Wed, 11 Mar 2015 22:27:47 +0000 (23:27 +0100)]
Merge pull request #14809 from rullzer/avatarcontroller_cache_fix

Fix the avatarcontroller cache needing the cache dir

9 years agoMerge pull request #14357 from owncloud/fix/1373
Morris Jobke [Wed, 11 Mar 2015 17:33:51 +0000 (18:33 +0100)]
Merge pull request #14357 from owncloud/fix/1373

Run `updateDataDirectory` after Update

9 years agoFix the avatarcontroller cache needing the cache dir
Roeland Jago Douma [Wed, 11 Mar 2015 17:18:33 +0000 (18:18 +0100)]
Fix the avatarcontroller cache needing the cache dir

This was removed in 82254ad5efb65e8650567f49343ec37eb55e2f3e and
unfortunatly missed by jenkins before mering into master.

9 years agoMerge pull request #14705 from rullzer/avatarcontroller
Lukas Reschke [Wed, 11 Mar 2015 16:15:42 +0000 (17:15 +0100)]
Merge pull request #14705 from rullzer/avatarcontroller

Move AvatarController to AppFramework

9 years agoMerge pull request #13893 from owncloud/create-cachedir-on-user
Morris Jobke [Wed, 11 Mar 2015 15:49:24 +0000 (16:49 +0100)]
Merge pull request #13893 from owncloud/create-cachedir-on-user

Only make sure the cache directory exists when we use it

9 years agoAvatar controller moved to AppFrameWork
Roeland Jago Douma [Tue, 3 Mar 2015 11:52:27 +0000 (12:52 +0100)]
Avatar controller moved to AppFrameWork

* Original avatarcontroller migrated to the appframework
* Added DataDisplayResponse that show data inline in the browser (used
  to retrun the image)
* Removed some unneeded code
* Added unit tests for the avatarcontroller

9 years agoMerge pull request #14798 from owncloud/enable-oci-autotest-master
Lukas Reschke [Wed, 11 Mar 2015 15:14:54 +0000 (16:14 +0100)]
Merge pull request #14798 from owncloud/enable-oci-autotest-master

Setting oci as supported database

9 years agoMerge pull request #14794 from owncloud/add-console-command-user-add
Morris Jobke [Wed, 11 Mar 2015 15:09:23 +0000 (16:09 +0100)]
Merge pull request #14794 from owncloud/add-console-command-user-add

Add a console command user:add to create users over the console

9 years agoMerge pull request #13648 from oparoz/sfnt-fonts-preview
Morris Jobke [Wed, 11 Mar 2015 14:56:32 +0000 (15:56 +0100)]
Merge pull request #13648 from oparoz/sfnt-fonts-preview

Add support for font previews

9 years agoDon't play with config values ...
Thomas Müller [Wed, 11 Mar 2015 14:47:24 +0000 (15:47 +0100)]
Don't play with config values ...

9 years agoMerge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view
Lukas Reschke [Wed, 11 Mar 2015 14:13:59 +0000 (15:13 +0100)]
Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view

Allow iframes from same domain in share view

9 years agoMerge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection...
Morris Jobke [Wed, 11 Mar 2015 13:38:41 +0000 (14:38 +0100)]
Merge pull request #13839 from owncloud/issue/13678-improve-remote-domain-detection-in-sharedropdown

Better finding the remote URL from user input in share dropdown

9 years agoSetting oci as supported database
Thomas Müller [Wed, 11 Mar 2015 13:29:22 +0000 (14:29 +0100)]
Setting oci as supported database

9 years agoAdd a console command user:add to create users over the console
Joas Schilling [Wed, 11 Mar 2015 11:35:16 +0000 (12:35 +0100)]
Add a console command user:add to create users over the console

9 years agoMerge pull request #13513 from owncloud/repair-legacystoragenofatalfail
Morris Jobke [Wed, 11 Mar 2015 12:32:33 +0000 (13:32 +0100)]
Merge pull request #13513 from owncloud/repair-legacystoragenofatalfail

Do not abort when meeting unfixable legacy storages

9 years agoMerge pull request #14791 from owncloud/fix-14516
Lukas Reschke [Wed, 11 Mar 2015 11:52:18 +0000 (12:52 +0100)]
Merge pull request #14791 from owncloud/fix-14516

Adding a more meaningful message for sabre dav exception

9 years agoMerge pull request #14788 from cmeh/patch-3
Thomas Müller [Wed, 11 Mar 2015 11:26:49 +0000 (12:26 +0100)]
Merge pull request #14788 from cmeh/patch-3

Correct "one invalid characters" to "one invalid character"

9 years agoMerge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist
Thomas Müller [Wed, 11 Mar 2015 11:23:22 +0000 (12:23 +0100)]
Merge pull request #14662 from owncloud/issue/14661-show-versions-in-occ-applist

Add an option to include the installed app version in "occ app:list"

9 years agoAdding a more meaningful message for sabre dav exception - fixes #14516
Thomas Müller [Wed, 11 Mar 2015 10:53:31 +0000 (11:53 +0100)]
Adding a more meaningful message for sabre dav exception - fixes #14516

9 years agoMerge pull request #14789 from owncloud/better-app-install-error-messages
Bernhard Posselt [Wed, 11 Mar 2015 10:28:28 +0000 (11:28 +0100)]
Merge pull request #14789 from owncloud/better-app-install-error-messages

display app update error messages

9 years agoMerge pull request #14778 from owncloud/use-occ-setup-in-autotest-master
Thomas Müller [Wed, 11 Mar 2015 10:00:49 +0000 (11:00 +0100)]
Merge pull request #14778 from owncloud/use-occ-setup-in-autotest-master

Use occ to install ownCloud in autotest.sh

9 years agodisplay app update error messages - fixes #14611
Thomas Müller [Wed, 11 Mar 2015 08:59:56 +0000 (09:59 +0100)]
display app update error messages - fixes #14611

9 years agoCorrect "one invalid characters" to "one invalid character"
cmeh [Wed, 11 Mar 2015 08:59:42 +0000 (09:59 +0100)]
Correct "one invalid characters" to "one invalid character"

Corrected "one invalid characters" to "one invalid character" in line 1575.

9 years agoAlways include the installed app version in "occ app:list"
Joas Schilling [Tue, 3 Mar 2015 09:26:09 +0000 (10:26 +0100)]
Always include the installed app version in "occ app:list"

9 years agoProperly handle available databases at runtime and respect setup checks in command...
Thomas Müller [Tue, 10 Mar 2015 22:44:29 +0000 (23:44 +0100)]
Properly handle available databases at runtime and respect setup checks in command line as well

9 years agoNo need to restart the web server in cli mode
Thomas Müller [Tue, 10 Mar 2015 21:59:23 +0000 (22:59 +0100)]
No need to restart the web server in cli mode

9 years agoUse occ to install ownCloud in autotest.sh
Thomas Müller [Tue, 10 Mar 2015 14:59:07 +0000 (15:59 +0100)]
Use occ to install ownCloud in autotest.sh

9 years agoMerge pull request #14783 from owncloud/dont-timeout-cron-master
Morris Jobke [Wed, 11 Mar 2015 08:23:22 +0000 (09:23 +0100)]
Merge pull request #14783 from owncloud/dont-timeout-cron-master

cron.php on cli has no time limitation - fixes #14481

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 11 Mar 2015 05:55:38 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

9 years agocron.php on cli has no time limitation - fixes #14481
Thomas Müller [Wed, 11 Mar 2015 00:09:12 +0000 (01:09 +0100)]
cron.php on cli has no time limitation - fixes #14481

9 years agoMerge pull request #14640 from owncloud/rescanversionsonlyonce
Thomas Müller [Tue, 10 Mar 2015 23:54:20 +0000 (00:54 +0100)]
Merge pull request #14640 from owncloud/rescanversionsonlyonce

Only rescan versions once in trashbin

9 years agoupdate 3rdparty master
Morris Jobke [Tue, 10 Mar 2015 15:06:01 +0000 (16:06 +0100)]
update 3rdparty master

9 years agoMerge pull request #14115 from owncloud/update-symphony-components
Morris Jobke [Tue, 10 Mar 2015 15:05:12 +0000 (16:05 +0100)]
Merge pull request #14115 from owncloud/update-symphony-components

update symphony components to 2.6.4

9 years agoupdate symphony components to 2.6.4
Robin Appelman [Tue, 10 Mar 2015 13:47:08 +0000 (14:47 +0100)]
update symphony components to 2.6.4

9 years agoMerge pull request #14759 from owncloud/clean-up-code
Lukas Reschke [Tue, 10 Mar 2015 13:18:21 +0000 (14:18 +0100)]
Merge pull request #14759 from owncloud/clean-up-code

Clean-up code and use proper exception types

9 years agoMerge pull request #14346 from owncloud/storage-based-path-validation
Lukas Reschke [Tue, 10 Mar 2015 10:02:47 +0000 (11:02 +0100)]
Merge pull request #14346 from owncloud/storage-based-path-validation

adding storage specific filename verification

9 years agoMerge pull request #14534 from owncloud/add-child-src
Thomas Müller [Tue, 10 Mar 2015 09:30:44 +0000 (10:30 +0100)]
Merge pull request #14534 from owncloud/add-child-src

Add support for 'child-src' directive

9 years agoAllow iframes from same domain in share view
Lukas Reschke [Tue, 10 Mar 2015 09:06:15 +0000 (10:06 +0100)]
Allow iframes from same domain in share view

This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this.

Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews.

Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;))

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 10 Mar 2015 05:55:39 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

9 years agoMerge pull request #14689 from owncloud/better-missing-resource-handling
Thomas Müller [Mon, 9 Mar 2015 22:33:25 +0000 (23:33 +0100)]
Merge pull request #14689 from owncloud/better-missing-resource-handling

Log errors and create 404 in network list when a css or js is missing

9 years agoMerge pull request #14753 from owncloud/verify-csrf-token-earlier
Thomas Müller [Mon, 9 Mar 2015 22:06:15 +0000 (23:06 +0100)]
Merge pull request #14753 from owncloud/verify-csrf-token-earlier

Verify CSRF token already in update.php and not the EventSource code

9 years agoMerge pull request #14720 from owncloud/fix-shareetagpropagation
Morris Jobke [Mon, 9 Mar 2015 15:24:06 +0000 (16:24 +0100)]
Merge pull request #14720 from owncloud/fix-shareetagpropagation

Fix size propagation over shared storage boundary

9 years agoMerge pull request #14429 from owncloud/issue/14176-validate-timezone-before-using
Morris Jobke [Mon, 9 Mar 2015 15:16:16 +0000 (16:16 +0100)]
Merge pull request #14429 from owncloud/issue/14176-validate-timezone-before-using

Etc timezones don't exist for .5 and .75 offsets

9 years agoAdd unit test for size propagation across share boundaries
Vincent Petry [Mon, 9 Mar 2015 11:41:29 +0000 (12:41 +0100)]
Add unit test for size propagation across share boundaries

9 years agoMerge pull request #14713 from owncloud/issue/14671-preview-delete-check-for-valid...
Joas Schilling [Mon, 9 Mar 2015 10:56:46 +0000 (11:56 +0100)]
Merge pull request #14713 from owncloud/issue/14671-preview-delete-check-for-valid-fileid

Check whether the file id is valid, before using it to delete the previews

9 years agoClean-up code and use proper exception types
Lukas Reschke [Mon, 9 Mar 2015 10:48:55 +0000 (11:48 +0100)]
Clean-up code and use proper exception types

9 years agoCheck whether the file id is valid, before using it to delete the previews
Joas Schilling [Thu, 5 Mar 2015 15:07:42 +0000 (16:07 +0100)]
Check whether the file id is valid, before using it to delete the previews

9 years agono translation service in common storage class
Thomas Müller [Wed, 4 Mar 2015 13:03:47 +0000 (14:03 +0100)]
no translation service in common storage class

9 years agoRespect http header 'Accept-Language' on ocs and remote.php calls
Thomas Müller [Tue, 24 Feb 2015 16:42:26 +0000 (17:42 +0100)]
Respect http header 'Accept-Language' on ocs and remote.php calls

9 years agotranslate error messages
Thomas Müller [Tue, 24 Feb 2015 16:20:59 +0000 (17:20 +0100)]
translate error messages

9 years agoOptimize loop
Lukas Reschke [Fri, 20 Feb 2015 17:19:14 +0000 (18:19 +0100)]
Optimize loop

9 years agofixing js unit tests
Thomas Müller [Thu, 19 Feb 2015 10:23:01 +0000 (11:23 +0100)]
fixing js unit tests

9 years agodeprecate isValidFileName()
Thomas Müller [Wed, 18 Feb 2015 17:35:27 +0000 (18:35 +0100)]
deprecate isValidFileName()

9 years agofixing namespaces and PHPDoc
Thomas Müller [Wed, 18 Feb 2015 17:28:24 +0000 (18:28 +0100)]
fixing namespaces and PHPDoc

9 years agoadding storage specific filename verification - refs #13640
Thomas Müller [Wed, 18 Feb 2015 16:44:13 +0000 (17:44 +0100)]
adding storage specific filename verification - refs #13640

9 years agoVerify CSRF token already in update.php and not the EventSource code
Lukas Reschke [Mon, 9 Mar 2015 09:07:30 +0000 (10:07 +0100)]
Verify CSRF token already in update.php and not the EventSource code

Issue report:
> Hum, well I upgraded the package then visited the web interface to
trigger the update and it failed; the UI would say there was a
possible CSRF attack and after that it'd be stuck in maintenance mode.
Tried a few times (by editing maintenance to false in owncloud.conf)
and same result each time.

That smells partially like an issue caused by our EventSource implementation, due to legacy concerns the CSRF verification happens within the EventSource handling and not when the actual endpoint is called, what happens here then is:

1. User has somehow an invalid CSRF token in session (or none at all)
2. User clicks the update button
3. Invalid CSRF token is sent to update.php - no CSRF check there => Instance gets set in maintenance mode
4. Invalid CSRF token is processed by the EventSource code => Code Execution is stopped and ownCloud is stuck in maintenance mode

I have a work-around for this problem, basically it verifies the CSRF token already in step 3 and cancels execution then. The same error will be shown to the user however he can work around it by refreshing the page – as stated by the error. I think that’s an acceptable behaviour for now: INSERT LINK

To verify this test:

1. Delete your ownCloud cookies
2. Increment the version in version.php
3. Try to upgrade
=> Before the patch: Instance shows an error, is set to upgrade mode and a refresh does not help
=> After the patch: Instance shows an error, a refresh helps though.

This is not really the best fix as a better solution would be to catch such situations when bootstrapping ownCloud, however, I don’t dare to touch base.php for this sake only, you never know what breaks then…

That said: There might be other bugs as well, especially the stacktrace is somewhat confusing but then again it installing ownCloud under /usr/share/owncloud/ and I bet that is part of the whole issue ;-)

9 years agoMerge pull request #14750 from owncloud/possible-fix-for-OC_Version
Thomas Müller [Mon, 9 Mar 2015 08:55:21 +0000 (09:55 +0100)]
Merge pull request #14750 from owncloud/possible-fix-for-OC_Version

proper filename for "require version.php"

9 years agoMerge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit
Morris Jobke [Mon, 9 Mar 2015 07:12:25 +0000 (08:12 +0100)]
Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit

LDAP: set up paged search even if limit is 0

9 years agoproper filename for "require version.php"
Morris Jobke [Mon, 9 Mar 2015 07:02:09 +0000 (08:02 +0100)]
proper filename for "require version.php"

9 years agoMerge pull request #14743 from owncloud/autoconfig-password
Morris Jobke [Mon, 9 Mar 2015 06:54:22 +0000 (07:54 +0100)]
Merge pull request #14743 from owncloud/autoconfig-password

Convert 'abcpassword' to 'abcpass' during setup

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 9 Mar 2015 05:54:36 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 8 Mar 2015 06:54:36 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoConvert 'abcpassword' to 'abcpass' during setup
Robin McCorkell [Sat, 7 Mar 2015 13:10:43 +0000 (13:10 +0000)]
Convert 'abcpassword' to 'abcpass' during setup

This allows autoconfig files to use 'dbpassword' instead of 'dbpass', which
is more consistent with config.php

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 7 Mar 2015 06:54:37 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #14736 from owncloud/errors-list
Morris Jobke [Fri, 6 Mar 2015 22:13:44 +0000 (23:13 +0100)]
Merge pull request #14736 from owncloud/errors-list

adjust list of errors, more compact and readable

9 years agoMerge pull request #14722 from owncloud/master-14711
Lukas Reschke [Fri, 6 Mar 2015 17:52:12 +0000 (18:52 +0100)]
Merge pull request #14722 from owncloud/master-14711

Fix totally broken AppStore code...

9 years agoMerge pull request #14734 from owncloud/unit-test-insertIfNotExist
Thomas Müller [Fri, 6 Mar 2015 17:20:22 +0000 (18:20 +0100)]
Merge pull request #14734 from owncloud/unit-test-insertIfNotExist

[sqlite] Use an atomic implementation on sqlite for insertIfNotExist() + use it in the file cache ...

9 years agouse insertIfNotExist() in cache put
Thomas Müller [Fri, 6 Mar 2015 14:32:58 +0000 (15:32 +0100)]
use insertIfNotExist() in cache put

9 years agoadjust list of errors, more compact and readable
Jan-Christoph Borchardt [Fri, 6 Mar 2015 14:27:21 +0000 (15:27 +0100)]
adjust list of errors, more compact and readable

9 years agoFix PHPDoc on the way ....
Thomas Müller [Fri, 6 Mar 2015 13:51:08 +0000 (14:51 +0100)]
Fix PHPDoc on the way ....

9 years agoUse an atomic implementation on sqlite for insertIfNotExist()
Thomas Müller [Fri, 6 Mar 2015 13:50:51 +0000 (14:50 +0100)]
Use an atomic implementation on sqlite for insertIfNotExist()

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 6 Mar 2015 06:54:52 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoFix totally broken AppStore code...
Lukas Reschke [Thu, 5 Mar 2015 23:16:17 +0000 (00:16 +0100)]
Fix totally broken AppStore code...

As it turned out the AppStore code was completely broken when it came from apps delivered from the appstore, this meant:

1. You could not disable and then re-enable an application that was installed from the AppStore. It simply failed hard.
2. You could not disable apps from the categories but only from the "Activated" page
3. It did not show the activation state from any category page

This code is completely static and thus testing it is impossible. We really have to stop with "let's add yet another feature in already existing static code". Such stuff has to get refactored first.

That said, this code works from what I can say when clicking around in the AppStore page GUI. However, it may easily be that it does not work with updates or whatsever as I have no chance to test that since the AppStore code is not open-source and it is impossible to write unit-tests for that.

Fixes https://github.com/owncloud/core/issues/14711

9 years agoFix size propagation over shared storage boundary
Vincent Petry [Thu, 5 Mar 2015 21:23:47 +0000 (22:23 +0100)]
Fix size propagation over shared storage boundary

9 years agoset up paged search when limit is 0
Arthur Schiwon [Thu, 5 Mar 2015 12:15:21 +0000 (13:15 +0100)]
set up paged search when limit is 0

9 years agoMerge pull request #13368 from owncloud/memcache_lowlatency
Lukas Reschke [Thu, 5 Mar 2015 12:05:17 +0000 (13:05 +0100)]
Merge pull request #13368 from owncloud/memcache_lowlatency

Refactor \OC\Memcache\Factory

9 years ago\OC\Memcache\Cache implements \OCP\ICache
Robin McCorkell [Fri, 16 Jan 2015 13:38:55 +0000 (13:38 +0000)]
\OC\Memcache\Cache implements \OCP\ICache

9 years agoRefactor \OC\Memcache\Factory
Robin McCorkell [Wed, 14 Jan 2015 18:25:00 +0000 (18:25 +0000)]
Refactor \OC\Memcache\Factory

Caches divided up into two groups: distributed and local. 'Low latency' is an
alias for local caches, while the standard `create()` call tries to get
distributed caches first, then local caches.

Memcache backend is set in `config.php`, with the keys `memcache.local` and
`memcache.distributed`. If not set, `memcache.distributed` defaults to the value
of `memcache.local`.

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 5 Mar 2015 06:56:35 +0000 (01:56 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #14691 from owncloud/karma-forcejasmine2
Morris Jobke [Wed, 4 Mar 2015 19:36:49 +0000 (20:36 +0100)]
Merge pull request #14691 from owncloud/karma-forcejasmine2

Make sure we use Jasmine 2 for running JS unit tests

9 years agoMerge pull request #14672 from Crote/master
Morris Jobke [Wed, 4 Mar 2015 19:21:14 +0000 (20:21 +0100)]
Merge pull request #14672 from Crote/master

Add --show-password option to ldap:show-config

9 years agoLog errors and create 404 in network list when a css or js is missing
Joas Schilling [Wed, 4 Mar 2015 12:24:24 +0000 (13:24 +0100)]
Log errors and create 404 in network list when a css or js is missing

9 years agoMerge pull request #14693 from owncloud/fix-phpdoc
Vincent Petry [Wed, 4 Mar 2015 16:55:24 +0000 (17:55 +0100)]
Merge pull request #14693 from owncloud/fix-phpdoc

Fix PHPDoc

9 years agoFix PHPDoc
Lukas Reschke [Wed, 4 Mar 2015 14:35:41 +0000 (15:35 +0100)]
Fix PHPDoc

That apparently went lost when changing the signature.

9 years agoMerge pull request #14690 from owncloud/trash-deletelink-unittest
Vincent Petry [Wed, 4 Mar 2015 13:50:11 +0000 (14:50 +0100)]
Merge pull request #14690 from owncloud/trash-deletelink-unittest

Add unit test for selection overlay actions in trashbin

9 years agoAdd --show-password option to ldap:show-config
Laurens Post [Tue, 3 Mar 2015 15:17:50 +0000 (16:17 +0100)]
Add --show-password option to ldap:show-config

9 years agoMake sure we use Jasmine 2 for running JS unit tests
Vincent Petry [Wed, 4 Mar 2015 12:50:59 +0000 (13:50 +0100)]
Make sure we use Jasmine 2 for running JS unit tests

9 years agoAdd unit test for selection overlay actions in trashbin
Vincent Petry [Wed, 4 Mar 2015 12:49:19 +0000 (13:49 +0100)]
Add unit test for selection overlay actions in trashbin

9 years agoMerge pull request #14685 from owncloud/test-noop-scanner
Morris Jobke [Wed, 4 Mar 2015 12:19:41 +0000 (13:19 +0100)]
Merge pull request #14685 from owncloud/test-noop-scanner

Add a test for ObjectStore\NoopScanner

9 years agoMerge pull request #14675 from owncloud/files-external-smb-windows
Thomas Müller [Wed, 4 Mar 2015 11:27:59 +0000 (12:27 +0100)]
Merge pull request #14675 from owncloud/files-external-smb-windows

adding a windows smb config for testing to ci

9 years agoAdd a test for ObjectStore\NoopScanner
Joas Schilling [Wed, 4 Mar 2015 10:37:35 +0000 (11:37 +0100)]
Add a test for ObjectStore\NoopScanner

9 years agoMerge pull request #14582 from rullzer/avatar_fixes
Morris Jobke [Wed, 4 Mar 2015 09:30:09 +0000 (10:30 +0100)]
Merge pull request #14582 from rullzer/avatar_fixes

Avatars in share dialog fixes

9 years agoFix slash normalization error in AmazonS3Migration unit test
Robin McCorkell [Tue, 3 Mar 2015 09:42:25 +0000 (09:42 +0000)]
Fix slash normalization error in AmazonS3Migration unit test

Since aa821ecc00f11b6382f6e033db18445d9e51d6b9 leading and trailing slashes are
trimmed in the file cache paths

9 years agoMerge pull request #14682 from owncloud/issue/14681-noop-scanner-outdated
Vincent Petry [Wed, 4 Mar 2015 09:07:42 +0000 (10:07 +0100)]
Merge pull request #14682 from owncloud/issue/14681-noop-scanner-outdated

Update scanFile() and scanChildren() to the new signature of the parent ...

9 years agoMerge pull request #14326 from owncloud/remove-unnessary-backslashes-from-translation
Morris Jobke [Wed, 4 Mar 2015 08:58:42 +0000 (09:58 +0100)]
Merge pull request #14326 from owncloud/remove-unnessary-backslashes-from-translation

Remove unnecessary backslashes from translations

9 years agoMerge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best...
Morris Jobke [Wed, 4 Mar 2015 08:36:01 +0000 (09:36 +0100)]
Merge pull request #14651 from owncloud/add-some-headers-to-htaccess-for-my-best-friend-jenkins

Let users configure security headers in their Webserver

9 years agoUpdate scanFile() and scanChildren() to the new signature of the parent class
Joas Schilling [Wed, 4 Mar 2015 08:22:53 +0000 (09:22 +0100)]
Update scanFile() and scanChildren() to the new signature of the parent class

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 4 Mar 2015 06:55:19 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoAvatars in share dialog fixes
Roeland Jago Douma [Tue, 24 Feb 2015 20:46:24 +0000 (21:46 +0100)]
Avatars in share dialog fixes

* Avatar for "xxxx share with you..." to the left
* Avatars for groups and remote shares (use default placeholder)
* Modified and added unit tests
* Use the same css for all the avatars in the dropdown

9 years agoMerge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2
Joas Schilling [Tue, 3 Mar 2015 17:33:08 +0000 (18:33 +0100)]
Merge pull request #14674 from owncloud/fix-l10n-getlanguagecode-2

Jenkins #14650