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

16304 commits

Author SHA1 Message Date
Bjoern Schiessle
f186a5cfb1
fix and extend dav test to also test the master-key setup 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:11 +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
984953ef4a
[tx-robot] updated from transifex 2017-07-06 00:08:44 +00:00
Morris Jobke
60398b919b Merge pull request #5231 from nextcloud/migrations 
Migrations
 2017-07-05 17:32:40 +02:00
Morris Jobke
ca565644b3 Merge pull request #5621 from nextcloud/fix-sorting-of-favorite-files-in-file-list 
Fix sorting of favorite files in file list
 2017-07-05 17:31:41 +02:00
Morris Jobke
6879573b2e Merge pull request #5580 from nextcloud/admin-audit-update 
Admin audit update
 2017-07-05 16:16:00 +02:00
Daniel Calviño Sánchez
be56374c51 Fix sorting of favorite files 
The sort comparator checks the "isFavorite" property of the FileInfo
objects to compare. That property is set when the file list is loaded
and the response from the server is parsed, and thus a freshly loaded
file list has the proper sorting for favorite files. However, the
property is not set in other cases, like when the FileInfo objects are
derived from FileInfoModels due to a file being marked as a favorite or
a text editor being closed, which causes the file to be sorted in the
wrong position.

There is no need to add the property in those situations, though; in all
cases the TagsPlugin adds a "tags" array property that contains an
OC.TAG_FAVORITE tag, so that tag can be checked instead of "isFavorite".
Moreover, although "isFavorite" was added by the main "_parseFileInfo"
function it did not really belong there but to the "FileInfoParser" from
the TagsPlugin; however, as that property now is not used anywhere it
was removed altogether.

A cleaner solution would have been to make the sort comparator
extensible by plugins like other behaviours of the file list and then
add the sorting logic related to favorite files to the TagsPlugin.
However, right now only the TagsPlugin would need to alter the main
sorting logic, and it seems like a corner case anyway. Even if it is
implemented as a plugin, favorite files is a core feature, so for the
time being it will be taken into account directly in the main sorting
logic; making the sort comparator extensible by plugins is defered until
there are other use cases for that.

Fixes #5410

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-07-05 15:01:23 +02:00
Joas Schilling
fe6e8c2710 Fix dropping tables and handle the prefix automatically 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
543c181ec5 Move twofactor_backupcodes to migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
blizzz
d8af9d4c9b Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-either 
Don't log passwords on dav exceptions
 2017-07-05 11:58:32 +02:00
Morris Jobke
e836efe68b Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fix 
Ldap password renewal fixes for NC12
 2017-07-05 11:49:13 +02:00
Nextcloud bot
1cbb7a18d8
[tx-robot] updated from transifex 2017-07-05 00:08:26 +00:00
Morris Jobke
67f4a79be7 Merge pull request #5549 from nextcloud/update-info 
Update admin.php
 2017-07-04 19:11:31 +02:00
Morris Jobke
711d861d8b Merge pull request #5556 from nextcloud/files_external_sftp_2048_4096 
[Files external] Add support for 2048 and 4096 bit RSA key generation
 2017-07-04 17:37:25 +02:00
Morris Jobke
f3c25e177f Merge pull request #5407 from nextcloud/5157-simple-logo 
Simplified Nextcloud logo icon #2
 2017-07-04 12:56:05 +02:00
Nextcloud bot
c94dbddd12
[tx-robot] updated from transifex 2017-07-03 00:08:21 +00:00
Marin Treselj
02dd7f5965
Revert background-size as requested, issue will be fixed separately 
Signed-off-by: Marin Treselj <marin.treselj@forlagshuset.no>
 2017-07-02 14:15:09 +02:00
Marin Treselj
3470d0a44e
Simplified Nextcloud logo icon 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-07-02 14:14:49 +02:00
Nextcloud bot
cc4373c901
[tx-robot] updated from transifex 2017-07-02 00:08:14 +00:00
Joas Schilling
a4a99fa7b9
Log console commands 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 12:19:01 +02:00
Joas Schilling
a5430b68ff
Listen to app enable/disable events 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 12:06:14 +02:00
Joas Schilling
669f684434
Move logic to Application class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 11:41:21 +02:00
Joas Schilling
8260d4bf73
Move to PSR-4 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-01 11:33:20 +02:00
Nextcloud bot
d49276082e
[tx-robot] updated from transifex 2017-07-01 00:08:28 +00:00
Roger Szabo
51ecc7ce11 suppress superflous php error on rejected password change 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2017-06-30 18:36:33 +08:00
Roeland Jago Douma
e3127b8899
Remove unused member 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-06-30 09:13:36 +02:00
Nextcloud bot
2afb4857cc
[tx-robot] updated from transifex 2017-06-30 00:08:23 +00:00
blizzz
72d3bfcf56 Merge pull request #4890 from nextcloud/unify-settings 
Unify settings
 2017-06-29 20:02:09 +02:00
Joas Schilling
b27819785e
Don't log passwords on dav exceptions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-29 17:20:10 +02:00
Roeland Jago Douma
e0ef960848 Merge pull request #5526 from nextcloud/trashbin-error-log 
Improve logging of trash bin inconsistencies
 2017-06-29 11:06:50 +02:00
Roeland Jago Douma
25e08bc8a0
Allow 2048 and 4096 bit SFTP keys 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-06-29 09:32:24 +02:00
Nextcloud bot
928b6a376e
[tx-robot] updated from transifex 2017-06-29 00:08:26 +00:00
Nextcloud bot
045d04332e
[tx-robot] updated from transifex 2017-06-28 00:08:18 +00:00
Jos Poortvliet
43301fddaf Update admin.php 
add a note on our staged roll-out.
 2017-06-27 17:00:06 +02: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
Nextcloud bot
3b80b72c04
[tx-robot] updated from transifex 2017-06-27 00:08:17 +00: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
Nextcloud bot
6e52c8a794
[tx-robot] updated from transifex 2017-06-26 00:08:31 +00:00
Nextcloud bot
665ded38aa
[tx-robot] updated from transifex 2017-06-25 00:08:18 +00:00
Nextcloud bot
4526b8d6a3
[tx-robot] updated from transifex 2017-06-24 00:08:29 +00:00
Morris Jobke
b4fa812a3d Improve logging of trash bin inconsistencies 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-06-23 16:09:00 -05:00
Morris Jobke
944e560155 Merge pull request #5517 from nextcloud/enhanced-failure-logging 
Enhance the logging if the part file can not be renamed
 2017-06-23 16:06:03 -05: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
c5df6db631
move twofactor_* into security 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 13:18:08 +02:00
Arthur Schiwon
b7ce492c59
adapt encryption 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-06-23 12:38:05 +02:00