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

37309 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
69c9ca4522 Merge pull request #3444 from nextcloud/recognize-bat-and-cmd 
Recognize .bat and .cmd files
 2017-02-13 18:09:12 -06:00
Morris Jobke
7f73ee0764
Add missing PHPDoc and properly throw exception 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-13 18:03:35 -06:00
Morris Jobke
200a28255e
Always enable avatars 
* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-13 17:53:33 -06:00
Lukas Reschke
5b9f96a434 Merge pull request #3324 from nextcloud/fix-2431 
LDAP's checkPassword should only catch when a user was not found, fixes #2431
 2017-02-13 23:21:08 +01:00
Lukas Reschke
181b298d7c Merge pull request #3448 from kuimovvg/master 
bug when connect to yandex webdav server
 2017-02-13 23:00:44 +01:00
Lukas Reschke
a422a59f99
Add storage to log item as well 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-02-13 22:49:44 +01:00
Morris Jobke
fa684c0ef0
Add comment about log.condition 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-13 15:32:57 -06:00
Robin Appelman
8c1ed7507a
Add option to enable locking debug logging 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-13 15:03:46 +01:00
Nextcloud bot
88047aaea7
[tx-robot] updated from transifex 2017-02-13 01:07:10 +00:00
Nextcloud bot
f9d94edb0f
[tx-robot] updated from transifex 2017-02-12 01:07:26 +00:00
Nextcloud bot
01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Morris Jobke
dfaaebd765 Merge pull request #3417 from nextcloud/push-notification 
Push notification
 2017-02-10 16:00:47 -06:00
Robin Appelman
f27113a6ee
also apply permissions mask in getMetaData 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-10 22:36:12 +01:00
Morris Jobke
abf0606054 Merge pull request #3430 from nextcloud/fix-ios-client-detection 
Fix detection of the new iOS app
 2017-02-10 14:24:45 -06:00
blizzz
b8f08f1585 Merge pull request #3443 from nextcloud/add-integration-tests-for-dav 
Add integration tests for legacy DAV endpoints
 2017-02-10 19:00:17 +01:00
Robin Appelman
5acebb911b
fix self test for non leading slash 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-10 18:04:59 +01:00
Robin Appelman
d9a6353bc1
Make the notify self test for subfolders more reliable 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-10 17:38:29 +01:00
vkuimov
71a022640b bug when connect to yandex webdav server 
server think that request like 
<?xml version="1.0" encoding="UTF-8"?> 
<d:propfind xmlns:d="DAV:">
<d:prop/> 
</d:propfind>

is 400: Bad Request
 2017-02-10 16:31:49 +00:00
Victor Dubiniuk
2585f195da
Check if color exists in palette before using it 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-02-10 16:27:51 +01:00
Brent Bloxam
f7b8a31d63 Update uuidAttributes list to include FreeIPA's ipauniqueid 
Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
 2017-02-10 10:23:13 -05:00
Lukas Reschke
929648ce2c
Add integration tests for legacy DAV endpoints 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-02-10 16:18:04 +01:00
blizzz
354bbd50a7 Merge pull request #3371 from m3ntalsp00n/reload_countdown 
showUpdate funciton allows updated messages
 2017-02-10 14:47:33 +01:00
Joas Schilling
ade91c8fe2
Recognize .bat and .cmd files 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-10 14:25:25 +01:00
Joas Schilling
69046c6662
Make sure invalid images don't flood the log file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-10 13:44:16 +01:00
Björn Schießle
b4ade76665 Merge pull request #3424 from nextcloud/fix-upgrade-path 
Fix return value of getAllowedPreviousVersions()
 2017-02-10 11:48:30 +01:00
Björn Schießle
4ea33fb453 Merge pull request #3425 from nextcloud/set-vendor-during-install 
Set vendor during install
 2017-02-10 11:45:50 +01:00
Björn Schießle
a88fc0c283 Merge pull request #3181 from nextcloud/fix-favorite-activity-mail 
Make sure the file information is available when sending the email
 2017-02-10 11:35:45 +01:00
Joas Schilling
dd5cded898 Merge pull request #3429 from nextcloud/oparoz-issuetemplate 
Fix issue template log formatting
 2017-02-10 10:30:01 +01:00
Joas Schilling
33fb86f68b
Fix detection of the new iOS app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-10 10:10:21 +01:00
Olivier Paroz
08ced5bc7c Fix log formatting 2017-02-10 09:08:05 +01:00
Morris Jobke
d548329543
Set vendor during install 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-09 23:37:00 -06:00
Morris Jobke
b8c749b903
Fix return value of getAllowedPreviousVersions() 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-09 23:24:24 -06:00
Morris Jobke
397feb9e8d Merge pull request #3422 from nextcloud/transifex 
add transifex config for sharebymail
 2017-02-09 20:14:10 -06:00
Morris Jobke
8a74ab88d8
add transifex config for sharebymail 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-09 19:53:32 -06:00
Nextcloud bot
c2e61362cc
[tx-robot] updated from transifex 2017-02-10 01:07:02 +00:00
Bjoern Schiessle
2ca8339d01
add groups to user info output 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-02-09 16:23:10 +01:00
Joas Schilling
efdc51c155
Make sure to use the right appdata directory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-09 15:03:00 +01:00
Joas Schilling
7c47f822a1
Save the used token id in the session so it can be used later on 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-09 15:02:59 +01:00
Robin Appelman
bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve 
Add a single public api for resolving a cloud id to a user and remote and back
 2017-02-09 14:54:32 +01:00
Robin Appelman
0d8d658b7e
fix copyright headers 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-09 13:32:36 +01:00
Robin Appelman
f6cd5200a2
clean cloud ids 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-09 13:31:06 +01:00
Lukas Reschke
4a5a3681d9 Merge pull request #3184 from nextcloud/issue-3165 
Prevent migration from ownCloud 11 to Nextcloud 12
 2017-02-09 13:29:08 +01:00
Joas Schilling
ed4633a552 Merge pull request #3408 from nextcloud/nullstorage-free-space 
return unknown free space from nullstorage
 2017-02-09 13:17:54 +01:00
Lukas Reschke
51f0555b5c Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation 
Don't log the password on confirmPassword when LDAP throws an exception
 2017-02-09 12:19:53 +01:00
Björn Schießle
f33760c7f1 Merge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table 
Update the email in the accounts table as well
 2017-02-09 12:10:45 +01:00
Joas Schilling
ac841ee002 Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name 
oc_token should be nc_token
 2017-02-09 10:07:59 +01:00
Morris Jobke
5e408aeb6c
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-08 20:39:34 -06:00
Nextcloud bot
3c4b539fdf
[tx-robot] updated from transifex 2017-02-09 01:07:10 +00:00
Robin Appelman
ad5d04ccbe
return unknown free space from nullstorage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 16:38:00 +01:00
Robin Appelman
ae66cf8d37
add tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:03 +01:00