Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-08-29 05:55:50 +02:00
Code Issues Actions 28 Packages Projects Releases Wiki Activity
72,179 Commits 422 Branches 1,023 Tags 5.4 GiB
b8fbd7721d
Commit Graph

39 Commits

Author SHA1 Message Date
Joas Schilling
aa5f037af7
chore: apply changes from Nextcloud coding standards 1.1.1 
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
 2023-11-23 10:36:13 +01:00
Joas Schilling
0f7146c652
Move encrypt-all password email to EmailTemplate 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2023-03-08 12:15:18 +01:00
Carl Schwan
458c2fa297
Remove OCP\App and OCP\BackgroundJob 
Both deprecated since NC 23

IAppManager is the replacement for OCP\App unfortunately it can't be
dependency injected in classes used by the installed otherwise the
database connection is initialised too early

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-08-01 09:46:40 +02:00
Valdnet
5ec2b0e425
l10n: Change to "administration" 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-12-13 13:59:34 +01:00
Valdnet
dfadf17074
l10n: Change to "administration" 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-12-13 13:58:30 +01:00
Valdnet
e0ebd6ca18
l10n: Correct spelling 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-12-13 10:22:40 +01:00
Valdnet
3d404c9c83
l10n: Correct spelling 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-12-13 10:19:04 +01:00
Valdnet
2349df4ca5
l10n: Replace the apostrophe with double quotation 
Signed-off-by: Valdnet <47037905+Valdnet@users.noreply.github.com>
 2021-05-06 14:55:35 +02:00
Christoph Wurst
d9015a8c94
Format code to a single space around binary operators 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-10-05 20:25:24 +02:00
Christoph Wurst
caff1023ea
Format control structures, classes, methods and function 
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-10 14:19:56 +02:00
Christoph Wurst
44577e4345
Remove trailing and in between spaces 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:07:47 +02:00
Christoph Wurst
42625a46be
Remove spaces after method or function call 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-09 16:05:56 +02:00
Christoph Wurst
b80ebc9674
Use the short array syntax, everywhere 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-03-26 16:34:56 +01:00
John Molakvoæ (skjnldsv)
a8dafc2ff8
Remove conflicting multiselect 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-11-15 14:08:13 +01:00
Arthur Schiwon
c46006934c
fix alignment of radio button and its label in encryption settings 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-07-07 16:59:28 +02:00
Bjoern Schiessle
5f75468aa4
improve status messages 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +02:00
Morris Jobke
d6e7cee607
Fix icons in sidebar on personal page 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-04-27 17:58:41 -03:00
Vincent Petry
b92085f2c7
Fix recovery checkbox label to properly point 2017-04-26 13:29:42 +02:00
Jan-Christoph Borchardt
9a75714c22
rename confusing getMailHeaderColor to getColorPrimary, ref #3491 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-29 18:23:23 +02:00
Matthew Setter
d7c9e2b841
Updated UI messages relating to the encryption functionality 
The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:

- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones

They were also missing full-stops to end the them.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 18:06:55 -06:00
Felix Epp
6aa79cacfd Fix mail header logo [fixes #1326] 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2016-11-30 01:06:47 +01:00
Roeland Jago Douma
740659a04c
Move away from OC_L10N 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-28 21:46:28 +02:00
Arthur Schiwon
4946cc220d
for new we cannot have nested settings, default module is only appended if available 2016-08-16 18:26:16 +02:00
Joas Schilling
352e8b3c79
More casing 2016-08-08 16:45:40 +02:00
Morris Jobke
e7e0dc608b
fix strings 2016-06-20 13:13:37 +02:00
Bjoern Schiessle
b6050b44c2 disable the recovery key if the master key is enabled 2016-03-03 12:16:39 +01:00
Bjoern Schiessle
5fad45b230 make encryption configurable for home storage 2015-10-27 14:24:20 +01:00
Bjoern Schiessle
8c08dd0ac2 occ tool to encrypt all files 2015-08-26 14:58:22 +02:00
Christian Hoffmann
6441721626 Grammar, removal of line break 
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
 2015-05-09 11:31:21 +02:00
Bjoern Schiessle
4a450c9d0d improved admin settings 2015-05-08 11:41:38 +02:00
Morris Jobke
12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page 
Display the module settings in the list of the encryption modules
 2015-05-07 10:44:03 +02:00
Joas Schilling
eadc2c330c Display the module settings in the list of the encryption modules 2015-05-04 15:04:03 +02:00
Bjoern Schiessle
f76c055244 some small ux improvements 2015-05-04 11:55:06 +02:00
Thomas Müller
8cf9b423d5 cleanup 2015-04-07 13:30:30 +02:00
Bjoern Schiessle
e4895bda01 add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files 2015-04-07 13:30:29 +02:00
Thomas Müller
bd933b1c85 Adding app icon and fixing admin setting 2015-04-07 13:30:29 +02:00
Thomas Müller
00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
a85e2e0bfd make recovery settings work 2015-04-07 13:30:28 +02:00
Bjoern Schiessle
bd99042a66 add setting templates 2015-04-07 13:30:28 +02:00