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

41756 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
96bc03a03a
don't create sorter instances when none was requested 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-28 13:30:51 +01:00
Arthur Schiwon
cfd1e04588
Update login filter when user filter was newly generated 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-28 12:41:36 +01:00
Marin Treselj
dd8bfe5d36 Remove deprecated white, shaded icons 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-28 10:59:22 +01:00
Marin Treselj
70953fa788 Add new .icon-white and .icon-shadow classes, add toggle-background icon 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-28 10:56:28 +01:00
Daniel Calviño Sánchez
0c45778219 Fix silent conflicts due to merging #7256 after #7251 
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251, and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-28 02:35:39 +01:00
Nextcloud bot
a0ce2c1204
[tx-robot] updated from transifex 2017-11-28 01:09:52 +00:00
Daniel Calviño Sánchez
2a7b1bae10 Reject X-OC-MTime header if given as a string with hexadecimal notation 
In PHP 7.X hexadecimal notation support was removed from "is_numeric",
so "sanitizeMtime" directly rejected those values; in PHP 5.X, on the
other hand, "sanitizeMtime" returned 0 when a string with hexadecimal
notation was given (as it was the behaviour of "intval"). To provide a
consistent behaviour between PHP versions, and given that it does not
make much sense to send X-OC-MTime in hexadecimal notation, now
X-OC-MTime is always rejected if given as a string with hexadecimal
notation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-28 01:08:52 +01:00
Thomas Müller
ffe034abb0 Don't use runInSeparateProcess 
Directly calling "header" in the PHPUnit process causes the "Cannot
modify header information - headers already sent by" error to be thrown.
Instead of running the test in a separate process, which is slower, this
commit wraps the call to "header" in a method that can be mocked in the
tests.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 20:39:45 +01:00
Daniel Calviño Sánchez
a5e4c2ea11 Add tests for X-OC-MTime header handling 
This commit is based on the commits from pull request 28066 (included in
018d45cad97e0) from ownCloud by Artur Neumann and Phil Davis.

Unit tests are currently run only on systems that support negative
mtimes, so no special handling of negative values was included in the
tests to keep the test code more manageable.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 20:39:45 +01:00
Daniel Calviño Sánchez
2af3d8a9b2 Make possible to provide a specific HTTP request object to File 
This will be used in a following commit to test how the X-OC-MTime
header is handled.

This commit is based on the "make File::put() more testable" commit
(included in 018d45cad97e0) from ownCloud by Artur Neumann.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 20:39:41 +01:00
Daniel Calviño Sánchez
01e346b2ae Ensure that X-OC-MTime header is an integer also with chunked uploads 
This commit extends the changes introduced in pull request #3793 also to
chunked uploads.

The "sanitizeMTime" method name is the same used in the equivalent pull
request to this one from ownCloud (28066).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 20:37:51 +01:00
Morris Jobke
7d9e475434
Merge pull request #7303 from nextcloud/fix-contact-menu 
Fix contacts menu height for Safari
 2017-11-27 18:30:06 +01:00
Morris Jobke
3f7267e0e9
Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error 
catch errors when parsing calendar data for calendar query requests
 2017-11-27 17:50:37 +01:00
Morris Jobke
3e1860e3d6
Merge pull request #7305 from nextcloud/log-level-for-log-extending 
Pass log level to log reporters
 2017-11-27 17:49:46 +01:00
Lukas Reschke
4d200851f9
Merge pull request #7292 from Neraste/fix/4789_disabled_users 
Fix #4789: Group admins cannot see disabled users
 2017-11-27 17:29:59 +01:00
Morris Jobke
573551253e
Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncToken 
Log InvalidSyncToken on DAV in debug level
 2017-11-27 17:27:41 +01:00
Lukas Reschke
5cc8ea8feb
Merge pull request #7307 from nextcloud/do-not-log-not-implemented-dav 
Log NotImplementedException on DAV in debug level
 2017-11-27 17:25:56 +01:00
Georg Ehrke
ea117bac31
catch errors when parsing calendar data for calendar query requests 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-11-27 17:14:18 +01:00
Morris Jobke
132764bff5
Pass log level to log reporters 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:46:47 +01:00
blizzz
f700cd14fa
Merge pull request #7222 from nextcloud/fix-filerow-avatars 
Fix filerow avatars
 2017-11-27 16:46:11 +01:00
Morris Jobke
4a63727ed9
Merge pull request #7210 from nextcloud/pg10 
add postgresql 10 compatibility to dbal
 2017-11-27 16:40:58 +01:00
