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

3441 commits

Author SHA1 Message Date
Roeland Jago Douma
24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling 
better handling of preview generation errors
 2017-05-02 21:49:14 +02:00
Lukas Reschke
121cb4bcfc Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu 
Do not show an email action for contacts with emtpy email addresses
 2017-05-02 17:02:16 +02:00
Christoph Wurst
b13c741cb3
Do not show an email action for contacts with emtpy email addresses 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-02 14:12:04 +02:00
Robin Appelman
2847e9f2e3
fix preview tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-02 13:43:48 +02:00
Roeland Jago Douma
ae7c1504a9
Fix test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 11:38:21 +02:00
Roeland Jago Douma
762284ce93
Fix and update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 08:59:53 +02:00
Lukas Reschke
dd03fdebec
Add missing space 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-01 20:36:25 +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
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
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
Bjoern Schiessle
5fa0e6df39
fix email verification status 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:37 -03:00
Bjoern Schiessle
71657db4be
updated unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Morris Jobke
f000e22a97 Merge pull request #4522 from nextcloud/downstream-27596 
Allow to create a user for a specific backend
 2017-04-27 16:41:08 -03:00
Joas Schilling
9212089151
Use the new method in the old one to remove duplicate code 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-27 08:56:51 +02:00
Morris Jobke
4dab01d9ed Merge pull request #4501 from nextcloud/downstream-27144 
Add duration of last job execution to the table
 2017-04-26 23:16:21 -03:00
Morris Jobke
01705b1b6a Merge pull request #4515 from nextcloud/downstream-27643 
Adjust query/event logging code in favour of more complex owncloud/di…
 2017-04-26 22:58:01 -03:00
Morris Jobke
4a9cb81486 Merge pull request #4526 from nextcloud/downstream-27269 
Don`t allow upload of files with extension .part
 2017-04-26 18:21:13 -03:00
Lukas Reschke
3df99d8fd6
Add SocialSharingBundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-26 20:07:53 +02:00
Lukas Reschke
0c5a48c4a4
Add tests for repairstep 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-26 20:07:52 +02:00
Lukas Reschke
a05295fca3
Add spreed to Groupware bundle 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-26 20:07:52 +02:00
Lukas Reschke
0651d66181
Add tests for bundle code 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-26 20:07:51 +02:00
Lukas Reschke
3f9aaac4a2
Adjust tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-26 20:07:51 +02:00
Vincent Petry
1c771c097a
Use regex to detect part files 2017-04-26 16:12:48 +02:00
Piotr Mrówczyński
9fec4031b3
Adjust query/event logging code in favour of more complex owncloud/diagnostics (#27643) 
* Adjust query/event logging code in favour of more complex owncloud/diagnostics
* Add descriptions to IQueryLogger and IEventLogger interfaces
 2017-04-26 13:19:43 +02:00
Georg Ehrke
f32fc97533
fix ContactsStoreTest 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:28:15 +02:00
Georg Ehrke
60f9ed6241
add contactsmenu popover 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-04-26 09:26:53 +02:00
Morris Jobke
d4329f3355 Merge pull request #4449 from stweil/mimetypes 
Add mimetypes for jp2 and webp
 2017-04-26 01:22:49 -03:00
Jan-Christoph Borchardt
241e397326 Merge branch 'master' into contactsmenu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-04-26 00:50:38 +02:00
Christoph Wurst
98f02fad60 Adjust entry unit test to newly added avatar property 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:18 +02:00
Christoph Wurst
2c2e1f7988 Use absolute URI for action icons 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
Christoph Wurst
b8c2a8ae36 Don't show contacts an entry for themselves 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-04-25 20:47:17 +02:00
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
Stefan Weil
8ba67fbe1e Add test code for new image mime types 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2017-04-25 19:22:46 +02:00
Noveen Sachdeva
1b1f403a5d
Add duration of last job execution to the table 2017-04-25 17:39:58 +02:00
Joas Schilling
ac0c21f4a7
Trigger change when a user is enabled/disabled 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-25 17:20:35 +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
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
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
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
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
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