summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14425 from cowai/fix-multiple-incomplete-foldersMorris Jobke2019-03-085-8/+70
|\
| * Avoid calculating folder size for parent that needs scan.Ari Selseng2019-03-065-8/+70
* | Merge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundleMorris Jobke2019-03-082-2/+0
|\ \
| * | Remove Google+ from Social Sharing Bundle (2)Marius Blüm2019-03-071-1/+0
| * | Remove "socialsharing_googleplus" from Social Sharing BundleMarius Blüm2019-03-071-1/+0
* | | 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-077-80/+230
|\ \ \ | |/ / |/| |
| * | remove unused use statementArthur Schiwon2019-03-061-1/+0
| * | add missing config bits to integration testsArthur Schiwon2019-03-062-0/+7
| * | with LDAP server set offline, config cannot be controlled via ocs anymoreArthur Schiwon2019-03-051-0/+8
| * | fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-056-85/+205
| * | 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
* | | | Merge pull request #14568 from nextcloud/techdebt/noid/cleanup-code-leftoversRoeland Jago Douma2019-03-066-19/+2
|\ \ \ \
| * | | | Cleanup some PHPDoc leftovers and unused variablesMorris Jobke2019-03-066-19/+2
* | | | | Merge pull request #14569 from nextcloud/fix/noid/fix-transifexMorris Jobke2019-03-061-2/+2
|\ \ \ \ \
| * | | | | Fix transifex sync for files_sharingMorris Jobke2019-03-061-2/+2
* | | | | | Merge pull request #14424 from nextcloud/fix/13554/swift_to_tmpRoeland Jago Douma2019-03-061-1/+10
|\ \ \ \ \ \
| * | | | | | Use a tmp file for swift writesRoeland Jago Douma2019-03-041-1/+10
* | | | | | | Merge pull request #14563 from nextcloud/fix/jquery-versionMorris Jobke2019-03-064-51/+51
|\ \ \ \ \ \ \
| * | | | | | | Pin the jquery version to 2.1.4Christoph Wurst2019-03-064-51/+51
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #14561 from Nutomic/wrong-username-messageMorris Jobke2019-03-061-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Change login error message to "wrong username or password" (fixes #14460)Felix Ableitner2019-03-061-1/+1
* | | | | | | Merge pull request #14567 from nextcloud/fix/noid/transifex-excludesMorris Jobke2019-03-062-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Update generated webpack files to .l10nignoreMorris Jobke2019-03-062-2/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #14560 from nextcloud/tests/noid/fully-check-compliant-appsMorris Jobke2019-03-061-3/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fully check compliant appsMorris Jobke2019-03-051-3/+0
* | | | | | | 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 #13327 from nextcloud/allow-bracket-notation-for-remove-ip...Morris Jobke2019-03-062-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Allow bracket IPv6 address format inside IPAdress NormalizerThomas Citharel2019-01-032-0/+7
* | | | | | | | 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
* | | | | | | | Merge pull request #14541 from nextcloud/ci/noid/disable-fragile-testsMorris Jobke2019-03-053-16/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Disable fragile tests for nowMorris Jobke2019-03-053-16/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #14535 from nextcloud/tests/noid/reduce-logs-in-checker-testRoeland Jago Douma2019-03-051-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Reduce errors in checker tests by creating the data dirMorris Jobke2019-03-051-1/+10
| |/ / / / / /
* | | | | | | Merge pull request #14175 from skydiablo/masterMorris Jobke2019-03-051-0/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #1 from skydiablo/fix-expired-object-storage-auth-tokenVolker2019-02-131-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Update SwiftFactory.phpVolker2019-02-131-0/+1
| |/ / / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 07:40:39 +0000