upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25
38554 commits 882 branches 1195 tags 7.2 GiB
Commit graph

4027 commits

Author SHA1 Message Date
Christoph Wurst
36cee1f386 Let apps register contact menu provider via info.xml 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Christoph Wurst
d091793ceb Contacts menu 
* load list of contacts from the server
* show last message of each contact

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Morris Jobke
5a9224fb4c Merge pull request #3531 from nextcloud/theming-scss 
Theming using SCSS variables
 2017-04-25 10:56:13 -03:00
Morris Jobke
6f2df5e495 Merge pull request #3195 from nextcloud/settings-apps-tabular 
Make apps settings tabular
 2017-04-25 10:25:29 -03:00
Roeland Jago Douma
82c9eb1c56 Merge pull request #4462 from danxuliu/fix-sharing-password-protected-link 
Fix sharing a password protected link
 2017-04-25 14:12:44 +02:00
Julius Haertl
68a63ad3f3
Implement scss variable injection by OC_Defaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>

Add Scss variables to example theme and theming app

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Use SCSSCacher to build theming css

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Update theming.scss

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Code cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Inject SCSSCacher for easier testing

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Fix typehint

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Generate absolute URLs

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix tests to always use absolute urls for theming images

Signed-off-by: Julius Härtl <jus@bitgrid.net>

MailheaderColor -> ColorPrimary

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-25 11:39:45 +02:00
Christoph Wurst
bb1d191f82
Fix remember redirect_url on failed login attempts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 09:38:19 +02:00
Felix A. Epp
2fbf1114ac Add installed category in AppSettingsControlerTest 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2017-04-25 00:22:57 +02:00
Roeland Jago Douma
41f492ada7 Merge pull request #4477 from danxuliu/acceptance-macos-nitpicking 
Fix minor code style issues in acceptance test runner
 2017-04-24 19:30:03 +02:00
Joas Schilling
6300be160a
Add unit tests for mounts of delete users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 16:43:25 +02:00
blizzz
42e805f057 Merge pull request #1023 from GitHubUser4234/ldap_password_renew_pr 
Handle password expiry in user_ldap
 2017-04-24 12:17:04 +02:00
Daniel Calviño Sánchez
a56fb75e69 Add missing unit test for updateShare with email share 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
de6b05a911 Add missing hook check 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
dcc8cce28b Fix double hashing of shared link passwords 
The plain text password for a shared links was hashed and, then, the
hashed password was hashed again and set as the final password. Due to
this the password introduced in the "Authenticate" page for the shared
link was always a wrong password, and thus the file could not be
accessed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
316710bcb1 Add acceptance tests for sharing password protected links 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
13c84f6629 Add system to share data between acceptance test steps 
The data storage (the "notebook") is shared between all the actors, so
the data can be stored and retrieved between different steps by any
actor in the same scenario.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-24 11:33:07 +02:00
Daniel Calviño Sánchez
b0b32eff1f Fix minor code style issues (also known as nitpicking) 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-22 17:50:37 +02:00
Morris Jobke
db7eedccc9
Run acceptance tests on macOS 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-21 14:11:56 -05:00
Roeland Jago Douma
eaa6f766e6 Merge pull request #4208 from danxuliu/add-basic-acceptance-test-system 
Add basic acceptance test system
 2017-04-21 20:53:32 +02:00
