summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-03-14354-1680/+2188
| | | | | |
* | | | | | Add time between SMB test runs and properly log full changesetMorris Jobke2019-03-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Fix translation sync for accessibiltiyMorris Jobke2019-03-142-0/+2
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #12119 from nextcloud/add_circle_to_caldav_and_filepanel-15Morris Jobke2019-03-146-9/+71
|\ \ \ \ \ | | | | | | | | | | | | Add Circle to Caldav and Filepanel
| * | | | | Improve codeMorris Jobke2019-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Use dependency injection for app managerMorris Jobke2019-03-134-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Created infrastructure to show circles' shared filesVinicius Cubas Brand2019-03-133-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it. Issue: https://github.com/nextcloud/circles/issues/137 Changes to comply to https://github.com/coletivoEITA/circles/pull/2 Polishing: get files shared to circles in caldav Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com> Signed-off-by: Maxence Lange <maxence@artificial-owl.com> Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Use SCSS variables since CSS vars are not loaded on public pagesJulius Härtl2019-03-131-3/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #14640 from nextcloud/techdebt/noid/disable-failing-testsMorris Jobke2019-03-132-3/+12
|\ \ \ \ \ | | | | | | | | | | | | Disable fragile tests
| * | | | | Wait up to 10 seconds for incoming changes from SMB notifierMorris Jobke2019-03-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Do not run fragile TrashbinTestMorris Jobke2019-03-131-2/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fails with: There was 1 failure: 1) TrashbinTest::testExpireOldFiles Failed asserting that null is identical to 'file2.txt'. /drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186 OR 1) TrashbinTest::testExpireOldFiles Failed asserting that null is identical to 'file2.txt'. /drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / / prevent recursion when moving a file to the trashbinRobin Appelman2019-03-131-1/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldavMorris Jobke2019-03-1314-8/+114
|\ \ \ \ | |_|/ / |/| | | Change CALDAV to allow calendars be shared with circles.
| * | | Fix PHPUnitMorris Jobke2019-03-121-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix PHPUnitMorris Jobke2019-03-121-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Use proper dependency injection for app managerMorris Jobke2019-03-058-7/+26
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix whitespaceMorris Jobke2019-03-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Suppress phan exceptions because they are catched by a class_existsMorris Jobke2019-03-051-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | use class_exists on correct class to please phanGeorg Ehrke2019-03-041-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | properly catch exceptions of detailsCircleGeorg Ehrke2019-03-031-1/+9
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | Get user's circles without touching sessionVinicius Cubas Brand2019-03-011-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | This works with nextcloud/circles#260 Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
| * | | allow sharing addressbooks with circlesGeorg Ehrke2019-03-012-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | Share calendar to circleVinicius Cubas Brand2019-03-014-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow user to share calendar with a circle * Allow user to see calendars shared with his/her circles Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | | | Fix display of i in personal settingsMorris Jobke2019-03-111-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Add hint to user documentation (Federation)Marius Blüm2019-03-111-0/+3
| |/ / |/| | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | Merge pull request #14548 from ↵Morris Jobke2019-03-082-20/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/avoid-duplicate-container-creation Avoid duplicate App container creation
| * | | "Fix" the unit testsJoas Schilling2019-03-062-20/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #14585 from nextcloud/ocm-mention-federationMorris Jobke2019-03-081-1/+1
|\ \ \ \ | | | | | | | | | | Mention Open Cloud Mesh in Federated User Settings
| * | | | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-071-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | Merge pull request #14583 from nextcloud/remove-g+-federationMorris Jobke2019-03-083-8/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove Google+ federation usersettings
| * | | | | Remove G+ CSS rule (Feedback from Joas)Marius Blüm2019-03-071-3/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * | | | | Remove G+ code from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-4/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * | | | | Remove G+ icon from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-1/+0
| |/ / / / | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filterblizzz2019-03-073-79/+121
|\ \ \ \ \ | |/ / / / |/| | | | resolve user and groups in nested groups first before filtering the results
| * | | | remove unused use statementArthur Schiwon2019-03-061-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-053-84/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and also consolidate logic in one method Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Fixed unit test: groupsMatchFilter will not be called multiple times anymore.Roland Tapken2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * | | | Reduce queries to LDAP by caching nested groupsRoland Tapken2019-03-051-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nested groups are now cached in a CappedMemoryCache object to reduce queries to the LDAP backend. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * | | | user_ldap: really resolve nested groupsRoland Tapken2019-03-051-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch fixed the problem only for one level of indirection because groupsMatchFilter() had been applied on each recursive call (and thus there would be no second level if the first level fails the check). This new implementation replaces the recursive call with a stack that iterates all nested groups before filtering with groupsMatchFilter(). Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * | | | user_ldap: Filter groups after nexted groupsRoland Tapken2019-03-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently groupsMatchFilter is called before nested groups are resolved. This basicly breaks this feature since it is not possible to inherit membership in a group from another group. Minimal example: Group filter: (&(objectClass=group),(cn=nextcloud)) Nested groups: enabled cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local objectClass: group cn=IT,ou=groups,dn=company,dn=local objectClass: group memberOf: cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local cn=John Doe,ou=users,dn=company,dn=local objectClass: person memberOf: cn=IT,ou=groups,dn=company,dn=local Since 'cn=IT,ou=groups,dn=company,dn=local' doesn't match the group filter, John wouldn't be a member of group 'nextcloud'. This patch fixes this by filtering the groups after all nested groups have been collected. If nested groups is disabled the result will be the same as without this patch. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* | | | | Merge pull request #14579 from nextcloud/fix/bump_streams_files_externalRoeland Jago Douma2019-03-074-16/+28
|\ \ \ \ \ | | | | | | | | | | | | Have streams of files_external in sync
| * | | | | Have streams of files_external in syncRoeland Jago Douma2019-03-074-16/+28
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Fix transifex sync for files_sharingMorris Jobke2019-03-061-2/+2
| |_|_|/ |/| | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Update generated webpack files to .l10nignoreMorris Jobke2019-03-061-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #14558 from nextcloud/fix/13790/fix-commentMorris Jobke2019-03-061-1/+1
|\ \ \ \ | | | | | | | | | | Fix unnecessary boolean cast
| * | | | Fix unnecessary boolean castMorris Jobke2019-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #14553 from ↵Morris Jobke2019-03-067-2/+223
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa Clear backupcode reminder when no 2fa
| * | | | Do not send notification if no active 2faRoeland Jago Douma2019-03-052-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the job is still present we should also not fire it off if there is not a single active 2FA provider. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Clear backupcodes reminder if no 2FA is enabledRoeland Jago Douma2019-03-055-0/+184
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #14125 Listen to 2FA disable event. If a provider is disabled for a user. We check if there are no more providers. If there are no more providers we Remove the backupcode reminder notification (if still present). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #13790 from fretn/masterMorris Jobke2019-03-061-1/+1
|\ \ \ \ | |/ / / |/| | | Fix for crashing occ files:scan
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 09:51:33 +0000