summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5657 from nextcloud/select-error-textLukas Reschke2017-07-111-0/+4
|\
| * warning is now selecteableMaxence Lange2017-07-081-0/+4
* | Merge pull request #5681 from nextcloud/upstream-fix-circlesMorris Jobke2017-07-114-9/+15
|\ \
| * | upstreamMaxence Lange2017-07-114-9/+15
* | | Merge pull request #5672 from nextcloud/upload-hidden-filelistMorris Jobke2017-07-112-9/+13
|\ \ \ | |/ / |/| |
| * | fix testRobin Appelman2017-07-111-9/+11
| * | properly block file upload to non-active filelistRobin Appelman2017-07-101-0/+2
* | | Merge pull request #5662 from nextcloud/comradekingu-patch-1Morris Jobke2017-07-111-5/+5
|\ \ \
| * | | Spelling: No shouting at user, and FacebookAllan Nordhøy2017-07-091-5/+5
* | | | Merge pull request #5656 from nextcloud/fix-unselecting-items-on-multi-select...Morris Jobke2017-07-109-41/+394
|\ \ \ \
| * | | | Enable the toggleSelect extension in multi-select dropdownsDaniel Calviño Sánchez2017-07-103-0/+3
| * | | | Add select2-toggleselect to the JavaScript files to loadDaniel Calviño Sánchez2017-07-101-0/+1
| * | | | Add acceptance tests for unselecting items in dropdown for tagsDaniel Calviño Sánchez2017-07-104-0/+318
| * | | | Extract app navigation elements to its own contextDaniel Calviño Sánchez2017-07-083-39/+70
| * | | | Fix typoDaniel Calviño Sánchez2017-07-081-2/+2
* | | | | Merge pull request #5666 from nextcloud/comradekingu-patch-2Morris Jobke2017-07-101-11/+11
|\ \ \ \ \
| * | | | | Spelling: No "we" for recommendations.Allan Nordhøy2017-07-101-11/+11
| | |_|/ / | |/| | |
* | | | | Merge pull request #5669 from nextcloud/fix-remote-share-activity-emailsMorris Jobke2017-07-102-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 #5671 from GitHubUser4234/ldap_password_renew_nc12fixMorris Jobke2017-07-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rectify variable $uid->$userRoger Szabo2017-07-101-1/+1
|/ / / /
* | | | Merge pull request #5649 from nextcloud/fix-5611Morris Jobke2017-07-102-9/+11
|\ \ \ \
| * | | | fix alignment of radio button and its label in encryption settingsArthur Schiwon2017-07-072-9/+11
* | | | | [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 #5645 from nextcloud/try-to-prevent-spam-collecting-of-emailsLukas Reschke2017-07-071-0/+3
|\ \ \ | |/ / |/| |
| * | Don't show mail domain and from in config reportJoas Schilling2017-07-071-0/+3
* | | Merge pull request #5628 from nextcloud/only-create-the-migration-dir-when-ne...Morris Jobke2017-07-073-10/+22
|\ \ \
| * | | Register autoloading before running migrationsJoas Schilling2017-07-071-1/+1
| * | | Only create the migration directory when necessaryJoas Schilling2017-07-062-9/+21
| |/ /
* | | Merge pull request #5529 from michaelletzgus/optimize_js_orderMorris Jobke2017-07-071-3/+3
|\ \ \
| * | | Optimize performance / Load CSS and JS in parallel on firefoxMichael Letzgus2017-06-241-3/+3
* | | | Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-0734-82/+313
|\ \ \ \
| * | | | Fix testsJoas Schilling2017-06-202-12/+12
| * | | | Use PNG version of the icons for shipped activitiesJoas Schilling2017-06-2030-70/+272
| * | | | Add a flag to allow checking if SVGs are okayJoas Schilling2017-06-202-0/+29
* | | | | Merge pull request #5643 from nextcloud/codeownersMorris Jobke2017-07-072-34/+2
|\ \ \ \ \
| * | | | | Move mention-bot notifications to code ownersJoas Schilling2017-07-072-34/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #5615 from nextcloud/issue-5286-fix-navigation-entries-for...Morris Jobke2017-07-072-13/+64
|\ \ \ \ \
| * | | | | 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 #5424 from nextcloud/moveFromCache-from-sharedMorris Jobke2017-07-067-3/+313
|\ \ \ \ \ \
| * | | | | | adjust to moved repair stepRobin Appelman2017-06-293-4/+14
| * | | | | | Run repair step only onceMorris Jobke2017-06-225-5/+11
| * | | | | | Add repair step for invalid pathsRobin Appelman2017-06-213-2/+236
| * | | | | | fix moving folders out of a cache jailRobin Appelman2017-06-152-1/+61
* | | | | | | Merge pull request #5174 from nextcloud/new-encryption-defaultMorris Jobke2017-07-0623-36/+387
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | adjust encryption tests to the new master key defaultBjoern Schiessle2017-07-061-1/+1