9c4ab51735
Merge pull request #21364 from owncloud/bring_back_icons_filepicker
...
Get the icon in javascript for the filepicker
2015-12-28 10:21:58 +01:00
edd051dc02
Merge pull request #21291 from owncloud/refactor-call-check
...
Refactor OC_Util::callCheck
2015-12-28 10:21:44 +01:00
7693c6d84a
Merge pull request #21254 from owncloud/files-uploadcanceliconfix
...
Correctly render uploadtext indicator only on folders
2015-12-28 10:21:38 +01:00
24271cf953
Merge pull request #21216 from owncloud/fopen-statcache
...
Clear SMB statcache after fopen
2015-12-28 10:21:26 +01:00
eb509bcbe6
Merge pull request #17333 from owncloud/php7-scalar-types-controllers
...
Prefer scalar type hints over phpdoc annotation
2015-12-28 10:21:14 +01:00
245dac7e81
Merge pull request #20992 from owncloud/log-in-noselect
...
prevent selecting on log in page to solve ugliness on accidental selection
2015-12-28 10:18:30 +01:00
89584716f8
[tx-robot] updated from transifex
2015-12-28 01:55:10 -05:00
d8c2d0051a
Merge pull request #21368 from owncloud/xenopathic-mailmap
...
Update mailmap for myself
2015-12-27 09:57:40 +01:00
6fe60569f5
[tx-robot] updated from transifex
2015-12-27 01:54:38 -05:00
33a83a0926
[tx-robot] updated from transifex
2015-12-25 01:55:16 -05:00
5f3c462743
Merge pull request #21093 from owncloud/migrate-no-user
...
Dont break the files_external migrator if no user is logged in
2015-12-24 16:43:28 +01:00
7e66ea89e6
Add mention bot for Robin McCorkell
2015-12-24 11:52:13 +00:00
a09ffaedb4
Correct mailmap for Robin McCorkell to robin@mccorkell.me.uk
2015-12-24 11:51:37 +00:00
1622589ac5
prevent selecting on log in page to solve ugliness on accidental selection
2015-12-24 11:01:31 +01:00
fd96331e59
Merge pull request #21323 from owncloud/placeholder_sane_precission
...
[Avatars] Calculate 'sane' hue precissions
2015-12-24 11:01:27 +01:00
2fc458479e
[Avatars] Calculate 'sane' hue precissions
...
We used to get the numeric value of the entrire md5 string which is a
128bit integer. We would then devide this by the maxval of a 128bit int.
There is no need for such huge computations. As we just require a value
between 0 and 255. Thus using two 16 bit values is more than enough to
get the precision we need. By just taking the MSB we get nearly
identical results.
2015-12-24 10:50:12 +01:00
b2df7b6b8a
Fix unit test
2015-12-24 09:20:26 +01:00
23c754aed3
prefer scalar type hints over phpdoc annotation
...
use method exists lookup to be safe and not break on old hhvm versions
add test that checks if type hint is preferred over annotation
2015-12-24 09:20:26 +01:00
9be43e10af
Since the server no longer calculates the icon
...
The server no longer calculates the icon. So we have the js side do it
for us.
2015-12-24 08:59:32 +01:00
9cdc3f0558
[tx-robot] updated from transifex
2015-12-24 01:55:14 -05:00
1b369870f2
Merge pull request #21347 from owncloud/fix-unit-tests-on-master
...
Fix unit tests
2015-12-23 10:11:18 +01:00
cebeb0e052
Fix unit tests
...
Fixes https://github.com/owncloud/core/issues/21345
2015-12-23 09:11:22 +01:00
726f7e5fa8
[tx-robot] updated from transifex
2015-12-23 02:02:31 -05:00
fe262ab522
Merge pull request #21318 from ryno83/target_blank_for_links_in_setupcheck
...
add target="_blank" to href in setupcheck
2015-12-23 07:26:15 +01:00
064580a56e
Add an option to occ ldap:showremnants to output a json encoded array for use in scripts and other tools.
2015-12-22 16:28:32 -05:00
7fce06b3f3
When microtime(true) returns a whole number, then the parsing fails.
...
This patch makes sure, that the value can always be parsed correctly.
2015-12-22 15:06:32 +01:00
5e3710d746
Merge pull request #21325 from owncloud/files-donotduplicatewebdavproperties
...
Make a modifiable copy of the webdav properties in JS file list
2015-12-22 12:16:26 +01:00
ca14277fca
Make a modifiable copy of the webdav properties in JS file list
...
Plugins can extend _getWebdavProperties to add custom properties.
These should not be added to the original properties list, so now the
FileList makes a copy of the array.
2015-12-22 11:17:24 +01:00
d17c2fb8d9
Merge pull request #21287 from owncloud/travis-dav-caldavtester
...
Adding integration tests for CalDAV
2015-12-22 10:52:54 +01:00
6f00729124
Refactor OC_Util::callCheck
2015-12-22 09:32:14 +01:00
152e72c4fc
Merge pull request #21312 from owncloud/fed-handshake-logging
...
Add error logging to federation handshake
2015-12-22 09:29:54 +01:00
83899a5fa1
add _blank to href
2015-12-21 13:28:32 -05:00
6b1cb44cb1
Merge pull request #21316 from owncloud/tests-fixtestcasetoallowfailure
...
Restore DB connection after failure
2015-12-21 18:53:35 +01:00
d7169ffdec
Restore DB connection after failure
...
In case of failure, PHPUnit seems to skip `tearDown`, so any useful
assertion messages cannot be shown because `tearDownAfterClass` is
throwing an error because of database usage.
This commit makes sure we also restore the database in
`tearDownAfterClass` to prevent the data root restoration to fail
2015-12-21 18:14:29 +01:00
ef9a231f6c
Add error logging to federated sharing handshake
2015-12-21 16:37:54 +01:00
d3883ca9d4
Adding integration tests for CalDAV
2015-12-21 16:04:27 +01:00
38a006b1e8
Merge pull request #21293 from owncloud/restructure-travis-dav-testing
...
Restructure travis tests
2015-12-21 12:07:21 +01:00
ac78d248b7
Sleep in carddavtester as well
2015-12-21 11:43:15 +01:00
40d796dde9
Merge pull request #21195 from owncloud/test-carddav-sharing-plugin
...
Fix carddav sharing plugin + adding unit tests
2015-12-21 11:40:03 +01:00
0b597c37b3
Restructure travis tests
2015-12-21 11:35:48 +01:00
0b913f00c7
Merge pull request #21289 from owncloud/issue-20399-keep-periodic-background-jobs
...
Do not delete background jobs, in case an exception occured
2015-12-21 09:47:07 +01:00
a635975d19
Merge pull request #21308 from owncloud/use-new-apcu-api
...
Use new APCu API
2015-12-21 09:25:15 +01:00
bc25015bf9
[tx-robot] updated from transifex
2015-12-21 01:55:07 -05:00
e8cadbc4e6
Merge pull request #21307 from aspdye/patch-1
...
Update README.md
2015-12-20 17:20:16 +01:00
27695b74bd
Merge branch 'master' into patch-1
2015-12-20 14:26:55 +01:00
2263a611f7
Merge pull request #21299 from owncloud/symfony-process-2.8.0
...
[3rdparty] Bump symfony/process to 2.8.0
2015-12-20 13:36:22 +01:00
2c4b9e03e0
Use new APCu API
...
This one is available since APCu 4.0, since we require APCu 4.0.6 this works fine. Also it brings us PHP 7 compatibility and thus fixes https://github.com/owncloud/core/issues/21095
2015-12-20 11:09:09 +01:00
ade7243299
[3rdparty] Bump symfony/process to 2.8.0
2015-12-20 10:37:57 +01:00
68a6057049
Update README.md
...
-Added Facebook into "Get in touch"-section
-Improved Emojis on "Get in touch"-section
-Added Support Information
2015-12-20 10:33:14 +01:00
7080594670
[tx-robot] updated from transifex
2015-12-20 01:55:09 -05:00
Thomas Müller
Jenkins for ownCloud
Robin Appelman
Robin McCorkell
Jan-Christoph Borchardt
Roeland Douma
Roeland Jago Douma
Bernhard Posselt
Lukas Reschke
Stephen Colebrook
Christian Schnidrig
Vincent Petry
Morris Jobke
Renaud Fortier
Robin Appelman
aspdye