aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1978 from nextcloud/remove-send-mail-optionMorris Jobke2016-11-021-5/+0
|\ | | | | Remove send mail option
| * remove 'send mail notification' option from sharing, replaced by ↵Bjoern Schiessle2016-11-021-5/+0
| | | | | | | | | | | | send-by-mail feature Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #1960 from nextcloud/adjust-link-to-contributing.mdRoeland Jago Douma2016-11-021-3/+2
|\ \ | | | | | | Adjust link to contributing.md
| * | Adjust link to contributing.mdJoas Schilling2016-11-021-3/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1940 from nextcloud/new-appstoreMichael Grosser2016-11-029-254/+233
|\ \ \ | |_|/ |/| | Use new appstore API
| * | Proxy images through usercontent.apps.nextcloud.comLukas Reschke2016-10-312-5/+6
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Add update supportLukas Reschke2016-10-312-19/+28
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Query the timefactory instead of creating itLukas Reschke2016-10-311-2/+2
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Use new appstore APILukas Reschke2016-10-318-234/+203
| | | | | | | | | | | | | | | | | | This change introduces the new appstore API in Nextcloud. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #1964 from ↵Roeland Jago Douma2016-11-022-4/+14
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/color-the-trusted-domain-to-alert-the-admin Color the trusted domain to alert the admin a bit more
| * | Color the trusted domain to alert the admin a bit moreJoas Schilling2016-10-312-4/+14
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2016-11-026-2/+34
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-014-8/+44
|/
* [tx-robot] updated from transifexNextcloud bot2016-10-316-12/+18
|
* [tx-robot] updated from transifexNextcloud bot2016-10-304-0/+14
|
* Move away from OC_L10NRoeland Jago Douma2016-10-281-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2016-10-2854-186/+304
|
* Merge pull request #1929 from nextcloud/share_email_to_OCSLukas Reschke2016-10-271-4/+0
|\ | | | | Remove notify recipient function
| * Remove notify recipient optionRoeland Jago Douma2016-10-261-4/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-10-274-0/+16
|/
* Allow users to change their passwords againJoas Schilling2016-10-261-0/+1
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #1355 from nextcloud/apps_flexboxMorris Jobke2016-10-261-1/+11
|\ | | | | Use flexbox on app page
| * Limit to apps list, add proper flex attributesFelix Epp2016-10-251-3/+10
| | | | | | | | | | | | | | Let app-name headline break, increase padding on the right for more visual clearance. Make experimental header full width Signed-off-by: Felix A. Epp <work@felixepp.de>
| * Use flexbox on app pageRoeland Jago Douma2016-09-101-0/+3
| |
* | [tx-robot] updated from transifexNextcloud bot2016-10-264-0/+20
| |
* | [tx-robot] updated from transifexNextcloud bot2016-10-2552-340/+340
| |
* | Merge pull request #1452 from nextcloud/appconfig-endpointJoas Schilling2016-10-252-35/+26
|\ \ | | | | | | Appconfig endpoint
| * | Switch to public APIJoas Schilling2016-10-212-15/+15
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make AppConfig part of the public APIJoas Schilling2016-10-211-20/+11
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1828 from nextcloud/avatar-picker-improvementsMorris Jobke2016-10-243-15/+57
|\ \ \ | | | | | | | | Avatar picker improvements
| * | | use smaller cropper on small screensRobin Appelman2016-10-241-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | center cropper verticallyRobin Appelman2016-10-241-9/+7
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | set initial cropper to max sizeRobin Appelman2016-10-211-4/+6
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | show spinner while loading/cropping avatarRobin Appelman2016-10-201-2/+10
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | only show cropper dialog when the cropper is readyRobin Appelman2016-10-201-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | float the avatar cropper over the pageRobin Appelman2016-10-203-8/+38
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Prevent flashing the full sized image when cropping an avatarRobin Appelman2016-10-201-2/+5
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Fix misleading SSL/TLS SMTP email configurationJoas Schilling2016-10-241-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Modified the SQLite warning of server/settings/templates/admin/tiptricks.php ↵Sam Cater2016-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | to be more understandable and legible Signed-off-by: Sam Cater <sam@samcater.com> Added sign off of commit
* | | Merge pull request #1832 from nextcloud/select2-into-coreLukas Reschke2016-10-222-10/+1
|\ \ \ | | | | | | | | Select2 into core
| * | | Template css orderJohn Molakvoæ2016-10-212-10/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Select2 systemtags removal Settings again Fix Script Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / / Fix personal pageRoeland Jago Douma2016-10-211-1/+1
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Get rid of settings/img/*.pngRoeland Jago Douma2016-10-206-0/+0
| | | | | | | | | | | | We only use SVG icons so no need to ship them! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1789 from nextcloud/select2-fixesMorris Jobke2016-10-181-9/+0
|\ \ | | | | | | move select2 styles to core so it's universal, not only for tags
| * | move select2 styles to core so it's universal, not only for tagsJan-Christoph Borchardt2016-10-181-9/+0
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixesMorris Jobke2016-10-181-4/+4
|\ \ \ | |/ / |/| | Avatar/file-picker fixes for access-control app
| * | The red box already makes clear it's an errorJoas Schilling2016-10-181-4/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | improve look of Add group flowJan-Christoph Borchardt2016-10-182-8/+14
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | fix list height and border to be as in FilesJan-Christoph Borchardt2016-10-181-3/+17
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | [tx-robot] updated from transifexNextcloud bot2016-10-182-0/+6
|/ /