ab3381d386
PNG and SVG have been compressed
2014-12-05 01:47:44 +01:00
1c369093e5
cache total user count
...
Conflicts:
apps/user_ldap/user_ldap.php
2014-12-04 19:09:13 +01:00
ee168a121d
Forward port of #12493
...
add ldap-search command to occ
Conflicts:
apps/user_ldap/appinfo/register_command.php
LDAP search filter creation changes:
1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar" when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.
trim search string before passing it on
2014-12-04 19:02:09 +01:00
b6975143ff
Merge pull request #12619 from owncloud/use-also-original-hea
...
Merge headers
2014-12-04 16:59:42 +01:00
a369d78124
Use the mount config api for files_external
2014-12-04 16:47:30 +01:00
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
f3213571bb
Merge pull request #12616 from owncloud/node-fileinfo
...
make \OC\Files\Node\Node implement the FileInfo interface
2014-12-04 16:34:30 +01:00
b8a2fdaa21
Merge pull request #12607 from owncloud/this-is-an-awesome-day
...
PHP 5.4 is now required for master
2014-12-04 10:33:04 -05:00
e1e8031798
Disable when no sendmail is available
2014-12-04 16:22:44 +01:00
15be763d46
Add right margin to codestyle file
...
Defaults to 120, we want 80 apparently
2014-12-04 16:09:30 +01:00
a0488453ac
Merge pull request #12596 from owncloud/remove-travis-traces
...
Remove last traces of travis integration
2014-12-04 16:04:15 +01:00
d2e8358da2
Fix unit test
2014-12-04 15:54:32 +01:00
db9765b4d5
Merge headers
...
Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.
2014-12-04 14:45:15 +01:00
e9f0b30023
Merge pull request #12609 from owncloud/remove-53-fixme
...
Remove workaround for 5.3
2014-12-04 14:25:47 +01:00
884eb14181
Merge pull request #12533 from owncloud/app-dependencies-php-version
...
App dependencies php version
2014-12-04 14:23:03 +01:00
c2b71d955c
Merge pull request #12610 from owncloud/remove_php_version_check
...
[encryption] remove check for PHP version
2014-12-04 14:07:09 +01:00
672495a1a3
make \OC\Files\Node\Node implement the FileInfo interface
2014-12-04 13:27:08 +01:00
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
81541c56b6
Add test for IPv6 without port
2014-12-04 12:16:33 +01:00
1509dd1358
update error message
2014-12-04 12:01:11 +01:00
c5ee95a49e
Merge pull request #12522 from owncloud/bower-jstz
...
Bower jstz
2014-12-04 11:58:46 +01:00
b55ac514ac
no nested xml tags on dependencies
2014-12-04 11:40:33 +01:00
eb81c52b95
fix an issue where the types tag holds an empty string
2014-12-04 11:40:33 +01:00
086ec3de15
adding command dependency
2014-12-04 11:40:33 +01:00
b028a6afac
adjust dependency analyzer to use attributes properly
2014-12-04 11:40:33 +01:00
c80ec91f28
switch to different parsing implementation to get xml attributes properly handled
2014-12-04 11:40:33 +01:00
ba52c996cf
adding supported databases
2014-12-04 11:40:33 +01:00
d235a9c128
display missing dependencies in the apps management page
2014-12-04 11:40:33 +01:00
b469e9f6fb
introduce dependency analyzer to take care of app dependencies
...
some more unit tests on xml info parser
2014-12-04 11:40:33 +01:00
f74d568bda
adding new dependency for php version in apps info.xml
2014-12-04 11:40:33 +01:00
40e03ba314
adding default key value pair for 'types'
2014-12-04 11:40:33 +01:00
1354cee18e
translate labels properly
2014-12-04 11:40:33 +01:00
0dd44eaf27
OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app
2014-12-04 11:17:44 +01:00
ee1f8b0242
Remove workaround for 5.3
...
Function is natively available with 5.4
2014-12-04 11:17:33 +01:00
bf1b62a34a
PHP < 5.4 is not supported anymore - see #12606
2014-12-04 11:05:45 +01:00
1b0bc2e099
PHP 5.4 is now required for master
...
🍻
2014-12-04 10:46:38 +01:00
2c5e4b3d3f
Remove last traces of travis integration
2014-12-04 10:09:13 +01:00
5aad902507
[tx-robot] updated from transifex
2014-12-04 01:54:42 -05:00
0dcfd5f20b
Modified filesort test cases to test for large sizes & timestamps
2014-12-03 23:45:57 +01:00
4ba520e214
Merge remote-tracking branch 'upstream/master'
2014-12-03 23:04:49 +01:00
b3515a98e9
Add workaround for older instances
...
To be removed with oCAdd workaround for older instances
To be removed with oC99
2014-12-03 21:13:27 +01:00
69f5f6649e
Trim port from domain
...
Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)
To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)
2014-12-03 19:59:50 +01:00
2eb81ff78f
Merge pull request #12581 from owncloud/fix_typo
...
fix typo in license header
2014-12-03 19:55:07 +01:00
0a173e2b58
fix typo
2014-12-03 19:46:32 +01:00
3d9c72d2d9
Merge pull request #12544 from owncloud/fix-windows-unittests
...
Replace uniqid calls with $this->getUniqueID so tests pass again on windows
2014-12-03 17:49:10 +01:00
c90c9eb3e8
Merge pull request #12579 from owncloud/drop-files-external-tests
...
drop files_external tests from autotest - they will be executed with aut...
2014-12-03 17:44:56 +01:00
060cee223a
Merge pull request #12542 from owncloud/update-autotestcmd
...
Update autotest.cmd
2014-12-03 17:40:28 +01:00
80b15b48c5
Merge pull request #12492 from owncloud/deprecate-passwordsalt
...
Officially deprecate passwordsalt
2014-12-03 16:51:06 +01:00
e014a18b4a
drop files_external tests from autotest - they will be executed with autotest-external.sh which is coming
2014-12-03 16:38:25 +01:00
3fdb1937a3
Merge pull request #12382 from owncloud/enc_reorganize_folders2
...
[encryption] reorganize folder structure (second try to make Jenkins happy)
2014-12-03 16:08:40 +01:00
Olivier Paroz
Arthur Schiwon
Morris Jobke
Robin Appelman
Clark Tomlinson
Lukas Reschke
Thomas Müller
Björn Schießle
Bjoern Schiessle
Jenkins for ownCloud
brumsel
Joas Schilling