Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #17923 from owncloud/fix-17921 | blizzz | 2015-07-29 | 1 | -8/+0 |
|\ | | | | | Remove Log info when no group filter is set, fixes #17921 | ||||
| * | remove unused var | blizzz | 2015-07-29 | 1 | -2/+0 |
| | | |||||
| * | Remove Log info when no group filter is set, fixes #17921 | blizzz | 2015-07-28 | 1 | -6/+0 |
| | | | | | | The log message is superfluous and too noisy. If an admin decides not to use groups, he does not need to be reminded about it on almost every request. | ||||
* | | Merge pull request #17464 from owncloud/fix-17232 | blizzz | 2015-07-29 | 9 | -98/+340 |
|\ \ | | | | | | | fix uncaught exception on not permitted file types when setting avatar, fixes #17232 | ||||
| * | | fix test after rebasing | Arthur Schiwon | 2015-07-27 | 1 | -1/+1 |
| | | | |||||
| * | | fix uncaught exception on not permitted file types when setting avatar, ↵ | Arthur Schiwon | 2015-07-27 | 1 | -1/+7 |
| | | | | | | | | | | | | fixes #17232 | ||||
| * | | add integration tests for avatar update | Arthur Schiwon | 2015-07-27 | 5 | -2/+144 |
| | | | |||||
| * | | refactor integration tests to make it easier to add new ones | Arthur Schiwon | 2015-07-27 | 4 | -95/+189 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-29 | 2 | -0/+2 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-28 | 2 | -0/+14 |
|/ | |||||
* | Merge pull request #17526 from owncloud/fix-17516 | Morris Jobke | 2015-07-27 | 4 | -2/+96 |
|\ | | | | | LDAP: when checking group for matching filter, also take base DN into… | ||||
| * | LDAP: when checking group for matching filter, also take base DN into ↵ | Arthur Schiwon | 2015-07-09 | 4 | -2/+96 |
| | | | | | | | | consideration. Fixes #17516 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-25 | 2 | -0/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-23 | 2 | -4/+46 |
| | | |||||
* | | Fixing line comments and indentation | Viktor Szépe | 2015-07-21 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #17723 from owncloud/fix-17631 | blizzz | 2015-07-20 | 2 | -125/+133 |
|\ \ | | | | | | | fix runtime caching in ldap's user manager, fixes #17631 | ||||
| * | | fix indentation. no code changes, whitespace only. | Arthur Schiwon | 2015-07-20 | 1 | -126/+126 |
| | | | |||||
| * | | fix runtime caching in ldap's user manager, fixes #17631 | Arthur Schiwon | 2015-07-17 | 2 | -2/+10 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-20 | 4 | -0/+4 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-17 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #17046 from nicolas-grekas/fix-16654 | blizzz | 2015-07-16 | 3 | -9/+5 |
|\ \ | | | | | | | Do not use OC*::mb_*_replace(), they are useless | ||||
| * | | Do not use OC*::mb_*_replace(), they are useless | Nicolas Grekas | 2015-07-16 | 3 | -9/+5 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-11 | 2 | -0/+26 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-10 | 4 | -10/+20 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-09 | 2 | -4/+16 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-07 | 2 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-06 | 2 | -8/+8 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-05 | 4 | -16/+72 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-03 | 4 | -0/+44 |
| | | |||||
* | | Merge pull request #17316 from ↵ | Joas Schilling | 2015-07-02 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | owncloud/master-delete-ocsid-from-db-if-none-specified [Master] Delete OCS ID from DB if none is specified | ||||
| * | | Bump versions | Lukas Reschke | 2015-07-02 | 1 | -1/+1 |
| | | | |||||
* | | | [master] Remove OCS IDs | Lukas Reschke | 2015-07-02 | 1 | -1/+0 |
|/ / | | | | | | | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-02 | 8 | -4/+20 |
| | | |||||
* | | Merge pull request #17255 from owncloud/fix-17119 | Thomas Müller | 2015-07-01 | 9 | -1/+389 |
|\ \ | | | | | | | [LDAP] Filter user groups obtained by memberof | ||||
| * | | tests solidity | Arthur Schiwon | 2015-06-30 | 3 | -0/+24 |
| | | | |||||
| * | | adjust unit test | Arthur Schiwon | 2015-06-30 | 1 | -0/+4 |
| | | | |||||
| * | | integration test | Arthur Schiwon | 2015-06-30 | 5 | -0/+331 |
| | | | |||||
| * | | ensure groups match filter when using memberOf to read users group, refs #17119 | Arthur Schiwon | 2015-06-26 | 2 | -1/+30 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-29 | 2 | -2/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-28 | 8 | -0/+8 |
| | | | |||||
* | | | Add missing annotations for parameters | Lukas Reschke | 2015-06-27 | 2 | -9/+16 |
| | | | |||||
* | | | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 7 | -5/+2 |
|\ \ \ | | | | | | | | | Update license headers | ||||
| * | | | update license headers and authors | Morris Jobke | 2015-06-25 | 7 | -5/+2 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-27 | 10 | -0/+10 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-26 | 38 | -40/+2 |
|/ / / | |||||
* | | | Merge pull request #17152 from owncloud/LDAP/AD-Typo | Morris Jobke | 2015-06-25 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Ldap/ad typo | ||||
| * | | | Dropped an S from the mouseover | Lukas Reschke | 2015-06-24 | 1 | -1/+1 |
| |/ / | | | | | | | | | | We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct. | ||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-25 | 4 | -8/+14 |
|/ / | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-21 | 4 | -0/+64 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-20 | 2 | -6/+6 |
|/ |