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

42395 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
ca493ab5b1
Merge pull request #8069 from nextcloud/no-catch-serverdown 
do not catch and ignore ServerNotAvailable in the wrong spot
 2018-01-26 14:01:07 +01:00
Morris Jobke
9ff51aafc5
Use index based string access for substr with length of 1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 13:38:34 +01:00
Morris Jobke
01d362d870
Merge pull request #8068 from nextcloud/simplify-ternary 
Simplify ternary operator statements
 2018-01-26 13:22:06 +01:00
Roeland Jago Douma
119896a8d7
Fix tests 
* Add factory for the federatedfilesharing app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 12:49:11 +01:00
Arthur Schiwon
b61b906abe
do not catch ServerNotAvailable 
might cause the user to be unavailable (race condition).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-26 12:47:19 +01:00
Morris Jobke
6bbea33133
Simplify ternary operator statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 12:36:25 +01:00
Morris Jobke
26682b6936
Merge pull request #8061 from nextcloud/use-typecasting 
Use type casting instead of *val() method
 2018-01-26 12:25:50 +01:00
Morris Jobke
c1e4f9f305
Use type casting instead of *val() method 
It should be up to 6x faster

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 11:35:42 +01:00
Roeland Jago Douma
f3723434ee
Don't expose language and password as editable 
* Password might not always be editable
  - Also chaging that will invalide apptokens etc which will directly
  lock out your phone
* Chaging the language also doesn't make that much sense to me currently

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 11:22:20 +01:00
Roeland Jago Douma
70b19761aa
Provide list of editable fields via OCS API 
Fixes #7983

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-26 11:20:58 +01:00
Morris Jobke
fe7e726ab2
Merge pull request #8064 from nextcloud/background-jobs 
Deprecated OCP interface to fetch background job type
 2018-01-26 10:43:21 +01:00
Morris Jobke
9ef6148bfa
Deprecated OCP interface to fetch background job type 
* was not used by apps and also is not needed
* migrated the documentation to IJobList

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 10:43:01 +01:00
Joas Schilling
a7ad7cb08e
Merge pull request #8053 from nextcloud/simplify-substr 
Use short for of substr to not need strlen()
 2018-01-26 10:25:09 +01:00
Joas Schilling
c2b1bd92d6
Merge pull request #8063 from nextcloud/inline-value 
Return value immediately instead of assigning to a one-time variable
 2018-01-26 10:15:39 +01:00
Roeland Jago Douma
fab951e4b3
Merge pull request #8057 from nextcloud/unneeded-implements 
Implements are not needed because they are already done by base class
 2018-01-26 10:00:25 +01:00
Roeland Jago Douma
e97165e0b5
Merge pull request #8055 from nextcloud/improve-loop 
Improve conditional of loop
 2018-01-26 09:59:45 +01:00
Roeland Jago Douma
ec1d94c629
Merge pull request #8052 from nextcloud/fix-array-methods 
Fix array method usages with a proper call
 2018-01-26 09:53:13 +01:00
Roeland Jago Douma
5a7a5e5352
Merge pull request #8058 from nextcloud/useless-return 
Remove useless return statements
 2018-01-26 09:51:26 +01:00
Roeland Jago Douma
68f44a9a93
Merge pull request #8059 from nextcloud/use-stripos 
Use stripos instead of strpos(strtolower(), 'something')
 2018-01-26 09:50:31 +01:00
Roeland Jago Douma
43ed8b446c
Merge pull request #8060 from nextcloud/proper-codeflow 
Use proper code flow instead of not needed else branch
 2018-01-26 09:49:30 +01:00
Roeland Jago Douma
aebb443ca5
Merge pull request #8056 from nextcloud/array-push 
Use $var[] = $a instead of array_push - 2x faster
 2018-01-26 09:41:31 +01:00
Nextcloud bot
469b3724b5
[tx-robot] updated from transifex 2018-01-26 01:10:52 +00:00
Morris Jobke
0a56d2185e
Return value immediately instead of assigning to a one-time variable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-26 00:02:03 +01:00
Morris Jobke
16a558871c
Use proper code flow instead of not needed else branch 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 23:01:03 +01:00
Morris Jobke
464f024fa9
Use stripos instead of strpos(strtolower(), 'something') 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:59:50 +01:00
Morris Jobke
4dbee99b7b
Remove useless return statements 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:50:40 +01:00
Morris Jobke
55ef34b23b
Implements are not needed because they are already done by base class 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:42:24 +01:00
Morris Jobke
870fe20acc
Use $var[] = $a instead of array_push - 2x faster 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:36:03 +01:00
Morris Jobke
c314eb74a9
Improve conditional of loop 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:33:43 +01:00
Morris Jobke
e6efa755c9
Use short for of substr to not need strlen() 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:23:48 +01:00
Morris Jobke
7800a9bc24
Fix array method usages with a proper call 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 22:20:10 +01:00
Morris Jobke
b9bbb894f8
Merge pull request #7916 from nextcloud/2fa_log 
Add 2FA to logfile
 2018-01-25 15:57:32 +01:00
Roeland Jago Douma
8160d0bc2a
Merge pull request #8036 from nextcloud/phpunit6 
Require PHPUnit 6.5 or higher
 2018-01-25 14:50:46 +01:00
Roeland Jago Douma
9e76577ead
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:44:47 +01:00
Morris Jobke
4718d2b80d
Update memcached image 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-25 13:40:57 +01:00
Roeland Jago Douma
a5fe6a6118
Update autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Roeland Jago Douma
c92eff919e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Roeland Jago Douma
b2ca1d6553
Make admin_audit listen to 2fa events 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Roeland Jago Douma
eddd135f14
Dispatch event on twofactor failure and success 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Joas Schilling
3917a54113
Class "ProgressBar" is declared "final" and cannot be mocked. 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:26 +01:00
Joas Schilling
bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +01:00
Nextcloud bot
fe88e7f926
[tx-robot] updated from transifex 2018-01-25 01:11:06 +00:00
Roeland Jago Douma
24af5c20bd
Bump docker containers used 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-24 20:35:28 +01:00
Joas Schilling
870023365c
Fix "Undefined method setExpectedException()" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 18:10:16 +01:00
Morris Jobke
e0b329c59d
Merge pull request #8032 from nextcloud/fix-missing-clipboard-icon-in-shared-links 
Fix missing clipboard icon in shared links
 2018-01-24 17:27:10 +01:00
Joas Schilling
c3424df1f0
Require PHPUnit 6.5 or higher 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 17:23:59 +01:00
Robin Appelman
3499cbdb76
Use S3Client::upload instead of splitting single/multipart upload ourselves 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-24 17:22:05 +01:00
Daniel Calviño Sánchez
5d7eded809 Fix missing clipboard icon in shared links 
The clipboard icon in shared links appears either directly on the link
input field or, if any social sharing app is enabled, in a menu. The
clipboard icon uses the same CSS rules as other icons (like the
information icon) to be posioned on the end of the input field, and
those rules have to be "cancelled" when the icon is shown in the menu.

Fixes #7990

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-01-24 16:40:21 +01:00
Morris Jobke
0e9009989f
Merge pull request #8020 from nextcloud/fix-avatar-migration 
Make sure we always know for sure if an avatar is generated or not
 2018-01-24 15:18:19 +01:00
Roeland Jago Douma
abb17589b1
Merge pull request #7991 from nextcloud/show-trusted-domain-error-in-status.php 
Send a proper response for status.php on trusted domain error
 2018-01-24 15:05:49 +01:00