Morris Jobke
88905c6293
Log InvalidSyncToken on DAV in debug level 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:37:11 +01:00
Morris Jobke
26a5fff423
Log NotImplementedException on DAV in debug level 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 16:17:01 +01:00
Lukas Reschke
b331c67859
Bump thirdparty ref 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 15:20:42 +01:00
blizzz
e428ef9d75
Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments 
Fix cursor for avatar and user names in comments
 2017-11-27 15:14:40 +01:00
Morris Jobke
cfae590ac9
Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent 
Fix input field not disabled while a comment is being sent
 2017-11-27 13:40:03 +01:00
Morris Jobke
152b2824dc
Fix contacts menu height for Safari 
* fixes #5119
* in Safari the input field was 38px in height and not 34px like in all other browsers

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 13:32:05 +01:00
Lukas Reschke
e02229e412
Merge pull request #7246 from william-p/Add_html5_audioplayer_public 
Add HTML5 audio player in public view
 2017-11-27 12:32:21 +01:00
Morris Jobke
7bb42438fa
Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment 
Fix working icon position when sending or deleting a comment
 2017-11-27 12:19:21 +01:00
Morris Jobke
c5446ebd9a
Merge pull request #7251 from nextcloud/contact-menu-position-fix 
Fixed contact menu position on comments
 2017-11-27 12:14:30 +01:00
Lukas Reschke
fb1a92b07d
Merge pull request #7295 from nextcloud/remove-unused-method 
Remove unused mimetype detection method in OC_Image
 2017-11-27 11:55:20 +01:00
Lukas Reschke
d15ca9ffaf
Replace with non-deprecated JS call 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 11:53:24 +01:00
Lukas Reschke
8ccb486876
Merge pull request #7264 from nextcloud/cache-fetched-apps 
Cache fetched apps in update check
 2017-11-27 11:48:59 +01:00
Morris Jobke
f0d809fdde
Merge pull request #7298 from nextcloud/fix-wording 
Fix a sentence in the README
 2017-11-27 11:32:03 +01:00
Morris Jobke
4b73ddc9ce
Merge pull request #6437 from nextcloud/support-mail-send-in-share 
Add support for `\OCP\Share\IShare::getMailSend` back
 2017-11-27 11:29:38 +01:00
Morris Jobke
7a88c34c2c
Fix a sentence in the README 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 11:23:56 +01:00
Joas Schilling
3d7489cfd6
Merge pull request #7297 from nextcloud/fgsl-master 
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12+ LDAP
 2017-11-27 11:11:00 +01:00
Morris Jobke
a51a8fbcaf
Federation actually sends an email via Share 2.0 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 10:54:40 +01:00
Morris Jobke
1063b99406
Merge pull request #6356 from nextcloud/rename-ldap 
Rename "LDAP" to "LDAP/AD-integration"
 2017-11-27 10:31:11 +01:00
Roeland Jago Douma
be1006b607
Merge pull request #7296 from nextcloud/increase-phan-checks 
Harden phan checks to catch more errors
 2017-11-27 10:14:06 +01:00
Marius Blüm
05039f1f71
Rename "LDAP" to "LDAP/AD-integration" 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-11-27 09:49:28 +01:00
Lukas Reschke
1c25919cf1
Proper handle null cases and default to true 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:38:39 +01:00
Lukas Reschke
56a2512581
Add support for \OCP\Share\IShare::getMailSend back 
This adds back the support for `\OCP\Share\IShare::getMailSend`, one example is creating bulk shares via API which where previously blocking due to the share notification emails.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:38:39 +01:00
Lukas Reschke
9ac878b6cb
Adjust tests for added lastCheck time 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:25:03 +01:00
Flávio Gomes da Silva Lisboa
5ca9a7d6bc
Loss of performance on Login after upgrade from NC10 + LDAP to NC 12 + LDAP #6732 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-11-27 09:22:44 +01:00
Morris Jobke
655c0cb40d
Merge pull request #7178 from nextcloud/comradekingu-patch-1 
No "to equal to" "We" or "Our", properly
 2017-11-27 09:19:29 +01:00
Morris Jobke
4af12dcab1
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 08:50:44 +01:00
Allan Nordhøy
011e05574f
that has since been deleted, ID to node 
You were mentioned in a group chat by a user that has since been deleted

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 08:50:39 +01:00
Allan Nordhøy
55cad46a21
No "to equal to" "We" or "Our", properly 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 08:50:37 +01:00
Morris Jobke
c930f70b52
Harden phan checks to catch more errors 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-27 07:53:56 +01:00