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

3639 commits

Author SHA1 Message Date
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
Morris Jobke
ab36980d20
Use ::class in test mocks of dav app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 10:16:12 +02:00
Nextcloud bot
37bedbc10d
[tx-robot] updated from transifex 2017-10-26 00:08:39 +00:00
Sascha Sambale
30460b52df
Updated OpenGraph title to display folder name instead of a nextcloud standard text 
When sharing a folder via Facebook, WhatsApp or any other platform that makes use of OpenGraph, the display title was "Nextcloud - a safe home for all your data" and the description was the actual name of the folder. This should not be the case, so the display title has been changed to display the folder name and the description now displays the former OpenGraph title.

Signed-off-by: Sascha Sambale <mastixmc@gmail.com>

Fixing whitespaces and empty line.
 2017-10-25 18:33:27 +02:00
Roeland Jago Douma
b9e8c8943e
Use new-password as autocomplete on share auth page 
Fixes #6821

This makes sure that (supported) browsers will not prefill the password
field if a user has a password saved for that nextcloud.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-25 08:23:42 +02:00
Roeland Jago Douma
436966372e
Files_Sharing Autoloader 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 20:40:12 +02:00
Morris Jobke
43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +02:00
Morris Jobke
3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage 
Use appmanager instead of OC_App for check for enabled app
 2017-10-24 13:53:17 +02:00
Nextcloud bot
1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke
f884e762bc
Use appmanager instead of OC_App for check for enabled app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:31:17 +02:00
Arthur Schiwon
8722458d2a
ensure that sorting is stable 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:37 +02:00
Arthur Schiwon
fd6daf8d19
AutoCompletion backend 
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:32 +02:00
Lukas Reschke
f6f7b50cf0 Merge pull request #6853 from nextcloud/apps_autoloader 
Allow apps to have their own autoloader
 2017-10-19 11:05:23 +02:00
Nextcloud bot
07b6e234bd
[tx-robot] updated from transifex 2017-10-19 00:08:27 +00:00
Roeland Jago Douma
f51eccf34a
Move files_sharing to a proper classmap 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-17 21:35:51 +02:00
Nextcloud bot
d251623b01
[tx-robot] updated from transifex 2017-10-14 02:29:04 +00:00
Nextcloud bot
564d1b1789
[tx-robot] updated from transifex 2017-10-10 00:08:31 +00:00
Nextcloud bot
457ac66eb9
[tx-robot] updated from transifex 2017-10-05 00:08:23 +00:00
blizzz
2d62f97f1b Merge pull request #6328 from nextcloud/split-sharees-api-logic 
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
 2017-10-04 15:43:44 +02:00
Nextcloud bot
8be053516b
[tx-robot] updated from transifex 2017-09-30 00:08:25 +00:00
Nextcloud bot
e5d39e63d1
[tx-robot] updated from transifex 2017-09-28 00:08:36 +00:00
Morris Jobke
5f25dd7095 Merge pull request #6599 from nextcloud/fix_2523 
Add direct preview link
 2017-09-27 23:27:54 +02:00
Arthur Schiwon
c43685e6fc
shareeAPIController unit test clean up and last fixes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
f2c8e1ed2f
remove unused method 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
a7a651f4a4
move splitUserRemote unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
3888b3a285
adapt unit test for ensuring exception 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
a28b1d91f9
split off former searchSharee unit test 
also moves registering default plugins to Server for proper unit testing

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
4a315ede81
adjust ShareeAPIController invalid-input search unit test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
38ff7eaece
adjust ShareeAPIController search test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
3d1d03a511
split off getEmail tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
c92f7ee767
split off getRemote unit tests 
adds two small fixes → they actually work \o/

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
b35760de27
split off getGroups unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
dd9e191d37
split off getUsers unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
c55583d1b4
allow more than one plugin per share type 
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
4a96e22258
don't keep result types hard coded 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
ea3ac4e656
Splits off the logic from sharees endpoint thus making it available from 
within Nc/via PHP.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:17 +02:00
Nextcloud bot
ef3e8faea2
[tx-robot] updated from transifex 2017-09-26 00:08:26 +00:00
Roeland Jago Douma
4077f684e1
Only have direct preview urls for image files 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 21:47:09 +02:00
Roeland Jago Douma
05c37526a7
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 21:44:42 +02:00
John Molakvoæ
9080976975 Merge pull request #6372 from nextcloud/scss-normalization 
Scss normalization
 2017-09-25 16:50:30 +02:00
