upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33
39369 commits 1035 branches 1221 tags 8.3 GiB
Commit graph

39369 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
3ca3edd994 Adjust the unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:28:13 -05:00
Joas Schilling
41f107fd37 Remove the colored corners 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:28:09 -05:00
Joas Schilling
c691b6d299 Add an event so apps can add hidden fields to the files page 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:28:03 -05:00
Joas Schilling
901eca84b0 Only set the active item when there is one (not the case for quota) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:27:59 -05:00
Joas Schilling
b1ddc57e08 Content will come from the external app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:27:55 -05:00
Joas Schilling
27b2102d6c Remove useless translation and make it better on unlimited 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:27:51 -05:00
Jan-Christoph Borchardt
fe8450fcc9 Style quota entry in files view 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-06-13 12:27:47 -05:00
Joas Schilling
f1da30cc1e Add quota to the files view 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-13 12:27:43 -05:00
Morris Jobke
4c56414cab Merge pull request #5365 from nextcloud/backport-5343 
[stable12] filter missing groups in share provider
 2017-06-13 08:04:59 -05:00
Joas Schilling
f6264ad6c4 Merge pull request #5303 from nextcloud/fix_5047-nc12 
[stable12] use the email address configured in Nextcloud as sender instead of the users email address
 2017-06-13 12:19:56 +02:00
Robin Appelman
86c749349e
filter missing groups in share provider 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-13 10:54:02 +02:00
Joas Schilling
bd444c4951 Merge pull request #5354 from nextcloud/backport-5315-stable12 
[stable12] execute eval in global scope, addresses #5314
 2017-06-13 10:41:36 +02:00
Joas Schilling
eb22d392d8 Merge pull request #5355 from nextcloud/stable12-5167 
[stable12] l10n improvements from transifex
 2017-06-13 10:20:26 +02:00
Morris Jobke
7db495a246 Merge pull request #5120 from nextcloud/backport-5118-use-language-of-recipient-not-admin 
[stable12] Use the language of the recipient not the actor
 2017-06-12 22:31:08 -05:00
Nextcloud bot
e0d8b17b20
[tx-robot] updated from transifex 2017-06-13 00:08:32 +00:00
Morris Jobke
a4cba7df69 Merge pull request #5272 from nextcloud/stable12-5271 
[stable12] Also use IMailer interface to generate the email template
 2017-06-12 17:51:07 -05:00
Morris Jobke
17bde8a79e Merge pull request #5353 from nextcloud/stable12-5344 
[stable12] Remove the char because it breaks the export from transifex
 2017-06-12 17:50:41 -05:00
rakekniven
e7e0d1b8a1 Update setupchecks.js 
Fixed typo and removed doclink symbol.
Reported at transifex

Update util.php

Another l10n improvement from transifex.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-12 17:18:20 -05:00
Arthur Schiwon
d02bcfda86
execute eval in global scope, addresses #5314 
unsure whether this is properly supported everywhere, injection is not an
option for us

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-12 23:37:20 +02:00
Lukas Reschke
86b4ebc457 Merge pull request #5352 from nextcloud/fix_running_only_dav_tests_stable12 
[stable12] add missing parent::setUp that broke any other dav app test
 2017-06-12 23:09:35 +02:00
Joas Schilling
9d98e5c49b Remove the char because it breaks the export from transifex 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-12 15:40:41 -05:00
Morris Jobke
0b5efcfaca Merge pull request #5324 from nextcloud/stable12-use-touch-icon-for-favicon-fb.png 
[stable12] Theme image for favicon-fb.png
 2017-06-12 15:28:42 -05:00
Lukas Reschke
d501b84c5a
Fix tests 
return is not defined

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-06-12 22:21:37 +02:00
Lukas Reschke
e475229204 Merge pull request #5320 from nextcloud/5122-stable12 
[stable12] Fix ldap integration tests
 2017-06-12 22:10:08 +02:00
