wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
39061 commits 157 branches 562 tags 714 MiB
Commit graph

39061 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
dd03fdebec
Add missing space 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-01 20:36:25 +02:00
Roeland Jago Douma
4904117ba8 Merge pull request #4612 from nextcloud/js-fix-long-lines 
Fix some long lines in JS - JSLinut recommendation
 2017-05-01 19:55:56 +02:00
Roeland Jago Douma
92b73db053 Merge pull request #4613 from nextcloud/remove-unused 
Remove unused JS file
 2017-05-01 19:42:12 +02:00
Robin Appelman
fa52f906e3
show non landscape icons bigger on the login page 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-01 19:05:21 +02:00
Lukas Reschke
a5ccb31e85
Mark IP as whitelisted if brute force protection is disabled 
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>
 2017-05-01 18:31:45 +02:00
Lukas Reschke
0329adbc61 Merge pull request #4599 from nextcloud/contactsmenu-mobile 
Define max-width for Contacts menu for mobile
 2017-05-01 18:05:52 +02:00
Lukas Reschke
4a05ca46d3 Merge pull request #4598 from nextcloud/menu-flashing 
Prevent flashing of apps and user menu on page load
 2017-05-01 18:04:51 +02:00
Morris Jobke
dba55f950a Merge pull request #4594 from nextcloud/theming-image-default 
Delete theming images when logo/background is reset to default
 2017-05-01 12:55:00 -03:00
Morris Jobke
3eba37ac14 Merge pull request #4527 from nextcloud/downstream-27504 
Adjust SMB permissions on the root
 2017-05-01 12:53:49 -03:00
Lukas Reschke
7a2d817c83 Merge pull request #4624 from nextcloud/email-settings-html 
fix email settings
 2017-05-01 17:51:15 +02:00
Lukas Reschke
a2f6fea408 Merge pull request #4610 from nextcloud/js-semicolons 
Fix semicolon at end of JS lines
 2017-05-01 16:55:35 +02:00
Lukas Reschke
99f98ca343 Merge pull request #4614 from nextcloud/js-fix-dialogs-and-octemplate 
Fix variable definitions in oc dialogs
 2017-05-01 16:54:53 +02:00
Lukas Reschke
1e35c9d8b6 Merge pull request #4513 from nextcloud/bump-version-to-beta1 
Bump version to Nextcloud 12.0 beta 1
 2017-05-01 16:53:16 +02:00
Lukas Reschke
a3546b0ec0
Remove apps delivered from the appstore 
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>
 2017-05-01 16:47:58 +02:00
Robin Appelman
6e7359ebfd
fix email settings 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-01 16:32:09 +02:00
Robin Appelman
75b3b72d89
fix permissions of mountpoints 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-01 15:37:02 +02:00
Roeland Jago Douma
18b5e2fced Merge pull request #4616 from nextcloud/js-reduce-complexity-for-sharedialogview.js 
Fix variable definition in sharedialogview.js
 2017-05-01 14:21:28 +02:00
Morris Jobke
23858504eb
Fix variable definition in sharedialogview.js 
* improves readability of conditional statements
  and fixes warning in JSLint for varibale definition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:32:54 -03:00
Morris Jobke
4cd8b3379b
Remove unused methods from OC.Share 
* 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>
 2017-05-01 01:29:00 -03:00
Morris Jobke
d222351c87
Fix variable definitions in oc dialogs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 01:09:29 -03:00
Morris Jobke
26b92ada0e
Remove unused JS file 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:59:10 -03:00
Morris Jobke
a9ccfe06d9
Fix some long lines in JS - JSLinut recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:49:00 -03:00
Morris Jobke
80a5e0a735
Use dot notation for array access - JSLint recommendation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:45:41 -03:00
Morris Jobke
11b9d224fd
Fix semicolon at end of JS lines 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-01 00:42:53 -03:00
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Morris Jobke
285a5b98b0 Merge pull request #4602 from nextcloud/make-tooltip-intransparent 
Make tooltip intransparent
 2017-04-30 11:13:36 -03:00
Julius Härtl
7c69c117e2
Delete theming images when logo/background is reset to default 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-30 11:04:55 -03:00
Nextcloud bot
4518f6dc64
[tx-robot] updated from transifex 2017-04-30 00:07:21 +00:00
blizzz
9edd3916ff Merge pull request #4603 from nextcloud/basic-settings 
Rename “Server settings” to “Basic settings”
 2017-04-29 23:28:50 +02:00
Marius Blüm
f26764c790
Rename “Server settings” to “Basic settings” 
* fixes #4587

Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-04-29 17:13:21 +02:00
Jan-Christoph Borchardt
fabaf09d4f Merge pull request #4583 from nextcloud/theming-fixes-admin 
Theming admin section fixes
 2017-04-29 17:05:11 +02:00
Morris Jobke
55da62a29c
Make tooltip intransparent 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 10:44:38 -03:00
Morris Jobke
9af26d1db5 Merge pull request #4597 from nextcloud/tooltips-invert 
Invert tooltip color to white, fix #4563
 2017-04-29 10:43:33 -03:00
Jan-Christoph Borchardt
bc36446455 Define max-width for Contacts menu for mobile 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-29 13:55:57 +02:00
Jan-Christoph Borchardt
7015eb9fe5 Prevent flashing of apps and user menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-29 13:34:44 +02:00
Jan-Christoph Borchardt
41b67e3d17 Invert tooltip color to white, fix #4563 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-29 13:19:17 +02:00
Morris Jobke
854dfef199 Merge pull request #1234 from nextcloud/rebase-413-by-faldon 
Disabling users in WebUI
 2017-04-29 01:35:04 -03:00
Arthur Schiwon
c0e4fd0605
align popovermenu next to … buttonthingy 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-29 00:59:09 -03:00
Arthur Schiwon
99e97f135d
consolidate setEnabled method 
and fix a unit test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-29 00:59:09 -03:00
Arthur Schiwon
668fe7df51
UserManager can now count disabled users 
Users page takes advantage of that

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-29 00:59:09 -03:00
Christoph Wurst
8f5f26c88d
Use short array syntax 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-29 00:59:09 -03:00
Morris Jobke
4c37c38051
fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 00:59:09 -03:00
Morris Jobke
485d6d6577
use proper return codes and handle failure cases 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 00:59:09 -03:00
Morris Jobke
2507e7459d
Improve wording of error messages 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 00:59:09 -03:00
Morris Jobke
74802ca72f
fix greyed out display name 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 00:59:09 -03:00
Morris Jobke
a8457df064
fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 00:59:09 -03:00
Morris Jobke
74e5091013
check $user object before using it 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-29 00:59:09 -03:00
Morris Jobke
72550377b4
add unit tests for enable method 2017-04-29 00:59:09 -03:00
Morris Jobke
e521b6799f
add unit tests for disable method 2017-04-29 00:59:09 -03:00
Morris Jobke
79d74a1425
adjust tests to have at least one disabled user 2017-04-29 00:54:30 -03:00