Commit Graph

774 Commits

Author SHA1 Message Date
Nextcloud bot 6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Nextcloud bot 79c9439c50
[tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00: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 81ac1ec977
[tx-robot] updated from transifex 2017-11-06 01:09:07 +00:00
Nextcloud bot 7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00: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
Nextcloud bot cc83052ca7
[tx-robot] updated from transifex 2017-11-01 01:08:44 +00:00
Nextcloud bot 84f3d247f2
[tx-robot] updated from transifex 2017-10-28 00:08:32 +00: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
Roeland Jago Douma fc1032f4bc
Encryption 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 b1f77aca4e Merge pull request #6919 from nextcloud/di-appmanager-encryption-migration
Use DI for IAppManager to encryption migration
2017-10-24 16:33:03 +02:00
Björn Schießle 306d4e1d40 Merge pull request #6922 from nextcloud/unneeded-isEnabled-check
Remove unneeded check if app is enabled
2017-10-24 15:59:13 +02:00
Morris Jobke 99934134dc
Use DI for IAppManager to encryption migration
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 15:52:00 +02:00
Nextcloud bot 1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke 5987099d2a
Remove unneeded check if app is enabled
App code will not be executable if the app is not enabled, because the autoloader refuses to load that class.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 23:47:06 +02:00
Nextcloud bot 4c54ca571d
[tx-robot] updated from transifex 2017-10-06 00:08:30 +00:00
Nextcloud bot 95ec247d10
[tx-robot] updated from transifex 2017-09-29 00:08:21 +00:00
Nextcloud bot 4d556a3ade
[tx-robot] updated from transifex 2017-09-21 00:08:26 +00:00
Nextcloud bot d603d78630
[tx-robot] updated from transifex 2017-09-19 00:08:27 +00: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
Nextcloud bot 1e24fe858a
[tx-robot] updated from transifex 2017-08-30 00:08:26 +00:00
Nextcloud bot 231cffffb9
[tx-robot] updated from transifex 2017-08-18 00:08:15 +00:00
Nextcloud bot 0ceb06fde5
[tx-robot] updated from transifex 2017-08-17 00:08:14 +00:00
Nextcloud bot a2e3c8ede5
[tx-robot] updated from transifex 2017-08-12 00:08:18 +00:00
Nextcloud bot 8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Nextcloud bot 481002a00b
[tx-robot] updated from transifex 2017-08-08 00:08:10 +00:00
Joas Schilling 0ebdf871e0 Fix comparisons in encryption app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:54:07 +02:00
Nextcloud bot 456392e627
[tx-robot] updated from transifex 2017-08-01 00:08:26 +00:00
Nextcloud bot 98b664a000
[tx-robot] updated from transifex 2017-07-30 00:08:03 +00:00
Nextcloud bot 11e182fff2
[tx-robot] updated from transifex 2017-07-25 00:08:02 +00:00
Nextcloud bot d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot 46332b0d8e
[tx-robot] updated from transifex 2017-07-23 00:07:58 +00:00
Bjoern Schiessle 473824fa06
make sure that we always have a owner
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:17 +02:00
Bjoern Schiessle 20a6b22db6
Add recovery key on public upload
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-20 11:40:14 +02:00
Nextcloud bot 125767265d
[tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Nextcloud bot a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Nextcloud bot 261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot 13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Morris Jobke c7b28064e3 Merge pull request #5649 from nextcloud/fix-5611
fix alignment of radio button and its label in encryption settings
2017-07-10 09:26:05 +02:00
Nextcloud bot 4f7fafb5c5
[tx-robot] updated from transifex 2017-07-10 00:08:41 +00:00
Nextcloud bot cf8db31bce
[tx-robot] updated from transifex 2017-07-09 00:08:31 +00:00
Nextcloud bot f59062ce83
[tx-robot] updated from transifex 2017-07-08 00:08:27 +00: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 001a9c02dd
adjust encryption tests to the new master key default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
Bjoern Schiessle d668e17769
since the default for the master key changed we need to write the setting explicitely to the database if we migrate from a older version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 66debbe18e
add occ command to disable the master key again
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 5f75468aa4
improve status messages
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:11 +02:00
Bjoern Schiessle 28a7e72868
after the master key was loaded we are ready to go, no re-login needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:10 +02:00
Bjoern Schiessle da51ec38f4
only collect detailed access list if it is really needed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:08 +02:00
Bjoern Schiessle 9c5ba2f12c
make master key the new default
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:33:03 +02:00
Nextcloud bot 1cbb7a18d8
[tx-robot] updated from transifex 2017-07-05 00:08:26 +00:00
Arthur Schiwon 793de6a8d0
move encryption to security (and behind two factor things)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-27 12:21:18 +02:00
Arthur Schiwon da53162656
We're on 13 now…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-26 11:03:41 +02:00
Arthur Schiwon 39ca06e6b9
fix setting up encryption section
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 13:38:33 +02:00
Arthur Schiwon b7ce492c59
adapt encryption
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Nextcloud bot 26d6c4a64a
[tx-robot] updated from transifex 2017-06-17 00:08:26 +00:00
Nextcloud bot 628284a34c
[tx-robot] updated from transifex 2017-06-09 00:08:24 +00:00
Nextcloud bot a74901fce1
[tx-robot] updated from transifex 2017-06-08 00:08:26 +00:00
Nextcloud bot a3c5d43cd5
[tx-robot] updated from transifex 2017-06-07 00:09:00 +00:00
Nextcloud bot f03d6f225e
[tx-robot] updated from transifex 2017-06-04 00:08:29 +00:00
Nextcloud bot c70de161cf
[tx-robot] updated from transifex 2017-06-02 00:08:30 +00:00
Nextcloud bot 4be17dff0f
[tx-robot] updated from transifex 2017-05-29 00:08:33 +00:00
Nextcloud bot 4f2b26d246
[tx-robot] updated from transifex 2017-05-28 00:08:14 +00:00
Nextcloud bot a46d2f1d39
[tx-robot] updated from transifex 2017-05-25 00:08:04 +00:00
Nextcloud bot 6cc26efbc5
[tx-robot] updated from transifex 2017-05-24 00:08:22 +00:00
Joas Schilling 3ec9d91bd0
Split multi-author entries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
Joas Schilling bc8fbc1a67
Bump app versions as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
Joas Schilling fdfe8f7f15
Adjust version requirement
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
Nextcloud bot 241226c23c
[tx-robot] updated from transifex 2017-05-11 00:08:08 +00:00
Nextcloud bot 43275b1000
[tx-robot] updated from transifex 2017-05-09 04:32:51 +00:00
Nextcloud bot 6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot 2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Nextcloud bot c4673224d1
[tx-robot] updated from transifex 2017-04-29 00:07:17 +00: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
Nextcloud bot e5fe41e16b
[tx-robot] updated from transifex 2017-04-26 00:07:43 +00:00
Nextcloud bot adf316c3af
[tx-robot] updated from transifex 2017-04-20 00:07:36 +00:00
Nextcloud bot c40b7acb09
[tx-robot] updated from transifex 2017-04-18 20:47:45 +00:00
Nextcloud bot df2235c71f
[tx-robot] updated from transifex 2017-04-17 00:07:33 +00:00
Nextcloud bot dafa9c740a
[tx-robot] updated from transifex 2017-04-15 00:07:36 +00:00
Nextcloud bot 0f96d5a641
[tx-robot] updated from transifex 2017-04-14 00:07:36 +00:00
Björn Schießle 49d8716eaa Merge pull request #4312 from nextcloud/cleanup-name
Update comments to Nextcloud
2017-04-12 10:54:20 +02:00
Morris Jobke 1729e4471f
Update comments to Nextcloud
* based on PR by @Ardinis
* see #4311

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 23:16:27 -05:00
Nextcloud bot 633b952358
[tx-robot] updated from transifex 2017-04-12 00:07:44 +00:00
Nextcloud bot 4d90b0520e
[tx-robot] updated from transifex 2017-04-11 00:07:29 +00:00
Nextcloud bot 4b0f50c456
[tx-robot] updated from transifex 2017-04-08 00:07:45 +00:00
Nextcloud bot 7d9688c89e
[tx-robot] updated from transifex 2017-04-06 00:07:50 +00:00
Nextcloud bot 84035862f7
[tx-robot] updated from transifex 2017-04-05 00:08:20 +00:00
Roeland Jago Douma da178db98e Merge pull request #4030 from nextcloud/masterkey-publiclink-nc12
Make public links work with master key
2017-04-04 11:46:13 +02:00
Nextcloud bot ec5377306d
[tx-robot] updated from transifex 2017-04-04 00:07:46 +00:00
Nextcloud bot d56f6399eb
[tx-robot] updated from transifex 2017-04-03 00:08:20 +00:00
Nextcloud bot 0056211672
[tx-robot] updated from transifex 2017-04-02 00:07:48 +00:00
Nextcloud bot 9098042c95
[tx-robot] updated from transifex 2017-04-01 00:08:09 +00:00
Nextcloud bot 6a6300b1f2
[tx-robot] updated from transifex 2017-03-31 00:08:35 +00: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
Nextcloud bot 6309b9ec1d
[tx-robot] updated from transifex 2017-03-28 00:07:53 +00:00
Nextcloud bot 0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Nextcloud bot 4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Vincent Petry 6b9ef15803
Use master key for public links as well 2017-03-24 14:55:42 +01:00
Vincent Petry 305718370a
Add tests for null user 2017-03-24 14:55:33 +01:00
Vincent Petry 43c081bdc9
Fix public link for master key
In public link mode there is no session, so the code should use the
public key instead.
2017-03-24 14:55:12 +01:00
Nextcloud bot e18d928d9b
[tx-robot] updated from transifex 2017-03-24 01:08:00 +00: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
Nextcloud bot cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Nextcloud bot 5683365a2c
[tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Björn Schießle 5a998da206 Merge pull request #3841 from nextcloud/encyryption-trash-bin
Delete files on encryption error
2017-03-15 09:07:07 +01:00
Nextcloud bot 4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Bjoern Schiessle 9ce32d9941
always throw a encryption exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-14 12:11:28 +01:00
Nextcloud bot 8d91c84ec4
[tx-robot] updated from transifex 2017-03-14 01:07:46 +00:00
Nextcloud bot 53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot f3a7b7eaa3
[tx-robot] updated from transifex 2017-02-27 01:19:49 +00:00
Nextcloud bot 7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Nextcloud bot 01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
Nextcloud bot 1aba2d9ed8
[tx-robot] updated from transifex 2017-02-08 01:07:09 +00:00
Nextcloud bot e4a74568e6
[tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
Nextcloud bot b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Morris Jobke 5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store
Login credential store
2017-01-30 19:30:04 -06:00
Nextcloud bot bbcb1dd2e0
[tx-robot] updated from transifex 2017-01-30 01:07:14 +00:00
Morris Jobke 6fe3cfa1e3 Merge pull request #3244 from nextcloud/settings-icon
Settings icon for LDAP and encryption
2017-01-25 18:43:21 -06:00
Nextcloud bot c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke f9c3639607
add icon for encryption settings on personal page
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-24 12:59:36 -06:00
Nextcloud bot 012e521239
[tx-robot] updated from transifex 2017-01-22 01:07:52 +00:00
Christoph Wurst 3ee5c7ea4e
minor version bump
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-17 09:17:56 +01:00
Nextcloud bot 203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Morris Jobke 622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements
create new encryption keys on password reset and backup the old one
2017-01-13 11:28:43 +01:00
Christoph Wurst 140555b786
always allow remembered login
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-01-11 19:20:11 +01:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
Bjoern Schiessle fcda3a20f4
create new encryption keys on password reset and backup the old one
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-10 17:04:32 +01:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Nextcloud bot d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Nextcloud bot 2e0cf21f7f
[tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Nextcloud bot 0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot 52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Nextcloud bot f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Joas Schilling edec1fafe7
Update app versions and requirements
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-13 20:41:55 +01: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
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Bjoern Schiessle 8a401ee156
check if session is initialized
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 12:20:43 +01:00
Maxence Lange 558a934842 init Session/privateKeys on Master Key
I can't find another way to init the session ...
2016-11-22 13:19:42 -01:00
Nextcloud bot ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot 00fffae47f
[tx-robot] updated from transifex 2016-11-18 01:07:04 +00:00
Lukas Reschke bc1008ac38
Use 11.0 instead 9.2
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-15 14:45:58 +01:00
Nextcloud bot cfda17d8f3
[tx-robot] updated from transifex 2016-11-10 01:07:14 +00:00
Nextcloud bot 8d954c0ece
[tx-robot] updated from transifex 2016-11-07 01:07:03 +00:00
Nextcloud bot 20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00
Lukas Reschke e48fa1c337 Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n
Move away from legacy OC_L10N
2016-10-29 09:39:22 +02:00
Nextcloud bot 035890aeb1
[tx-robot] updated from transifex 2016-10-29 00:07:14 +00: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
Nextcloud bot 9984eba727
[tx-robot] updated from transifex 2016-10-27 00:07:01 +00:00
Roeland Jago Douma 6c5f7d586e
Fix migration tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-13 19:40:44 +02:00
Thomas Müller 8628d57b2c
Move console command registration to info.xml for encryption as well as files_external
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:15 +02:00
Nextcloud bot 9fc3209d2c
[tx-robot] updated from transifex 2016-10-09 00:06:49 +00:00
Nextcloud bot 0beecbf2c5
[tx-robot] updated from transifex 2016-10-08 00:06:50 +00:00
Nextcloud bot 4b873b35b7
[tx-robot] updated from transifex 2016-09-29 00:07:08 +00:00
Lukas Reschke 0f321fe116 Merge pull request #1534 from nextcloud/svg-optimization
Svgo optimization
2016-09-28 23:05:48 +02:00
Nextcloud bot e2670e62eb
[tx-robot] updated from transifex 2016-09-28 00:10:20 +00:00
skjnldsv 71830b285c Svgo optimization
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
2016-09-27 20:56:26 +02:00
Nextcloud bot b30c79b63c
[tx-robot] updated from transifex 2016-09-23 00:09:45 +00:00
Nextcloud bot 6a873acf46
[tx-robot] updated from transifex 2016-09-22 00:11:32 +00:00
Nextcloud bot f4a4578f0d
[tx-robot] updated from transifex 2016-09-19 00:09:33 +00:00
Nextcloud bot bcc4b5cd0a
[tx-robot] updated from transifex 2016-09-18 00:09:26 +00:00
Nextcloud bot 4fdee00c27
[tx-robot] updated from transifex 2016-09-15 00:12:37 +00:00
Joas Schilling 5e5e5b77d5
Fix encryption app 2016-09-12 16:48:11 +02:00
Roeland Jago Douma 680b557a4b
Fix apps warnings 2016-09-07 20:42:38 +02:00
Roeland Jago Douma 0c154c1ed7
Fix getMock encryption 2016-09-06 09:29:27 +02:00
Nextcloud bot 8b484eedf0
[tx-robot] updated from transifex 2016-09-05 00:09:10 +00:00
Nextcloud bot e7f618ef14
[tx-robot] updated from transifex 2016-09-03 00:09:24 +00:00
Nextcloud bot 4a5cd74fb2
[tx-robot] updated from transifex 2016-09-01 00:09:24 +00:00
Nextcloud bot 39c180117e
[tx-robot] updated from transifex 2016-08-17 13:30:52 +00:00
Nextcloud bot 0cc8b8b244
[tx-robot] updated from transifex 2016-08-17 00:09:19 +00:00
Arthur Schiwon 717e22267a
Merge branch 'master' into implement_712 2016-08-16 18:31:59 +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
Nextcloud bot 8c424c7971
[tx-robot] updated from transifex 2016-08-16 00:10:47 +00:00
Lukas Reschke 6c6338b810
Merge branch 'master' into implement_712 2016-08-15 21:55:09 +02:00
Lukas Reschke 7ffb7b0d84
Use MockBuilder instead of createMock
CI uses an older PHPUnit
2016-08-15 16:43:22 +02:00
Lukas Reschke 8a7a0f3287
Add unit tests 2016-08-15 16:25:34 +02:00
Nextcloud bot 241fc286c7
[tx-robot] updated from transifex 2016-08-14 00:10:34 +00:00
Nextcloud bot 4da01eeef6
[tx-robot] updated from transifex 2016-08-13 00:13:29 +00:00
Lukas Reschke 8261ccce1b
Merge branch 'master' into implement_712 2016-08-11 19:37:17 +02:00
Arthur Schiwon 14ddf9d923
rename IAdmin to ISettings, the interface is not bound to a specific settings scope 2016-08-11 14:48:21 +02:00
Nextcloud bot 56bf0a8399
[tx-robot] updated from transifex 2016-08-11 00:14:12 +00:00
Arthur Schiwon f3b15a9ab9
fixes, improvements, and another app:
* setupSettings now also triggered on enable
* fixes detection of present admin section or settings in the DB
* add update routine in such cases
* encryption app migrated
2016-08-11 01:41:18 +02:00
Nextcloud bot 3a26def7cf
[tx-robot] updated from transifex 2016-08-09 00:10:11 +00:00
Joas Schilling 352e8b3c79
More casing 2016-08-08 16:45:40 +02:00
Nextcloud bot b80e3e70e5
[tx-robot] updated from transifex 2016-08-06 00:10:17 +00:00
Nextcloud bot 258ee140a4
[tx-robot] updated from transifex 2016-08-04 00:11:51 +00:00
Nextcloud bot 2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Joas Schilling 7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Robin Appelman 6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Joas Schilling 03cb588ea9 Merge pull request #500 from nextcloud/bump_version
Bump version
2016-07-22 10:03:42 +02:00
Joas Schilling 0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling 813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Joas Schilling 86129a8b88
Increase app versions 2016-07-21 15:50:30 +02:00
Nextcloud bot b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Nextcloud bot c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Nextcloud bot a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Nextcloud bot 4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Nextcloud bot da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Morris Jobke 5961d5aae4 Add app:check-code for already compatible apps
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
  done by the request handler before)
2016-06-27 16:50:10 +02:00
Lukas Reschke 7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Jenkins for ownCloud b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Lukas Reschke 2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Morris Jobke 416466b700
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke 9327ded595
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke ca4fd9d25b
fix l10n 2016-06-20 13:13:37 +02:00
Morris Jobke e7e0dc608b
fix strings 2016-06-20 13:13:37 +02:00
Jenkins for ownCloud cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Jenkins for ownCloud e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Jenkins for ownCloud 63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Jenkins for ownCloud f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Björn Schießle 0f728b4cd1
don't fail on "bad signature" during login. Most likely this happens because
the login password changed at the user back-end (e.g ldap). Such failures will
be handled after login correctly by allowing the user to adjust the passwords
2016-05-25 11:39:44 +02:00
Jenkins for ownCloud bca7586574 [tx-robot] updated from transifex 2016-05-21 01:55:53 -04:00
Jenkins for ownCloud cba4875e4d [tx-robot] updated from transifex 2016-05-13 02:08:45 -04:00
Joas Schilling 4a3311f430 Move Encryption app to PSR-4 (#24524)
* Move Encryption to PSR-4

* Move encryption tests to PSR-4

* Fix the tests
2016-05-12 09:42:19 +02:00
Bjoern Schiessle d86f8ba5f8
if we don't have a encrypted file key we can return a empty string right away 2016-04-26 11:06:55 +02:00
Bjoern Schiessle 088ffd05d7
don't create a private-/public-key pair for each user if the master key is enabled 2016-04-26 11:06:55 +02:00
Jenkins for ownCloud dab4633300 [tx-robot] updated from transifex 2016-04-25 01:54:53 -04:00
Jenkins for ownCloud 4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Vincent Petry b50d3255fb Merge pull request #22791 from owncloud/enc_master_key_improvements
Enc master key improvements
2016-04-21 11:48:26 +02:00
Björn Schießle a3381b1d0c
we need to initialize the mount points of the given user before we recover
access to his files
2016-04-19 17:04:21 +02:00
Thomas Müller 50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-15 15:07:40 +02:00
Jenkins for ownCloud a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04:00
Roeland Jago Douma 7f4f0b20ad
Fix encryption tests 2016-04-08 15:23:17 +02:00
Jenkins for ownCloud 1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
Jenkins for ownCloud cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Jenkins for ownCloud dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud 3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00
Thomas Müller c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled
disable the recovery key if the master key is enabled
2016-03-21 09:49:15 +01:00
Bjoern Schiessle 89223379ad replaceUserKeys() actually deletes the users keys -> update method name and doc-block 2016-03-18 11:06:14 +01:00
Bjoern Schiessle 5e267589d4 only create and update user specific key if no master key is enabled 2016-03-18 11:06:14 +01:00
Thomas Müller f3f08cf910 Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff
Fallback for crappy ancient distributions
2016-03-16 21:56:36 +01:00
Bjoern Schiessle 9de4a8338e allow group shares, even if not all public keys are available 2016-03-15 11:33:19 +01:00
Lukas Reschke 3a5f58c9b0 Fallback for crappy ancient distributions
Fixes https://github.com/owncloud/core/issues/23181
2016-03-12 23:11:31 +01:00
Jenkins for ownCloud 5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
Jenkins for ownCloud c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Jenkins for ownCloud bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Bjoern Schiessle b6050b44c2 disable the recovery key if the master key is enabled 2016-03-03 12:16:39 +01:00
Joas Schilling 8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Lukas Reschke c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke 933f60e314 Update author information
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Thomas Müller eb740d1dac Merge pull request #22727 from owncloud/decrypt_all_master_key
make decrypt all work with the master key
2016-03-01 08:23:27 +01:00
Jenkins for ownCloud a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Bjoern Schiessle 95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Jenkins for ownCloud a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00