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

39701 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
b69ddfba8b
Fix activity emails for accept/decline of remote shares 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-10 12:10:36 +02: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
Lukas Reschke
a1c14a747c Merge pull request #5645 from nextcloud/try-to-prevent-spam-collecting-of-emails 
Don't show mail domain and from in config report
 2017-07-07 18:38:50 +02: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
Morris Jobke
e76b867c2c Merge pull request #5628 from nextcloud/only-create-the-migration-dir-when-necessary 
Only create the migration directory when necessary
 2017-07-07 14:10:32 +02:00
Joas Schilling
79d7c26b8a
Register autoloading before running migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 12:01:11 +02:00
Morris Jobke
c2ba5e2884 Merge pull request #5529 from michaelletzgus/optimize_js_order 
Optimize performance / Load CSS and JS in parallel on firefox
 2017-07-07 11:16:31 +02:00
Morris Jobke
b4deba2078 Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails 
Use PNGs for icons in activity emails
 2017-07-07 11:05:00 +02:00
Morris Jobke
b1520a6458 Merge pull request #5643 from nextcloud/codeowners 
Move mention-bot notifications to code owners
 2017-07-07 10:47:33 +02:00
Morris Jobke
172b4bb6d2 Merge pull request #5615 from nextcloud/issue-5286-fix-navigation-entries-for-group-restricted-apps 
Don't load navigation entries of restricted apps
 2017-07-07 10:46:45 +02:00
Joas Schilling
e6e79c34b1
Don't show mail domain and from in config report 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 09:53:55 +02:00
Joas Schilling
9c3b2a3991
Move mention-bot notifications to code owners 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-07 08:44:01 +02:00
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex 2017-07-07 00:08:24 +00:00
Morris Jobke
b4a221f9be Merge pull request #5424 from nextcloud/moveFromCache-from-shared 
fix moving folders out of a cache jail
 2017-07-06 18:31:18 +02:00
Morris Jobke
ad1d4d363f Merge pull request #5174 from nextcloud/new-encryption-default 
Use the master key by default
 2017-07-06 15:58:48 +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
c46b158e10
update sharing test to new master key default 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:12 +02:00
Bjoern Schiessle
b43f6d295e
update file system tests to take the master key into account 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-07-06 11:47:12 +02:00
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
1a55ace97c
no warning on password change if no encryption module uses per-user keys 
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
Joas Schilling
0f275b1550
Only create the migration directory when necessary 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-06 09:58:39 +02:00
Nextcloud bot
984953ef4a
[tx-robot] updated from transifex 2017-07-06 00:08:44 +00:00
blizzz
75f97852b4 Merge pull request #5404 from nextcloud/use-translated-hint-insteadof-english-error 
Use translated Hint instead of english error on password policy
 2017-07-05 22:18:49 +02: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
5d5b1285ec Merge pull request #5520 from nextcloud/disable-click-on-hint 
[Small] Hint should not be clickable
 2017-07-05 16:19:09 +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
Morris Jobke
163e8774a4 Fix autoloader and namespace test 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-05 15:46:25 +02:00
Morris Jobke
7d58bb7db5 Merge pull request #5342 from nextcloud/userlist-used-space 
show used space in user list
 2017-07-05 15:15:25 +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
bbfc044ac5
Add migration for personal settings stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 14:58:20 +02:00
Daniel Calviño Sánchez
6fa5c33af4 Add acceptance tests for sorting of favorite files 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-07-05 14:54:26 +02:00
Joas Schilling
6abbe4e962
Don't load navigation entries of restricted apps 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:52:51 +02:00
Morris Jobke
f2b8535c7e Update unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-07-05 13:50:28 +02:00
Joas Schilling
0bff4f3f07 Fix the installer tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
4e5cd1efea Fix tests of CodeChecker and MigrationService 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
7a3d83d630 Register autoloading before running migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
6a0da09734 Update autoloading 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +02:00
Joas Schilling
3b267b165f Check the migration files for table, column and index length errors 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-07-05 13:02:16 +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