Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 7 | -0/+35 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 37 | -127/+250 |
| | |||||
* | Fixed configkey casing for PostgreSQL | Vincent Petry | 2014-03-03 | 1 | -1/+1 |
| | |||||
* | remove remaining testing artefact | Arthur Schiwon | 2014-03-03 | 1 | -1/+1 |
| | |||||
* | intendetion. where did the whitespaces come from? | Arthur Schiwon | 2014-03-03 | 1 | -2/+2 |
| | |||||
* | LDAP: let proxy for multiple server access methods from Access | Arthur Schiwon | 2014-03-03 | 1 | -4/+13 |
| | |||||
* | Merge pull request #6299 from leo-b/ldap_nested_groups | VicDeo | 2014-02-25 | 3 | -10/+72 |
|\ | | | | | Add LDAP nested groups | ||||
| * | replace spaces with tabs | root | 2014-02-21 | 1 | -5/+5 |
| | | | | | | | | use true instead of 1 | ||||
| * | fix coding style to blizzz happy.. ;-) | root | 2014-02-12 | 1 | -8/+10 |
| | | |||||
| * | fix indentation | root | 2013-12-11 | 1 | -42/+42 |
| | | | | | | | | | | | | use identity test where appropriate use camelcase variable names _getGroupsByMember is a private function | ||||
| * | remove debug output | root | 2013-12-10 | 1 | -3/+0 |
| | | |||||
| * | Merge remote branch 'upstream/master' into ldap_nested_groups | root | 2013-12-10 | 4 | -4/+45 |
| |\ | |||||
| * | | move nested group checkbox to directory settings | root | 2013-12-10 | 1 | -1/+1 |
| | | | |||||
| * | | combineFilterWithAnd recently moved to Access | root | 2013-12-08 | 1 | -3/+3 |
| | | | |||||
| * | | add support for nested groups | root | 2013-12-06 | 3 | -10/+73 |
| | | | |||||
* | | | Merge pull request #7312 from owncloud/ldap_fix_add_test | Thomas Müller | 2014-02-21 | 2 | -3/+169 |
|\ \ \ | | | | | | | | | LDAP: fix and extend tests | ||||
| * | | | LDAP: fix and extend tests | Arthur Schiwon | 2014-02-20 | 2 | -3/+169 |
| | | | | |||||
* | | | | Merge pull request #7205 from owncloud/fix_7153 | blizzz | 2014-02-20 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | LDAP: prevent other configuration from being deleted when deleting the f... | ||||
| * | | | LDAP: prevent other configuration from being deleted when deleting the first ↵ | Arthur Schiwon | 2014-02-14 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | one which has an empty prefix for historical reasons | ||||
* | | | | LDAP: improve compilation of filters | Arthur Schiwon | 2014-02-19 | 2 | -0/+14 |
| | | | | |||||
* | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 5 | -8/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend | ||||
* | | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 3 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * | | | | LDAP: improve wizard strings, fixes #5567 | Arthur Schiwon | 2014-02-17 | 3 | -3/+3 |
| |/ / / | |||||
* | | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 7 | -12/+42 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | | | LDAP: improve debug message | Arthur Schiwon | 2014-02-10 | 1 | -1/+2 |
| | | | | |||||
| * | | | LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image | Arthur Schiwon | 2014-02-10 | 1 | -6/+24 |
| | | | | |||||
| * | | | LDAP: add documentation info in info.xml | Arthur Schiwon | 2014-02-10 | 1 | -0/+3 |
| | | | | |||||
| * | | | Rephrase and clarify log message | Arthur Schiwon | 2014-02-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Wizard: enable base DN for editing, if not base DN could have been detected. ↵ | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | Also part of fix for #6670 | ||||
| * | | | Wizard: disable LDAP referrals, fixes #6670 | Arthur Schiwon | 2014-02-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | throw an info message, when base dn test failed | Arthur Schiwon | 2014-02-10 | 1 | -0/+4 |
| | | | | |||||
| * | | | LDAP: extend LDAP wrapper search method for sizelimit, improves performance ↵ | Arthur Schiwon | 2014-02-10 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | in wizard | ||||
* | | | | Fix more documentation failes | Joas Schilling | 2014-02-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Issue #7111 | ||||
* | | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 8 | -32/+79 |
|/ / / | |||||
* | | | Merge pull request #6647 from owncloud/memcache-public | icewind1991 | 2014-02-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Add Memcache to the public api | ||||
| * \ \ | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-22 | 1 | -4/+11 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-15 | 3 | -17/+9 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/user_ldap/lib/connection.php | ||||
| * \ \ \ \ | Merge branch 'master' into memcache-public | Robin Appelman | 2014-01-09 | 5 | -28/+207 |
| |\ \ \ \ \ | |||||
| * | | | | | | Use $server->getMemCacheFactory() in ldap connection | Robin Appelman | 2014-01-09 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5153 from owncloud/core-em-to-px | Jan-Christoph Borchardt | 2014-01-27 | 1 | -7/+7 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Cleans up Core apps for relative(em) to absolute(px) styles. | ||||
| * | | | | | | Fixes settings.css and converts more styles. | raghunayyar | 2014-01-26 | 1 | -10/+6 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into core-em-to-px | raghunayyar | 2014-01-16 | 123 | -1461/+5273 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/css/public.css apps/user_ldap/css/settings.css core/css/multiselect.css core/css/share.css | ||||
| * | | | | | | Cleans up Core apps for relative(em) to absolute(px) styles. | raghunayyar | 2013-10-06 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | user workarount to compare CLOB column with CHAR value | Jörn Friedrich Dreyer | 2014-01-21 | 1 | -4/+11 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | typo, grammar | Arthur Schiwon | 2014-01-14 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | LDAP: only read config from database, if configID is given. Not what we want ↵ | Arthur Schiwon | 2014-01-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | to do when on-the-fly-testing settings from the admin page | ||||
* | | | | | | remove unused variables | Arthur Schiwon | 2014-01-14 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | LDAP: fix TLS detection | Arthur Schiwon | 2014-01-14 | 1 | -2/+5 |
| | | | | | | |||||
* | | | | | | remove ru_RU - it has bee removed from transifex | Thomas Müller | 2014-01-13 | 1 | -12/+0 |
| |_|/ / / |/| | | | | |||||
* | | | | | Merge pull request #6681 from owncloud/userreport | blizzz | 2014-01-08 | 4 | -28/+201 |
|\ \ \ \ \ | | | | | | | | | | | | | add command line option to get user number statistics |