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

3604 commits

Author SHA1 Message Date
Daniel Calviño Sánchez
b70b38ce31 Fix constructor spy in unit test with Sinon 4.1.3 
When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-12-08 21:26:45 +01:00
Nextcloud bot
ef2b0969dd
[tx-robot] updated from transifex 2017-12-08 01:10:13 +00:00
Morris Jobke
c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root 
delay calculating the shared cache root until it's used
 2017-12-06 15:14:48 +01:00
Nextcloud bot
9505c56447
[tx-robot] updated from transifex 2017-12-06 01:10:23 +00:00
Robin Appelman
c87d689253
delay calculating the shared cache root until it's used 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-12-04 15:16:39 +01:00
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
blizzz
f700cd14fa
Merge pull request #7222 from nextcloud/fix-filerow-avatars 
Fix filerow avatars
 2017-11-27 16:46:11 +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
Arthur Schiwon
5a9c99e6ac
recycle SharedFileInfo values in fileInfo 
fileInfo is composed of data from sharing, however additional data is
pulled when sidebar opens, e.g. the size. Then, existing data is
overwritten by data from the other source (files). The data points that
would be lost are not dirty however and still used, so we keep them.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 17:51:56 +01:00
Arthur Schiwon
077381c7b3
rip out obsolete recipientsDisplayName 
also needs tests adjustements, and this also brings in natural sorting

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:14 +01:00
Arthur Schiwon
9d95391ff1
adjust tests and apply sorting 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:13 +01:00
Arthur Schiwon
4247936dd6
Fix avatars in file rows of incoming shares 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:13 +01:00
Arthur Schiwon
dcfd7bf7ff
fix avatars in file rows of outgoing shares 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-23 13:32:09 +01:00
Morris Jobke
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root 
Use the correct root for shared jail when the source storage is also a jail
 2017-11-23 12:03:36 +01:00
William Pain
beac223fa6 Add HTML5 audio player in public view 
Signed-off-by: William Pain <pain.william@gmail.com>
 2017-11-22 16:07:17 +01:00
Nextcloud bot
6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Robin Appelman
56fd462718
Use the correct root for shared jail when the source storage is also a jail 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-11-10 17:03:27 +01:00
Nextcloud bot
ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Roeland Jago Douma
497cd7fa4e
Merge pull request #7064 from nextcloud/popover-fix 
Fix popover layout
 2017-11-08 12:47:58 +01:00
Nextcloud bot
79c9439c50
[tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
John Molakvoæ (skjnldsv)
b44581e15d
Fixed sharing popover and removed unused old code 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-11-07 18:20:59 +01:00
Nextcloud bot
f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke
31c5c2a592
Change @georgehrke's email 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 20:38:59 +01:00
Morris Jobke
0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +01:00
Nextcloud bot
7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
John Molakvoæ
3091ddb043
Merge pull request #6652 from nextcloud/sharing-link-menu 
Move sharing page options to menu in top right
 2017-11-02 17:41:01 +01:00
Jan-Christoph Borchardt
eebf19e2e6 Fix Scrutinizer issue 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-02 15:26:37 +01:00
Jan-Christoph Borchardt
4a3893b105
Merge pull request #6094 from nextcloud/sharedby-avatar 
Show avatar instead of username for shared files
 2017-11-02 14:51:17 +01:00
Arthur Schiwon
222d99fe96
adjust more js unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-02 13:51:08 +01:00
Roeland Jago Douma
c2e82148e5
Merge pull request #7030 from nextcloud/proper_og_image 
Use the new direct endpoint for the OpenGraph image
 2017-11-01 21:00:05 +01:00
Arthur Schiwon
e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Jan-Christoph Borchardt
84b8cb12be Clicking publicly shared image opens direct preview url 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 14:49:52 +01:00
Jan-Christoph Borchardt
18dff925be Directly show link 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 14:17:34 +01:00
Jan-Christoph Borchardt
bc47668206 Use standard way of showing and hiding popover menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 12:06:04 +01:00
Jan-Christoph Borchardt
b3ccaf815d Fix scrollbar showing up on public page 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 12:05:31 +01:00
Jan-Christoph Borchardt
116cb58c3c Show and hide menu via Javascript, thanks @skjnldsv 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt
f2fadf677c Adjust prominence of shared-by info to not overpower file name 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt
9f4cd52a97 Add label to download action 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt
40a3b01838 Fix display of Download entry text 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 11:52:58 +01:00
Jan-Christoph Borchardt
3d05540d36 Move shared page controls to menu in top right 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-01 11:52:58 +01:00
Joas Schilling
ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders 
Move server apps to dedicated autoloader
 2017-11-01 11:15:27 +01:00
Roeland Jago Douma
2e443c97af
Use the new direct endpoint for the og:image 
Some providers had issues when using the preview link (since it was
double encoded).

Now we actually serve the max size preview so it looks better

The image isn't cropped anymore so supporting platforms can just embed
the whole image.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-31 21:00:36 +01:00
Roeland Jago Douma
638be96232
Do not error when downloading from a numeric public subfolder 
Fixes #6820

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-30 21:06:35 +01:00
Morris Jobke
42a14ad4cd
Merge pull request #6976 from nextcloud/fix-checkbox-in-popover 
Fix checkboxes on popover
 2017-10-30 09:45:03 +01:00
Arthur Schiwon
20e7a0c07b
fix sharerecipientssorter tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 16:03:37 +02:00
John Molakvoæ (skjnldsv)
97638e76ad
Share views fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-26 18:12:29 +02:00
John Molakvoæ (skjnldsv)
419ddeacee
Fix checkboxes on popover 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-10-26 17:54:44 +02:00
Arthur Schiwon
7f58c41015
fix sorting 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-26 16:23:41 +02:00
Morris Jobke
c733cdaa65
Use ::class in test mocks of encryption app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 13:56:56 +02:00
Morris Jobke
06f46bd256 Merge pull request #6939 from nextcloud/class-usage-in-mocks-dav-app 
Use ::class in test mocks of dav app
 2017-10-26 13:26:00 +02:00