Georg Ehrke
2cf8da830c
add missing parent::setUp that broke any other dav app test 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2017-06-12 20:34:18 +02:00
Nextcloud bot
acda3a2403
[tx-robot] updated from transifex 2017-06-12 00:08:21 +00:00
Nextcloud bot
ea39d4feec
[tx-robot] updated from transifex 2017-06-11 00:08:31 +00:00
Nextcloud bot
b11d197d52
[tx-robot] updated from transifex 2017-06-10 00:08:47 +00:00
Lukas Reschke
26fe83aad8
Theme image for favicon-fb.png 
Fixes https://github.com/nextcloud/server/issues/5322

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-06-09 21:13:56 +02:00
Arthur Schiwon
b1820fa170
Backport of #5122 to stable12 
add missing INotificationManager when creating User backend, LDAP
UserManager

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Make IDE happy

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

add convenience script to run all tests at once

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-09 16:30:56 +02:00
Morris Jobke
5722afc1d7 Merge pull request #5123 from patschi/patch-2 
[stable12] Backported Fix #5059
 2017-06-08 20:07:25 -05:00
Nextcloud bot
6434305333
[tx-robot] updated from transifex 2017-06-09 00:08:34 +00:00
Robin Appelman
11ff813c8c Merge pull request #5285 from nextcloud/personal-sessions-renamwe-12 
[12] reword sessions to security in personal settings
 2017-06-08 12:09:14 +02:00
Bjoern Schiessle
86646a24d5
use the email address configured in Nextcloud as sender instead of the users email address 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-08 11:49:10 +02:00
Nextcloud bot
d00c5886aa
[tx-robot] updated from transifex 2017-06-08 00:08:37 +00:00
Morris Jobke
e7b5ba8cef Merge pull request #5291 from nextcloud/stable12-5287 
[stable12] show input fields if they are not empty but disable them in global scale mode
 2017-06-07 16:27:50 -05:00
Bjoern Schiessle
6e765ccf39 unify look of disabled display name / email address and the other input fields 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-07 11:43:31 -05:00
Bjoern Schiessle
ee53a2ed42 show input fields if they are not empty but disable them in global scale mode 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-07 11:43:27 -05:00
Morris Jobke
3ba2d6179a Merge pull request #5278 from nextcloud/stable12-5277 
[stable12] Allow to change avatar when groups are disables
 2017-06-07 11:42:21 -05:00
Morris Jobke
d866547805 Allow to change avatar when groups are disables 
* password form overlaps upload button and doesn't allow to click it
* regression from #5259

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

make sure that we always clear all floating rules after the user settings parts

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-06-07 11:30:56 -05:00
Morris Jobke
d08a6c74ab Merge pull request #5186 from nextcloud/backport-5126-email-change-spam 
[stable12] Don't trigger activity when the email didn't change
 2017-06-07 11:14:00 -05:00
Robin Appelman
4972f9409a
reword sessions to security in personal settings 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-06-07 14:36:47 +02:00
Nextcloud bot
85418640b3
[tx-robot] updated from transifex 2017-06-07 00:09:14 +00:00
Morris Jobke
952caf8f85 Also use IMailer interface to generate the email template 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-06 10:48:53 -05:00
Björn Schießle
f29d53f509 Merge pull request #5270 from nextcloud/stable12-5223 
[stable12] Don't allow the user to set fields they can't see
 2017-06-06 16:58:16 +02:00
Morris Jobke
3cacc05217 Merge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12 
[stable12] allow admin to disable groups on personal page
 2017-06-06 08:53:55 -05:00
Joas Schilling
b39dfe8eda adjust the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 08:11:35 -05:00
Joas Schilling
a62b292dc5 Also cover the settings endpoint 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 08:11:31 -05:00
Joas Schilling
ce34db22d7 Don't allow the user to set fields they can't see 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-06 08:11:28 -05:00
Morris Jobke
477f4965ca Merge pull request #5266 from nextcloud/backport-5166-combine-apptokens-and-sessions 
[stable12] combine apptokens and sessions
 2017-06-06 08:03:04 -05:00