Roeland Jago Douma
c3491e3f14
Add annotation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:50 +02:00
Roeland Jago Douma
894958e3e2
For images we have a preview for use the preview link 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:50 +02:00
Roeland Jago Douma
7d8c5f73f5
Add direct preview link to single shared image files 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:50 +02:00
Nextcloud bot
199c4b2ff9
[tx-robot] updated from transifex 2017-09-25 00:08:01 +00:00
John Molakvoæ (skjnldsv)
d169e3fd59
Removed unused filter for opacity, fix #6408 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-23 18:18:14 +02:00
Morris Jobke
7eba0a2720
Fix comment 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-21 20:10:36 +02:00
Nextcloud bot
4d556a3ade
[tx-robot] updated from transifex 2017-09-21 00:08:26 +00:00
Joas Schilling
e43400eddb Merge pull request #5562 from nextcloud/link-password-style 
Fix style of link share password input view
 2017-09-20 11:30:31 +02:00
John Molakvoæ (skjnldsv)
4faa562403
Fix browser width compatibility 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-19 18:19:47 +02:00
Jan-Christoph Borchardt
23a08c501a
Move link share password box and button together 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-17 21:02:49 +02:00
Jan-Christoph Borchardt
3ea819e261
Add box around link share password box, fix #5560 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-17 21:02:48 +02:00
Nextcloud bot
cdb6b0295a
[tx-robot] updated from transifex 2017-09-17 00:08:25 +00:00
blizzz
2060ff591b Merge pull request #6120 from nextcloud/public_upload_share_api_fix 
Public upload share permission handling
 2017-09-04 12:43:02 +02:00
Morris Jobke
d5cba5eeaa Merge pull request #6221 from nextcloud/fav_share_api_fix 
Correctly format OCS response with favorites
 2017-09-04 08:46:09 +02:00
Nextcloud bot
1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Roeland Jago Douma
eea7de4c9f
Correctly format OCS response with favorites 
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-29 12:03:13 +02:00
Nextcloud bot
daf2d6cb96
[tx-robot] updated from transifex 2017-08-29 00:08:27 +00:00
Roeland Jago Douma
85d5a71258 Merge pull request #6182 from nextcloud/fixes-in-files-drop-js 
Fixes in files_drop.js
 2017-08-26 17:58:30 +02:00
Jan-Christoph Borchardt
d0d6a92054 Fix sorting of entries in Files sidebar 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-08-25 18:40:28 +02:00
Nextcloud bot
7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00
Nextcloud bot
a7f2dc6dd6
[tx-robot] updated from transifex 2017-08-24 00:08:50 +00:00
Nextcloud bot
ae0789ef43
[tx-robot] updated from transifex 2017-08-22 00:08:20 +00:00
Nextcloud bot
8c458de4c2
[tx-robot] updated from transifex 2017-08-20 00:08:15 +00:00
Daniel Calviño Sánchez
4d003c812d Do not iterate over the files 
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-18 15:18:20 +02:00
Daniel Calviño Sánchez
313b824dd7 Replace fileName variable with data.files[0].name 
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.

This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-18 15:14:32 +02:00
Daniel Calviño Sánchez
c70688e5d0 Update the whole file item instead of only its contents 
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template,  so the resulting
HTML contained a "<li>" element nested in another "<li>" element.

However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".

Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-08-18 14:26:15 +02:00