summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-07-12154-1636/+1896
* Merge pull request #5484 from nextcloud/fix-if-circles-is-deletedMorris Jobke2017-07-113-7/+13
|\
| * wrong callMaxence Lange2017-07-112-2/+2
| * verify that circles is installedMaxence Lange2017-07-113-7/+13
|/
* Merge pull request #5435 from nextcloud/backport-5124-allow-dirlisting-with-u...Lukas Reschke2017-07-112-4/+11
|\
| * Fix unit testJoas Schilling2017-06-161-4/+5
| * Allow dir-listing also when one child is blocked by access controlJoas Schilling2017-06-161-0/+6
* | Merge pull request #5679 from nextcloud/stable12-5656-fix-unselecting-items-o...Morris Jobke2017-07-1110-41/+410
|\ \
| * | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-113-0/+3
| * | Add select2-toggleselect to the JavaScript files to loadDaniel Calviño Sánchez2017-07-111-0/+1
| * | Add acceptance tests for unselecting items in dropdown for tagsDaniel Calviño Sánchez2017-07-115-0/+334
| * | Extract app navigation elements to its own contextDaniel Calviño Sánchez2017-07-113-39/+70
| * | Fix typoDaniel Calviño Sánchez2017-07-111-2/+2
* | | Merge pull request #5670 from nextcloud/backport-5669-fix-remote-share-activi...Morris Jobke2017-07-112-8/+14
|\ \ \ | |/ / |/| |
| * | Fix owner cloud id in unshare activityJoas Schilling2017-07-101-1/+1
| * | Fix activity emails for accept/decline of remote sharesJoas Schilling2017-07-102-7/+13
* | | Merge pull request #5667 from nextcloud/5649-stable12Morris Jobke2017-07-112-9/+11
|\ \ \
| * | | fix alignment of radio button and its label in encryption settingsArthur Schiwon2017-07-102-9/+11
| |/ /
* | | Merge pull request #5665 from GitHubUser4234/ldap_password_renew_nc12fix_back...Morris Jobke2017-07-104-2/+8
|\ \ \ | |/ / |/| |
| * | Rectify variable $uid->$userRoger Szabo2017-07-101-1/+1
| * | pass missing function parameterRoger Szabo2017-07-101-0/+1
| * | css for button adjustment for nc12Roger Szabo2017-07-101-0/+5
| * | set needsPasswordReset flag correctlyRoger Szabo2017-07-101-1/+1
| * | suppress superflous php error on rejected password changeRoger Szabo2017-07-101-1/+1
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-07-1020-86/+88
* | [tx-robot] updated from transifexNextcloud bot2017-07-0920-12/+72
* | [tx-robot] updated from transifexNextcloud bot2017-07-0836-74/+106
* | Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-...Morris Jobke2017-07-0734-82/+313
|\ \
| * | Fix testsJoas Schilling2017-07-072-12/+12
| * | Use PNG version of the icons for shipped activitiesJoas Schilling2017-07-0730-70/+272
| * | Add a flag to allow checking if SVGs are okayJoas Schilling2017-07-072-0/+29
* | | Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remot...Björn Schießle2017-07-071-2/+4
|\ \ \ | |/ / |/| |
| * | Use the share_folder config for remote sharesJoas Schilling2017-06-191-2/+4
* | | Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-...Morris Jobke2017-07-072-13/+75
|\ \ \
| * | | Adjust tests to the old settings menuJoas Schilling2017-07-061-5/+16
| * | | Don't load navigation entries of restricted appsJoas Schilling2017-07-052-13/+64
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-0726-78/+138
* | | | Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spamJoas Schilling2017-07-061-0/+8
|\ \ \ \
| * | | | Don't try to generate logs for chunking pathsJoas Schilling2017-06-161-0/+8
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-0612-0/+18
* | | | Merge pull request #5619 from nextcloud/backport-5557-dont-log-passwords-on-d...blizzz2017-07-053-29/+17
|\ \ \ \
| * | | | Don't log passwords on dav exceptionsJoas Schilling2017-07-053-29/+17
* | | | | Merge pull request #5434 from nextcloud/backport-5404-translated-hint-passwor...Morris Jobke2017-07-051-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use translated Hint instead of english error on password policyJoas Schilling2017-06-161-0/+4
| |/ / /
* | | | Merge pull request #5613 from nextcloud/stable12-5549Morris Jobke2017-07-051-0/+1
|\ \ \ \
| * | | | Update admin.phpJos Poortvliet2017-07-051-0/+1
|/ / / /
* | | | Merge pull request #5584 from nextcloud/stable12-5429Joas Schilling2017-07-056-66/+133
|\ \ \ \
| * | | | Fix testsJulius Härtl2017-07-021-20/+31
| * | | | Fix theming app to also use the prefixJulius Härtl2017-07-021-5/+10
| * | | | Add tests and inject IRequestJulius Härtl2017-07-023-32/+65