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

40828 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobia De Koninck
92c238e0f0
Privacy enhancements for contacts menu 
- Groups, which are excluded from sharing should not see local users at all
 - If sharing is restricted to users own groups, he should only see contacts from his groups:

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
 2017-09-15 14:31:39 +02:00
Bjoern Schiessle
90d7693997
allow apps to disable versions for some files 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-09-15 12:14:31 +02:00
Björn Schießle
8500e11457 Merge pull request #6503 from nextcloud/allow-apps-to-control-trash-bin 
allow apps to control the trash bin
 2017-09-15 11:46:43 +02:00
Bjoern Schiessle
6e69881512
allow apps to control the trash bin 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-09-15 11:32:45 +02:00
Nextcloud bot
113fd47f30
[tx-robot] updated from transifex 2017-09-15 00:08:08 +00:00
Jan-Christoph Borchardt
42ac9cde08 Correctly ellipsize file names, fix #6498 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-14 16:43:24 +02:00
Jan-Christoph Borchardt
06691611e3 Ellipsize sharer name, ref #6498 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-09-14 16:38:31 +02:00
Morris Jobke
db3289bc94 Merge pull request #6066 from nextcloud/drone_php72_mysql 
Add 7.2 jobs for mysql & mysqlmb4
 2017-09-14 16:32:27 +02:00
Roeland Jago Douma
be0ecce9bc
Add 7.2 jobs for mysql & mysqlmb4 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-14 15:40:23 +02:00
John Molakvoæ
fc5528fda3 Merge pull request #6497 from nextcloud/fix-loading-icon-size 
Fix loading icon size
 2017-09-14 15:29:10 +02:00
Morris Jobke
ecd728c3b2 Merge pull request #6499 from nextcloud/fix-files-sidebar 
Allow to close sidebar for text files
 2017-09-14 14:18:36 +02:00
Morris Jobke
545e9bc26b Merge pull request #6495 from nextcloud/fix-webroot-throw-for-subdirectory-nc-installs 
Fix webroot throw
 2017-09-14 13:29:57 +02:00
Arthur Schiwon
0b625069e8
adapted integration tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
5e74affea4
fix counting found results in search op 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
fc097a80f5
improve and extend paging integration test 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
34f9590169
replace hard-coded attribute with the corresponding settings option 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Arthur Schiwon
89f4e16cdb
fix limit-flaw in search on paged results 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-14 13:20:51 +02:00
Morris Jobke
2d4026357f
Allow to close sidebar for text files 
* the close button was overlapped by the text preview and you could not close the sidebar then

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-14 11:30:54 +02:00
John Molakvoæ (skjnldsv)
4e909115be
Fix loading icon size 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-14 11:07:51 +02:00
John Molakvoæ (skjnldsv)
1a0ac912b2
Fix webroot throw 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-14 08:41:10 +02:00
Nextcloud bot
7698781a1e
[tx-robot] updated from transifex 2017-09-14 00:08:12 +00:00
Morris Jobke
c5dbe1c772 Merge pull request #6483 from nextcloud/fix_quota_new_endpoint 
Fix quota calculation on new dav upload endpoint
 2017-09-14 00:37:55 +02:00
Morris Jobke
883574974d Merge pull request #6458 from nextcloud/rethrow-correct-exception 
Rethrow the correct exception when there was an error in an app conta…
 2017-09-14 00:32:13 +02:00
Morris Jobke
ba2e1c5db9 Merge pull request #5689 from nextcloud/fix-4117 
LDAP: simplify returning the homePath and fixing #4117
 2017-09-14 00:23:01 +02:00
Lukas Reschke
8ef4fcb4b7 Merge pull request #6452 from lukanetconsult/hotfix/issue-6415-undefined-variable 
Fix undefined variable $tmpRoot
 2017-09-13 22:42:42 +02:00
Roeland Jago Douma
ab63c89ab3
Fix quota calculation on new dav upload endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-13 19:28:38 +02:00
Morris Jobke
d659199ff5 Merge pull request #5398 from nextcloud/theming-page-title 
Fallback to "getTitle" / "getEntity" of filesystem theme in theming app
 2017-09-13 13:08:37 +02:00
