summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Add time between SMB test runs and properly log full changesetMorris Jobke2019-03-141-1/+3
* Fix translation sync for accessibiltiyMorris Jobke2019-03-142-0/+2
* Merge pull request #12119 from nextcloud/add_circle_to_caldav_and_filepanel-15Morris Jobke2019-03-146-9/+71
|\
| * Improve codeMorris Jobke2019-03-131-2/+2
| * Use dependency injection for app managerMorris Jobke2019-03-134-5/+25
| * Created infrastructure to show circles' shared filesVinicius Cubas Brand2019-03-133-5/+47
* | Use SCSS variables since CSS vars are not loaded on public pagesJulius Härtl2019-03-131-3/+3
* | Merge pull request #14640 from nextcloud/techdebt/noid/disable-failing-testsMorris Jobke2019-03-132-3/+12
|\ \
| * | Wait up to 10 seconds for incoming changes from SMB notifierMorris Jobke2019-03-131-1/+8
| * | Do not run fragile TrashbinTestMorris Jobke2019-03-131-2/+4
| |/
* / prevent recursion when moving a file to the trashbinRobin Appelman2019-03-131-1/+4
|/
* Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldavMorris Jobke2019-03-1314-8/+114
|\
| * Fix PHPUnitMorris Jobke2019-03-121-0/+2
| * Fix PHPUnitMorris Jobke2019-03-121-0/+2
| * Use proper dependency injection for app managerMorris Jobke2019-03-058-7/+26
| * Fix whitespaceMorris Jobke2019-03-051-1/+1
| * Suppress phan exceptions because they are catched by a class_existsMorris Jobke2019-03-051-0/+3
| * use class_exists on correct class to please phanGeorg Ehrke2019-03-041-2/+2
| * properly catch exceptions of detailsCircleGeorg Ehrke2019-03-031-1/+9
| * Get user's circles without touching sessionVinicius Cubas Brand2019-03-011-6/+1
| * allow sharing addressbooks with circlesGeorg Ehrke2019-03-012-3/+4
| * Share calendar to circleVinicius Cubas Brand2019-03-014-2/+78
* | Fix display of i in personal settingsMorris Jobke2019-03-111-0/+4
* | Add hint to user documentation (Federation)Marius Blüm2019-03-111-0/+3
* | Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-containe...Morris Jobke2019-03-082-20/+3
|\ \
| * | "Fix" the unit testsJoas Schilling2019-03-062-20/+3
* | | Merge pull request #14585 from nextcloud/ocm-mention-federationMorris Jobke2019-03-081-1/+1
|\ \ \
| * | | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-071-1/+1
* | | | Merge pull request #14583 from nextcloud/remove-g+-federationMorris Jobke2019-03-083-8/+0
|\ \ \ \
| * | | | Remove G+ CSS rule (Feedback from Joas)Marius Blüm2019-03-071-3/+0
| * | | | Remove G+ code from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-4/+0
| * | | | Remove G+ icon from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-1/+0
| |/ / /
* | | | Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filterblizzz2019-03-073-79/+121
|\ \ \ \ | |/ / / |/| | |
| * | | remove unused use statementArthur Schiwon2019-03-061-1/+0
| * | | fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-053-84/+111
| * | | Fixed unit test: groupsMatchFilter will not be called multiple times anymore.Roland Tapken2019-03-051-1/+1
| * | | Reduce queries to LDAP by caching nested groupsRoland Tapken2019-03-051-6/+18
| * | | user_ldap: really resolve nested groupsRoland Tapken2019-03-051-14/+19
| * | | user_ldap: Filter groups after nexted groupsRoland Tapken2019-03-051-2/+1
* | | | Merge pull request #14579 from nextcloud/fix/bump_streams_files_externalRoeland Jago Douma2019-03-074-16/+28
|\ \ \ \
| * | | | Have streams of files_external in syncRoeland Jago Douma2019-03-074-16/+28
| | |/ / | |/| |
* | | | Fix transifex sync for files_sharingMorris Jobke2019-03-061-2/+2
* | | | Update generated webpack files to .l10nignoreMorris Jobke2019-03-061-0/+4
* | | | Merge pull request #14558 from nextcloud/fix/13790/fix-commentMorris Jobke2019-03-061-1/+1
|\ \ \ \
| * | | | Fix unnecessary boolean castMorris Jobke2019-03-061-1/+1
* | | | | Merge pull request #14553 from nextcloud/fix/14125/clear_backupcode_reminder_...Morris Jobke2019-03-067-2/+223
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not send notification if no active 2faRoeland Jago Douma2019-03-052-2/+39
| * | | | Clear backupcodes reminder if no 2FA is enabledRoeland Jago Douma2019-03-055-0/+184
| |/ / /
* | | | Merge pull request #13790 from fretn/masterMorris Jobke2019-03-061-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix for crashing occ files:scanfretn2019-01-241-1/+1