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

41450 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jan-Christoph Borchardt
446a3d2f21 Reverse favorite icon coloring in files action menu 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-10-30 18:17:59 +01:00
Roeland Jago Douma
73aef992c6
Merge pull request #6932 from nextcloud/constants-for-talk-useragents 
Define constants for the talk user agents
 2017-10-30 17:57:28 +01:00
Roeland Jago Douma
062aadba06
Merge pull request #6981 from nextcloud/unit-tests-for-6977 
Unit tests for #6977
 2017-10-30 17:53:02 +01:00
Daniel Calviño Sánchez
9df618131b Show favourite action as the first one in the file actions menu 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-10-30 17:09:15 +01:00
Morris Jobke
d18a60de39
Merge pull request #6992 from nextcloud/2-lines-for-better-code 
Use ::class and fix missing doc
 2017-10-30 16:18:28 +01:00
Arthur Schiwon
d5f1cef642
fix comment sorter 
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-30 15:59:43 +01:00
Arthur Schiwon
61db8615f4
preserve line breaks 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-30 11:10:04 +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
Nextcloud bot
5521937dc4
[tx-robot] updated from transifex 2017-10-30 01:08:34 +00:00
Johannes Schlichenmaier
bde78decc2 Extended list of sensitive configuration values 
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-29 23:46:59 +01:00
Nextcloud bot
267991b154
[tx-robot] updated from transifex 2017-10-29 00:08:31 +00:00
Arthur Schiwon
76c803f0af
add acceptance tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-28 23:57:35 +02:00
Joas Schilling
94f3fc63bc
Use ::class and fix missing doc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-28 11:49:36 +02:00
Nextcloud bot
84f3d247f2
[tx-robot] updated from transifex 2017-10-28 00:08:32 +00:00
Daniel Calviño Sánchez
1f19a45a88 Merge pull request #6869 from burned42/6307-fix_page_title_not_changed 
#6307 fix page title not changed
 2017-10-27 17:12:47 +02:00
Arthur Schiwon
20e7a0c07b
fix sharerecipientssorter tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 16:03:37 +02:00
Bernd Stellwag
844db3c891 bugfix: set/change page title when switching to file tags 
Signed-off-by: Bernd Stellwag <burned@zerties.org>
 2017-10-27 15:23:39 +02:00
Bernd Stellwag
3e3e4899fa bugfix: set/change page title when switching to filelist 
Signed-off-by: Bernd Stellwag <burned@zerties.org>
 2017-10-27 15:23:39 +02:00
Robin Appelman
3f0cb13042
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 14:35:34 +02:00
Arthur Schiwon
7b0868ddac
fix saving changes… 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 14:25:19 +02:00
Arthur Schiwon
158e161a27
add some whitespace around credential elements 
(…in a stupid way)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 14:25:19 +02:00
Arthur Schiwon
9a1f706ae4
fix creating an empty configuration 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 14:25:19 +02:00
Arthur Schiwon
5c05a9327c
add save button for setting LDAP Agent DN and Password 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 14:25:19 +02:00
Arthur Schiwon
52b1b97c58
Fix regression: undesired writes to the DB 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 14:25:19 +02:00
Arthur Schiwon
4eab39f133
LDAP: only write actually changes values to the DB 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 14:25:19 +02:00
Arthur Schiwon
4c1a5d6a88
first, remove the hack 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 14:25:19 +02:00
Arthur Schiwon
ca72c0150b
configurable amount of autocomplete results in comments 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 13:50:38 +02:00
Robin Appelman
f9a7294807
use fopen directly when reading objects from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 12:58:19 +02:00
Arthur Schiwon
bd951e926f
avatar css fixes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 12:34:24 +02:00
Morris Jobke
de912385e0
Fix seeking on object storage 
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-27 12:16:28 +02:00
Joas Schilling
8660b9f0af
Unit tests for #6977 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-27 11:46:56 +02:00
Joas Schilling
7a4c0c668b Merge pull request #6977 from Fiech/master 
Added additional methods for removal of sensitive info
 2017-10-27 11:46:31 +02:00
Johannes Schlichenmaier
4ae7275aeb Added additional methods for removal of sensitive info 
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-27 10:36:58 +02:00
Nextcloud bot
65621141fd
[tx-robot] updated from transifex 2017-10-27 00:08:29 +00:00
Arthur Schiwon
eace507043
apply our theming 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-27 00:32:47 +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
Morris Jobke
405bbc1c61
Improve mimetype detection for object storages 
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 16:31:59 +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
13087da3c6 Merge pull request #6973 from nextcloud/menu-highlight 
Add blue bar as highlight to active menu entry
 2017-10-26 16:09:02 +02:00
Morris Jobke
c25b694fca Merge pull request #6970 from nextcloud/class-usage-in-mocks-encryption-app 
Use ::class in test mocks of encryption app
 2017-10-26 16:02:01 +02:00
Arthur Schiwon
aa2fd30775
autocomplete on demand 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-26 15:25:24 +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
Roeland Jago Douma
a9f78856b5 Merge pull request #6949 from nextcloud/cachingrouter_local 
Use local cache for the CachingRouter
 2017-10-26 11:42:30 +02:00
Morris Jobke
3f107e59dd
Fix another warning 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 10:36:17 +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
Roeland Jago Douma
88cba6d882
Use local cache for the CachingRouter 
There is no need to cache routes distributed. It even has the downside
that the router might return different routes then the ones in the local
routes.php files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-25 19:23:46 +02:00
Morris Jobke
4cb4d03184
Merge branch 'mastix-master' 2017-10-25 18:34:23 +02:00