summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-12-06100-426/+396
|
* Merge pull request #2520 from nextcloud/replace-stringMorris Jobke2016-12-052-3/+9
|\ | | | | Check for nextcloud version as well
| * Check for nextcloud version as wellLukas Reschke2016-12-052-3/+9
| | | | | | | | | | | | The code checker didn't consider the "nextcloud" version before, resulting in fails such as https://travis-ci.org/nextcloud/richdocuments/jobs/181470760#L415-L416 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #497 from nextcloud/postgres-setup-no-adminMorris Jobke2016-12-052-39/+50
|\ \ | | | | | | handle postgres setup when we cant connect as admin
| * | 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
|\ \ \ | | | | | | | | Require sudo mode on the provisioning API
| * | | Set last-login-check on basic authRoeland Jago Douma2016-12-052-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else the last-login-check fails hard because the session value is not set and thus defaults to 0. * Started with tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Require sudo mode on the provisioning APIJoas Schilling2016-12-053-7/+24
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #2516 from nextcloud/graceful_no_share_providerMorris Jobke2016-12-051-8/+34
|\ \ \ \ | |_|_|/ |/| | | Handle unavailable share providers more graceful
| * | | Handle unavailable share providers more gracefulRoeland Jago Douma2016-12-051-8/+34
| | |/ | |/| | | | | | | | | | | | | | | | | | | If the sharebymail app (or the federatedshareprovider app) are disabled this kills a lot of stuff. So we should handle a share provider not begin available a bit more graceful. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2509 from nextcloud/sudo-mode-for-app-enablingLukas Reschke2016-12-055-0/+38
|\ \ \ | | | | | | | | Add sudo mode to enabling and disabling apps
| * | | Add sudo mode to enabling and disabling appsLukas Reschke2016-12-055-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise an administrator could bypass sudo mode by installing an app that allows RCE by design. I've by intention excluded the update endpoint from the requirement because updating apps should be as unintruisive as possible. Not the cleanest approach by adding this to the AJAX endpoints instead of requiring a controller but for 11 this felt safer for me. We can clean this up together later then. (also the other AJAX endpoints in this folder do have the same logic) Ref https://github.com/nextcloud/server/issues/2487 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | 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 changed
| * | | | make sure that we only update the email address if it really changedBjoern Schiessle2016-12-022-7/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | Merge pull request #2508 from nextcloud/systemtags-dropdown-styleMorris Jobke2016-12-051-0/+19
|\ \ \ \ \ | | | | | | | | | | | | improve systemtags selector styling
| * | | | | improve systemtags selector stylingRobin Appelman2016-12-051-0/+19
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-topMorris Jobke2016-12-057-1/+192
|\ \ \ \ \ | |_|_|/ / |/| | | | Move lately used tags to the top
| * | | | Make sure the object exists before adding it.Joas Schilling2016-11-071-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Also sort the tags in the filterJoas Schilling2016-11-071-0/+35
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Sort tags by name on the admin pageJoas Schilling2016-11-071-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | First list tags the user used latelyJoas Schilling2016-11-075-1/+150
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemetMorris Jobke2016-12-059-23/+605
|\ \ \ \ \ | | | | | | | | | | | | Add an activity when managing favorites
| * | | | | Add tests for favorite actionJoas Schilling2016-12-041-8/+55
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Add some generic testsJoas Schilling2016-12-043-0/+248
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Add an activity when managing favoritesJoas Schilling2016-12-045-15/+302
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | 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 cache
| * | | | | | check if the file should really be encrypted before we update the file cacheBjoern Schiessle2016-11-292-2/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #2501 from ↵Morris Jobke2016-12-051-23/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/issue-2472-remove-update-notification-after-updating Remove the update warning and the notification after an successful up…
| * | | | | | | Remove the update warning and the notification after an successful updateJoas Schilling2016-12-051-23/+30
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | | Merge pull request #2507 from nextcloud/conflict-dialog-ffMorris Jobke2016-12-051-7/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | fix conflict dialog styling in firefox
| * | | | | | fix conflict dialog styling in firefoxRobin Appelman2016-12-051-7/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #2468 from nextcloud/fix-personal-settings-readonlyMorris Jobke2016-12-051-42/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | personal settings: handle read-only parameters correctly
| * | | | | | hide password recovery note if email address can't be setBjoern Schiessle2016-12-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | handle read-only parameters correctlyBjoern Schiessle2016-12-021-40/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | | Merge pull request #2502 from nextcloud/personal-settings-dead-codeMorris Jobke2016-12-051-55/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove dead js code from personal settings
| * | | | | | | remove dead js code from personal settingsChristoph Wurst2016-12-051-55/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | 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 position
| * | | | | | Allow emtpy values on personal page and fix saving checkmark positionChristoph Wurst2016-12-052-1/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #2491 from nextcloud/fix-groups-enable-visualRoeland Jago Douma2016-12-052-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Put "Enable only for specific groups" into a new div
| * | | | | | Change groups enable to block elementJohn Molakvoæ (skjnldsv)2016-12-052-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: Felix A. Epp <work@felixepp.de>
* | | | | | | [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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Fixing issues with themed icons
| * | | | | | Fix transparency of iconsJulius Haertl2016-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | Fix background border radiusJulius Haertl2016-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
| * | | | | | Move sizing to renderAppIcon methodJulius Haertl2016-12-042-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net>
* | | | | | | [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!
| * | | | | | | Bump 7.1 CI to final!Roeland Jago Douma2016-12-031-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #2428 from justin-sleep/upstreamMorris Jobke2016-12-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix #2427 by converting $remember to integer
| * | | | | | | Move integer casting to the top of the chainjustin-sleep2016-12-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: justin-sleep <justin@quarterfull.com>