Daniel Calviño Sánchez
e970b5261f Make test passwords valid for the password_policy app 
As requested by Morris Jobke, the passwords in the acceptance tests were
modified to make them valid both for a clean Nextcloud server and one
with the password_policy app enabled.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-21 14:47:44 +02:00
Daniel Calviño Sánchez
2f80025ec2 Move acceptance tests from build/acceptance to tests/acceptance 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-04-21 14:44:29 +02:00
Joas Schilling
ec2f2b75be
Make sure we use a new encryption module all the time 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:48:14 +02:00
Joas Schilling
06e60f88c5
Don't assume the admin didn't configure Opcache correctly... 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 13:17:21 +02:00
Joas Schilling
b2deb6deb0
Use the correct class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:55:11 +02:00
Joas Schilling
0de5fc9020
Import some classes 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:54:14 +02:00
Joas Schilling
ada615eb86
Use the correct Dummy and Backend class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:48:51 +02:00
Joas Schilling
9871e4eaee
Kill dead code 
> No tests found in class "Test\Share\MailNotificationsTest".

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:43:19 +02:00
Joas Schilling
d2d9f74707
Fix warning with undefined method 
Trying to configure method "getRemember" which cannot be configured
because it does not exist, has not been specified, is final, or is
static

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:37:59 +02:00
Joas Schilling
a0ada9aab4
Don't use deprecated getMock() anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:30:21 +02:00
Joas Schilling
24789ba0f4
Restoring the error handler within the error handler causes unexpected results 
See http://php.net/manual/en/function.restore-error-handler.php#120879
for more information.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:23:34 +02:00
Joas Schilling
38c901fadf
Delete the correct config value 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-20 12:23:12 +02:00
Joas Schilling
140580f9d8 Merge pull request #4398 from nextcloud/fix_accesslistcode 
Get proper accesslist for userFolder
 2017-04-20 11:03:22 +02:00
Joas Schilling
b469882595 Merge pull request #4212 from individual-it/master 
validate file name before uploading in upload only folder
 2017-04-20 10:50:56 +02:00
Roeland Jago Douma
ae2db5e60d
Get proper accesslist for userFolder 
If the accesslist is requested for a users root folder we should
properly construct the path

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-04-20 10:28:32 +02:00
Morris Jobke
16c4755e03
Rename renderHTML to renderHtml 
* fixes #4383
* improves consistency

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-19 15:46:41 -05:00
Roeland Jago Douma
ad24b86013 Merge pull request #4350 from nextcloud/adjust-old-bruteforce-protection-annotations 
Adjust existing bruteforce protection code
 2017-04-19 09:27:23 +02:00
Morris Jobke
f1ddb939a0 Merge pull request #4371 from nextcloud/dont-allow-dot-usernames 
Better validation of allowed user names
 2017-04-18 20:04:32 -05:00
Morris Jobke
269600a04f Merge pull request #4369 from nextcloud/fix-translations 
Fix translations
 2017-04-18 18:01:50 -05:00
Joas Schilling
1c0bffe87f
Fix translations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 16:40:53 -05:00
Lukas Reschke
0a54d5a5dd
Beautify test email 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-18 16:18:00 -05:00
Morris Jobke
d379ac7545 Merge pull request #4372 from nextcloud/smtp-password 
Don't put the SMTP password into the HTML code
 2017-04-18 16:13:31 -05:00
Morris Jobke
d2c4440ed6
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-18 15:08:38 -05:00
Lukas Reschke
805419bb95
Add bruteforce protection to changePersonalPassword 
While the risk is actually quite low because one would already have the user session and could potentially do other havoc it makes sense to throttle here in case of invalid previous password attempts.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-18 17:55:51 +02:00
Artur Neumann
88f02f27a3 JS tests for upload only function 
Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-04-18 20:43:25 +05:45
Joas Schilling
fcaa315c96
Fix some more stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 16:11:29 +02:00
Joas Schilling
dfca672378
Fix tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 16:08:29 +02:00
Joas Schilling
a3922bbcdc
Better validation of allowed user names 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-18 14:29:34 +02:00
Morris Jobke
10290eb006 Merge pull request #2834 from nextcloud/accesListToShareManager 
Access list to share manager
 2017-04-15 13:06:24 -05:00
Lukas Reschke
727688ebd9
Adjust existing bruteforce protection code 
- Moves code to annotation
- Adds the `throttle()` call on the responses on existing annotations

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-14 13:42:40 +02:00
Lukas Reschke
8149945a91
Make BruteForceProtection annotation more clever 
This makes the new `@BruteForceProtection` annotation more clever and moves the relevant code into it's own middleware.

Basically you can now set `@BruteForceProtection(action=$key)` as annotation and that will make the controller bruteforce protected. However, the difference to before is that you need to call `$responmse->throttle()` to increase the counter. Before the counter was increased every time which leads to all kind of unexpected problems.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-13 23:05:33 +02:00