summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update documentation go.php URL to 12Lukas Reschke2017-05-022-4/+4
| | | | | | Fixes https://github.com/nextcloud/server/issues/4646 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* [tx-robot] updated from transifexNextcloud bot2017-05-02112-922/+2648
|
* Merge pull request #4630 from ↵Morris Jobke2017-05-012-7/+54
|\ | | | | | | | | nextcloud/mark-ip-as-whitelisted-if-bruteforce-protection-is-disabled Mark IP as whitelisted if brute force protection is disabled
| * Add missing spaceLukas Reschke2017-05-011-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Mark IP as whitelisted if brute force protection is disabledLukas Reschke2017-05-012-8/+55
| | | | | | | | | | | | | | | | Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling. This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #4626 from nextcloud/adjust-shipped-jsonLukas Reschke2017-05-011-4/+0
|\ \ | | | | | | Remove apps delivered from the appstore
| * | Remove apps delivered from the appstoreLukas Reschke2017-05-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps that are in shipped.json follow some more requirements such as having a valid code integrity check. This is not something that we require when they come from the appstore as there we verify the download integrity via the signature. Also the updater treats apps that are shipped differently. We should however handle the apps like any other app from the appstore. Fixes https://github.com/nextcloud/server/issues/4605 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #4615 from nextcloud/js-reduce-share.js-complexityLukas Reschke2017-05-011-87/+0
|\ \ \ | | | | | | | | Remove abandoned methods in OC.Share that refer to old API endpoints
| * | | Remove unused methods from OC.ShareMorris Jobke2017-05-011-87/+0
| |/ / | | | | | | | | | | | | | | | | | | * they do calls against core/ajax/share.php which doesn't exist anymore * also the methods are not called in any of our apps or any of the apps in the appstore Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #4612 from nextcloud/js-fix-long-linesRoeland Jago Douma2017-05-012-2/+8
|\ \ \ | | | | | | | | Fix some long lines in JS - JSLinut recommendation
| * | | Fix some long lines in JS - JSLinut recommendationMorris Jobke2017-05-012-2/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4613 from nextcloud/remove-unusedRoeland Jago Douma2017-05-011-371/+0
|\ \ \ \ | | | | | | | | | | Remove unused JS file
| * | | | Remove unused JS fileMorris Jobke2017-05-011-371/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4599 from nextcloud/contactsmenu-mobileLukas Reschke2017-05-011-0/+1
|\ \ \ \ | | | | | | | | | | Define max-width for Contacts menu for mobile
| * | | | Define max-width for Contacts menu for mobileJan-Christoph Borchardt2017-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #4598 from nextcloud/menu-flashingLukas Reschke2017-05-011-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Prevent flashing of apps and user menu on page load
| * | | | | Prevent flashing of apps and user menuJan-Christoph Borchardt2017-04-291-2/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #4594 from nextcloud/theming-image-defaultMorris Jobke2017-05-012-0/+69
|\ \ \ \ \ | | | | | | | | | | | | Delete theming images when logo/background is reset to default
| * | | | | Delete theming images when logo/background is reset to defaultJulius Härtl2017-04-302-0/+69
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #4527 from nextcloud/downstream-27504Morris Jobke2017-05-012-24/+65
|\ \ \ \ \ | | | | | | | | | | | | Adjust SMB permissions on the root
| * | | | | remove duplicate methodRobin Appelman2017-04-261-26/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | remove excessive loggingRobin Appelman2017-04-261-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Add new specific tests for SMBJuan Pablo Villafáñez2017-04-261-0/+19
| | | | | |
| * | | | | Adjust SMB permissions on the rootJuan Pablo Villafáñez2017-04-261-3/+60
| | | | | |
* | | | | | Merge pull request #4624 from nextcloud/email-settings-htmlLukas Reschke2017-05-011-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | fix email settings
| * | | | | fix email settingsRobin Appelman2017-05-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4610 from nextcloud/js-semicolonsLukas Reschke2017-05-018-16/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix semicolon at end of JS lines
| * | | | | | Fix semicolon at end of JS linesMorris Jobke2017-05-018-16/+16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplateLukas Reschke2017-05-013-4/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix variable definitions in oc dialogs
| * | | | | | Fix variable definitions in oc dialogsMorris Jobke2017-05-013-4/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4513 from nextcloud/bump-version-to-beta1Lukas Reschke2017-05-011-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Bump version to Nextcloud 12.0 beta 1
| * | | | | Bump version to Nextcloud 12.0 beta 1Lukas Reschke2017-04-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4616 from ↵Roeland Jago Douma2017-05-011-7/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | nextcloud/js-reduce-complexity-for-sharedialogview.js Fix variable definition in sharedialogview.js
| * | | | | Fix variable definition in sharedialogview.jsMorris Jobke2017-05-011-7/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * improves readability of conditional statements and fixes warning in JSLint for varibale definition Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-01102-66/+630
| | | | |
* | | | | Merge pull request #4602 from nextcloud/make-tooltip-intransparentMorris Jobke2017-04-301-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | Make tooltip intransparent
| * | | | Make tooltip intransparentMorris Jobke2017-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-04-30166-206/+274
| | | | |
* | | | | Merge pull request #4603 from nextcloud/basic-settingsblizzz2017-04-292-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Rename “Server settings” to “Basic settings”
| * | | | | Rename “Server settings” to “Basic settings”Marius Blüm2017-04-292-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #4587 Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | Merge pull request #4583 from nextcloud/theming-fixes-adminJan-Christoph Borchardt2017-04-297-132/+114
|\ \ \ \ \ | |/ / / / |/| | | | Theming admin section fixes
| * | | | Code cleanup and preview for undo actionsJulius Härtl2017-04-293-34/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Make sure that ThemingDefaults uses the correct default values from \OC_DefaultsJulius Härtl2017-04-293-56/+36
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Use generated SCSS for theming previewJulius Härtl2017-04-294-45/+62
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #4597 from nextcloud/tooltips-invertMorris Jobke2017-04-291-30/+31
|\ \ \ \ \ | |_|_|_|/ |/| | | | Invert tooltip color to white, fix #4563
| * | | | Invert tooltip color to white, fix #4563Jan-Christoph Borchardt2017-04-291-30/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #1234 from nextcloud/rebase-413-by-faldonMorris Jobke2017-04-2914-110/+878
|\ \ \ \ \ | |_|/ / / |/| | | | Disabling users in WebUI
| * | | | align popovermenu next to … buttonthingyArthur Schiwon2017-04-291-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | consolidate setEnabled methodArthur Schiwon2017-04-292-88/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fix a unit test Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | UserManager can now count disabled usersArthur Schiwon2017-04-294-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users page takes advantage of that Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 06:14:15 +0000