summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #497 from nextcloud/postgres-setup-no-adminMorris Jobke2016-12-052-39/+50
|\
| * handle postgres setup when we cant connect as adminRobin Appelman2016-12-052-39/+50
* | Merge pull request #2505 from nextcloud/sudo-mode-provisioning-apiMorris Jobke2016-12-055-7/+130
|\ \
| * | Set last-login-check on basic authRoeland Jago Douma2016-12-052-0/+106
| * | Require sudo mode on the provisioning APIJoas Schilling2016-12-053-7/+24
* | | Merge pull request #2516 from nextcloud/graceful_no_share_providerMorris Jobke2016-12-051-8/+34
|\ \ \
| * | | Handle unavailable share providers more gracefulRoeland Jago Douma2016-12-051-8/+34
| | |/ | |/|
* | | Merge pull request #2509 from nextcloud/sudo-mode-for-app-enablingLukas Reschke2016-12-055-0/+38
|\ \ \
| * | | Add sudo mode to enabling and disabling appsLukas Reschke2016-12-055-0/+38
* | | | Merge pull request #2484 from nextcloud/fix-wrong-update-of-email-addressChristoph Wurst2016-12-052-7/+28
|\ \ \ \
| * | | | make sure that we only update the email address if it really changedBjoern Schiessle2016-12-022-7/+28
* | | | | Merge pull request #2508 from nextcloud/systemtags-dropdown-styleMorris Jobke2016-12-051-0/+19
|\ \ \ \ \
| * | | | | improve systemtags selector stylingRobin Appelman2016-12-051-0/+19
| | |/ / / | |/| | |
* | | | | Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-topMorris Jobke2016-12-057-1/+192
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make sure the object exists before adding it.Joas Schilling2016-11-071-1/+2
| * | | | Also sort the tags in the filterJoas Schilling2016-11-071-0/+35
| * | | | Sort tags by name on the admin pageJoas Schilling2016-11-071-0/+6
| * | | | First list tags the user used latelyJoas Schilling2016-11-075-1/+150
* | | | | Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemetMorris Jobke2016-12-059-23/+605
|\ \ \ \ \
| * | | | | Add tests for favorite actionJoas Schilling2016-12-041-8/+55
| * | | | | Add some generic testsJoas Schilling2016-12-043-0/+248
| * | | | | Add an activity when managing favoritesJoas Schilling2016-12-045-15/+302
* | | | | | Merge pull request #2411 from nextcloud/fix-encryption-home-storageMorris Jobke2016-12-052-2/+124
|\ \ \ \ \ \
| * | | | | | check if the file should really be encrypted before we update the file cacheBjoern Schiessle2016-11-292-2/+124
* | | | | | | Merge pull request #2501 from nextcloud/issue-2472-remove-update-notification...Morris Jobke2016-12-051-23/+30
|\ \ \ \ \ \ \
| * | | | | | | Remove the update warning and the notification after an successful updateJoas Schilling2016-12-051-23/+30
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #2507 from nextcloud/conflict-dialog-ffMorris Jobke2016-12-051-7/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | fix conflict dialog styling in firefoxRobin Appelman2016-12-051-7/+5
|/ / / / / /
* | | | | | Merge pull request #2468 from nextcloud/fix-personal-settings-readonlyMorris Jobke2016-12-051-42/+16
|\ \ \ \ \ \
| * | | | | | hide password recovery note if email address can't be setBjoern Schiessle2016-12-051-2/+4
| * | | | | | handle read-only parameters correctlyBjoern Schiessle2016-12-021-40/+12
* | | | | | | Merge pull request #2502 from nextcloud/personal-settings-dead-codeMorris Jobke2016-12-051-55/+0
|\ \ \ \ \ \ \
| * | | | | | | remove dead js code from personal settingsChristoph Wurst2016-12-051-55/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2500 from nextcloud/issue-2326-personal-settingsMorris Jobke2016-12-052-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Allow emtpy values on personal page and fix saving checkmark positionChristoph Wurst2016-12-052-1/+4
|/ / / / / /
* | | | | | Merge pull request #2491 from nextcloud/fix-groups-enable-visualRoeland Jago Douma2016-12-052-3/+6
|\ \ \ \ \ \
| * | | | | | Change groups enable to block elementJohn Molakvoæ (skjnldsv)2016-12-052-3/+6
* | | | | | | [tx-robot] updated from transifexNextcloud bot2016-12-0518-16/+142
* | | | | | | Merge pull request #2497 from nextcloud/theming-icon-fixesJohn Molakvoæ2016-12-042-7/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix transparency of iconsJulius Haertl2016-12-041-0/+1
| * | | | | | Fix background border radiusJulius Haertl2016-12-041-1/+1
| * | | | | | Move sizing to renderAppIcon methodJulius Haertl2016-12-042-6/+7
* | | | | | | [tx-robot] updated from transifexNextcloud bot2016-12-0438-78/+128
* | | | | | | Merge pull request #2493 from nextcloud/php7.1-finalRoeland Jago Douma2016-12-031-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Bump 7.1 CI to final!Roeland Jago Douma2016-12-031-3/+3
|/ / / / / / /
* | | | | | | Merge pull request #2428 from justin-sleep/upstreamMorris Jobke2016-12-031-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Move integer casting to the top of the chainjustin-sleep2016-12-022-2/+2
| * | | | | | | Explicitly cast $remember to int rather than using identity operatorjustin-sleep2016-12-011-1/+1
| * | | | | | | Fix #2427 by converting $remember to integerjustin-sleep2016-11-301-1/+1
* | | | | | | | Merge pull request #2434 from nextcloud/app-list-growJohn Molakvoæ2016-12-031-4/+41
|\ \ \ \ \ \ \ \