summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-05232-310/+124
|
* cache total user countArthur Schiwon2014-12-041-0/+5
| | | | | Conflicts: apps/user_ldap/user_ldap.php
* Forward port of #12493Arthur Schiwon2014-12-044-2/+153
| | | | | | | | | | | | | | | | | | 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
* Merge pull request #12619 from owncloud/use-also-original-heaMorris Jobke2014-12-042-2/+3
|\ | | | | Merge headers
| * Fix unit testLukas Reschke2014-12-041-1/+2
| |
| * Merge headersLukas Reschke2014-12-041-1/+1
| | | | | | 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.
* | Merge pull request #12616 from owncloud/node-fileinfoMorris Jobke2014-12-047-74/+133
|\ \ | | | | | | make \OC\Files\Node\Node implement the FileInfo interface
| * | make \OC\Files\Node\Node implement the FileInfo interfaceRobin Appelman2014-12-047-74/+133
| | |
* | | Merge pull request #12607 from owncloud/this-is-an-awesome-dayClark Tomlinson2014-12-043-27/+3
|\ \ \ | | | | | | | | PHP 5.4 is now required for master
| * | | PHP 5.4 is now required for masterLukas Reschke2014-12-043-27/+3
| | | | | | | | | | | | | | | | :beers:
* | | | Merge pull request #12596 from owncloud/remove-travis-tracesMorris Jobke2014-12-043-53/+1
|\ \ \ \ | |_|_|/ |/| | | Remove last traces of travis integration
| * | | PHP < 5.4 is not supported anymore - see #12606Morris Jobke2014-12-041-8/+0
| | | |
| * | | Remove last traces of travis integrationMorris Jobke2014-12-043-47/+3
| | | |
* | | | Merge pull request #12609 from owncloud/remove-53-fixmeThomas Müller2014-12-041-18/+2
|\ \ \ \ | | | | | | | | | | Remove workaround for 5.3
| * | | | Remove workaround for 5.3Lukas Reschke2014-12-041-18/+2
| |/ / / | | | | | | | | | | | | Function is natively available with 5.4
* | | | Merge pull request #12533 from owncloud/app-dependencies-php-versionThomas Müller2014-12-0411-15/+378
|\ \ \ \ | | | | | | | | | | App dependencies php version
| * | | | no nested xml tags on dependenciesThomas Müller2014-12-044-17/+13
| | | | |
| * | | | fix an issue where the types tag holds an empty stringThomas Müller2014-12-041-4/+8
| | | | |
| * | | | adding command dependencyThomas Müller2014-12-042-1/+17
| | | | |
| * | | | adjust dependency analyzer to use attributes properlyThomas Müller2014-12-042-18/+31
| | | | |
| * | | | switch to different parsing implementation to get xml attributes properly ↵Thomas Müller2014-12-046-56/+75
| | | | | | | | | | | | | | | | | | | | handled
| * | | | adding supported databasesThomas Müller2014-12-046-3/+72
| | | | |
| * | | | display missing dependencies in the apps management pageThomas Müller2014-12-042-0/+17
| | | | |
| * | | | introduce dependency analyzer to take care of app dependenciesThomas Müller2014-12-048-9/+227
| | | | | | | | | | | | | | | | | | | | some more unit tests on xml info parser
| * | | | adding new dependency for php version in apps info.xmlThomas Müller2014-12-042-1/+9
| | | | |
| * | | | adding default key value pair for 'types'Thomas Müller2014-12-041-0/+3
| | | | |
| * | | | translate labels properlyThomas Müller2014-12-041-2/+2
| |/ / /
* | | | Merge pull request #12610 from owncloud/remove_php_version_checkBjörn Schießle2014-12-042-6/+2
|\ \ \ \ | |_|_|/ |/| | | [encryption] remove check for PHP version
| * | | update error messageBjoern Schiessle2014-12-041-1/+1
| | | |
| * | | OC8 and later requires PHP >= 5.4, so we can remove the check from the ↵Bjoern Schiessle2014-12-041-5/+1
| |/ / | | | | | | | | | encryption app
* | | Merge pull request #12522 from owncloud/bower-jstzMorris Jobke2014-12-0417-365/+675
|\ \ \ | |/ / |/| | Bower jstz
| * | move jstz to bower managementMorris Jobke2014-12-017-359/+409
| | |
| * | include lock files of bower to be able to use "bower install"Morris Jobke2014-12-0112-6/+266
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-046-2/+16
| | |
* | | Merge pull request #12581 from owncloud/fix_typoThomas Müller2014-12-031-1/+1
|\ \ \ | | | | | | | | fix typo in license header
| * | | fix typoBjoern Schiessle2014-12-031-1/+1
|/ / /
* | | Merge pull request #12544 from owncloud/fix-windows-unittestsThomas Müller2014-12-0321-35/+43
|\ \ \ | | | | | | | | Replace uniqid calls with $this->getUniqueID so tests pass again on windows
| * | | Replace uniqid calls with $this->getUniqueID so tests pass again on windowsJoas Schilling2014-12-0321-35/+43
| | | |
* | | | Merge pull request #12579 from owncloud/drop-files-external-testsThomas Müller2014-12-032-3/+1
|\ \ \ \ | | | | | | | | | | drop files_external tests from autotest - they will be executed with aut...
| * | | | drop files_external tests from autotest - they will be executed with ↵Morris Jobke2014-12-032-3/+1
| | | | | | | | | | | | | | | | | | | | autotest-external.sh which is coming
* | | | | Merge pull request #12542 from owncloud/update-autotestcmdJoas Schilling2014-12-031-17/+38
|\ \ \ \ \ | | | | | | | | | | | | Update autotest.cmd
| * | | | | Restore the development config after running the testsJoas Schilling2014-12-021-3/+17
| | | | | |
| * | | | | Allow overwriting DATADIR completly so ramdisk can be usedJoas Schilling2014-12-021-5/+5
| | | | | |
| * | | | | Allow passing a test file just like in autotest.shJoas Schilling2014-12-021-7/+7
| | | | | |
| * | | | | Better manage the output when running autotest.cmdJoas Schilling2014-12-021-5/+12
| | |/ / / | |/| | |
* | | | | Merge pull request #12492 from owncloud/deprecate-passwordsaltLukas Reschke2014-12-031-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Officially deprecate passwordsalt
| * | | | Officially deprecated passwordsaltLukas Reschke2014-12-031-0/+3
| | | | | | | | | | | | | | | | | | | | Hopefully this prevents people from using it in the future.
* | | | | Merge pull request #12382 from owncloud/enc_reorganize_folders2Morris Jobke2014-12-0325-1674/+1172
|\ \ \ \ \ | | | | | | | | | | | | [encryption] reorganize folder structure (second try to make Jenkins happy)
| * | | | | small fixesBjoern Schiessle2014-12-021-2/+2
| | | | | |
| * | | | | delete old keys if file was moved to a different mount pointBjoern Schiessle2014-12-021-4/+10
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 03:03:30 +0000