summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14677 from nextcloud/backport/14670/stable15Morris Jobke2019-03-141-3/+3
|\
| * Use SCSS variables since CSS vars are not loaded on public pagesJulius Härtl2019-03-141-3/+3
|/
* Merge pull request #14661 from nextcloud/backport/14656/stable15Roeland Jago Douma2019-03-131-1/+4
|\
| * prevent recursion when moving a file to the trashbinRobin Appelman2019-03-131-1/+4
|/
* Merge pull request #14658 from nextcloud/backport/14644/stable15Morris Jobke2019-03-131-0/+6
|\
| * Remove sensitive SMB arguments from exception logMorris Jobke2019-03-131-0/+6
|/
* Merge pull request #14597 from nextcloud/backport/14425/stable15Morris Jobke2019-03-085-8/+70
|\
| * Avoid calculating folder size for parent that needs scan.Ari Selseng2019-03-085-8/+70
* | Merge pull request #14591 from nextcloud/backport/14464/stable15Morris Jobke2019-03-087-80/+230
|\ \
| * | remove unused use statementArthur Schiwon2019-03-071-1/+0
| * | add missing config bits to integration testsArthur Schiwon2019-03-072-0/+7
| * | with LDAP server set offline, config cannot be controlled via ocs anymoreArthur Schiwon2019-03-071-0/+8
| * | fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-076-85/+205
| * | Fixed unit test: groupsMatchFilter will not be called multiple times anymore.Roland Tapken2019-03-071-1/+1
| * | Reduce queries to LDAP by caching nested groupsRoland Tapken2019-03-071-6/+18
| * | user_ldap: really resolve nested groupsRoland Tapken2019-03-071-14/+19
| * | user_ldap: Filter groups after nexted groupsRoland Tapken2019-03-071-2/+1
| |/
* | Merge pull request #14596 from nextcloud/backport/14587/stable15Morris Jobke2019-03-082-2/+0
|\ \
| * | Remove Google+ from Social Sharing Bundle (2)Marius Blüm2019-03-081-1/+0
| * | Remove "socialsharing_googleplus" from Social Sharing BundleMarius Blüm2019-03-081-1/+0
| |/
* | Merge pull request #14534 from nextcloud/backport/14502/add-activities-for-gr...Morris Jobke2019-03-086-0/+408
|\ \
| * | Fix unit testsJoas Schilling2019-03-073-8/+7
| * | Update autoloaderJoas Schilling2019-03-052-0/+4
| * | Add activities for group membership changesJoas Schilling2019-03-054-0/+405
* | | Merge pull request #14599 from nextcloud/backport/14585/stable15Morris Jobke2019-03-081-1/+1
|\ \ \
| * | | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-081-1/+1
| | |/ | |/|
* | | Merge pull request #14601 from nextcloud/backport/14590/stable15Morris Jobke2019-03-081-1/+1
|\ \ \ | |/ / |/| |
| * | Update index.phppaul2019-03-081-1/+1
|/ /
* | Merge pull request #14580 from nextcloud/backport/14579/stable15Roeland Jago Douma2019-03-074-16/+28
|\ \
| * | Have streams of files_external in syncRoeland Jago Douma2019-03-074-16/+28
|/ /
* | Merge pull request #14570 from nextcloud/backport/14424/stable15Roeland Jago Douma2019-03-061-1/+10
|\ \
| * | Use a tmp file for swift writesRoeland Jago Douma2019-03-061-1/+10
|/ /
* | Merge pull request #14416 from nextcloud/backport/14343/stable15Morris Jobke2019-03-068-18/+370
|\ \
| * | two item => two itemsDaniel Kesselberg2019-02-273-1/+1
| * | Generate id for navigation itemDaniel Kesselberg2019-02-271-2/+2
| * | Parse multiple navigation itemsDaniel Kesselberg2019-02-278-17/+369
* | | Merge pull request #14559 from nextcloud/backport/14553/stable15Morris Jobke2019-03-067-2/+223
|\ \ \
| * | | Do not send notification if no active 2faRoeland Jago Douma2019-03-062-2/+39
| * | | Clear backupcodes reminder if no 2FA is enabledRoeland Jago Douma2019-03-065-0/+184
|/ / /
* | | Merge pull request #14546 from nextcloud/backport/14373/stable15Roeland Jago Douma2019-03-052-0/+24
|\ \ \
| * | | DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.Daniel Kesselberg2019-03-051-1/+1
| * | | Add test for updated CA bundleMorris Jobke2019-03-052-0/+24
|/ / /
* | | Merge pull request #14542 from nextcloud/backport/14451/stable15Morris Jobke2019-03-052-0/+7
|\ \ \
| * | | Check if password can be changed for the users backend in OCS apiJulius Härtl2019-03-052-0/+7
|/ / /
* | | Merge pull request #14531 from nextcloud/backport/14528/stable15Morris Jobke2019-03-051-25/+26
|\ \ \ | |_|/ |/| |
| * | Fix whitespacesJoas Schilling2019-03-051-22/+23
| * | Fix database configurationJoas Schilling2019-03-051-3/+3
|/ /
* | Merge pull request #14517 from nextcloud/backport/13871/stable15Morris Jobke2019-03-051-1/+3
|\ \
| * | dav: Fix handling of chunked WebDAV uploadJan-Philipp Litza2019-03-041-1/+3
* | | Merge pull request #14516 from nextcloud/backport/14499/stable15Morris Jobke2019-03-051-1/+9
|\ \ \