Joachim Bauch
91598cbfb5
Use theme methods "getTitle" and "getEntity" as fallback if name is not themed. 
This fixes an issue with custom filesystem themes that can define title, name
and entity differently, but the theming app was only using the name as fallback
(see #5374).

Signed-off-by: Joachim Bauch <bauch@struktur.de>
 2017-09-13 11:02:45 +02:00
Morris Jobke
241579587a Merge pull request #6457 from nextcloud/theming-favicon-invert-apps 
Invert themed favicons on bright colors
 2017-09-13 10:48:33 +02:00
Nextcloud bot
5ce3c7003b
[tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Lukas Reschke
7052aaf271 Merge pull request #6473 from nextcloud/2fa_apppasword_auth 
Fix AppPassword 2FA auth
 2017-09-12 23:02:14 +02:00
Roeland Jago Douma
9163cf9241
Fix AppPassword 2FA auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-12 22:28:43 +02:00
Morris Jobke
83508d7be3 Merge pull request #6451 from nextcloud/theming-manifest-json 
Theming app support for chrome manifest.json file
 2017-09-12 15:10:08 +02:00
Axel Helmert
01d4967130 Fix undefined variable $tmpRoot 
Refactoring of webroot detection left an unused variable.

Fixes: #6415
Signed-off-by: Axel Helmert <info@luka.de>
 2017-09-12 12:14:27 +02:00
Joas Schilling
c4b3198ac2
Rethrow the correct exception when there was an error in an app container 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-12 11:54:13 +02:00
Julius Härtl
9a47b25f19
Theming: Invert app icon in favicon for bright backgrounds 
fixes #5650

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 11:37:25 +02:00
Julius Härtl
1f8a3e05c1
Theming: Use png32 for generated icons 
fixes #4796

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 11:34:21 +02:00
Julius Härtl
81ef116bfb
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:47:38 +02:00
Julius Härtl
8391ca8792
Use IAppManager instead of private API 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:28:22 +02:00
Julius Härtl
699c64c750
Add manifest.json to the login page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-09-12 09:23:13 +02:00
Julius Härtl
770aae42f6
Add themed manifest.json to theming app 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:23:12 +02:00
Julius Härtl
b49ab065b7
Move theming related imagePath logic to ThemingDefaults 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-09-12 09:22:57 +02:00
John Molakvoæ
ff27308b88 Merge pull request #6448 from weizenspreu/master 
print generated encryption key passwords directly after generating th…
 2017-09-12 05:16:30 +02:00
Nextcloud bot
c124a43d74
[tx-robot] updated from transifex 2017-09-12 00:08:25 +00:00
Lukas Reschke
038ae39f13 Merge pull request #6439 from nextcloud/fix-5960-sort-apps-ignore-level 
Sort apps by enabled/disabled but not by official/in-appstore in App Management
 2017-09-11 22:17:21 +02:00
Lukas Reschke
88731848c6 Merge pull request #6435 from nextcloud/add-exception-to-phpdoc 
Add exceptions to PHPDoc of interface
 2017-09-11 13:01:41 +02:00
Kenneth Newwood
7092c50e7c print generated encryption key passwords directly after generating the keys so that errors during the encryption do not lead to a potentially massive data loss 
Signed-off-by: Kenneth Newwood <kenneth@newwood.name>
 2017-09-11 12:52:25 +02:00
Roeland Jago Douma
316c7e18bc Merge pull request #6430 from nextcloud/php72-rc1 
Bump 7.2 container to RC1
 2017-09-11 12:36:33 +02:00
Lukas Reschke
0186d8405c Merge pull request #6433 from william-p/Fix_uninitialized_params 
Fix uninitialized variable $this->params
 2017-09-11 11:54:15 +02:00
Joas Schilling
f5617d78eb Merge pull request #6369 from nextcloud/fix-6211-missing-translation-of-comment-activity-in-email 
Allow translations of the comments activity in the emails too
 2017-09-11 10:52:45 +02:00