summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| |/ / / / /
* | | | | | Merge pull request #14373 from nextcloud/ci/noid/add-bundle-testMorris Jobke2019-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 #14544 from nextcloud/fix/admin-2fa-settings-leftoverMorris Jobke2019-03-051-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove leftover input that causes undefined index errorsChristoph Wurst2019-03-051-1/+0
|/ / / / / /
* | | | | | Merge pull request #14451 from nextcloud/bugfix/noid/error-message-on-passwor...Morris 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 #14502 from nextcloud/feature/noid/add-activities-for-grou...Morris Jobke2019-03-056-0/+408
|\ \ \ \ \
| * | | | | Dump autoloaderMorris Jobke2019-03-052-0/+4
| * | | | | Add activities for group membership changesJoas Schilling2019-03-044-0/+404
* | | | | | Merge pull request #14302 from nextcloud/enhancement/noid/fulltextsearch-fina...Morris Jobke2019-03-0515-231/+1497
|\ \ \ \ \ \
| * | | | | | fixing phpdocMaxence Lange2019-03-044-63/+73
| * | | | | | fixing INDEX_DONEMaxence Lange2019-03-041-3/+2
| * | | | | | cleaning the excerpts managmentMaxence Lange2019-03-041-11/+6
| * | | | | | cleaningMaxence Lange2019-03-042-987/+3