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
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00: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
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
Julius Härtl
42d9be4529
Expose theming capabilities to public
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-30 11:08:54 +02: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
Arthur Schiwon
f6ecc46cfa
adapt twofactore_backupcodes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon
1ace1657b6
adapt federatedfilesharing
...
also drops IE8 switch
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Arthur Schiwon
9c85f55202
remove obsolete file
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:38:05 +02:00
Robin Appelman
0dcce5a835
move personal external storage settings to it's own section
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-23 12:37:42 +02:00
Morris Jobke
eb9aedf44b
Enhance the logging if the part file can not be renamed
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-22 17:50:14 -05:00
Morris Jobke
d611d9c126
Merge pull request #5498 from nextcloud/allow-to-force-a-language
...
Allow to force a language and set it via the ocs api
2017-06-22 12:47:00 -05:00
Roger Szabo
bf9412df63
set needsPasswordReset flag correctly
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-22 15:58:30 +08:00
Roger Szabo
1d8e73b108
css for button adjustment for nc12
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-22 15:53:11 +08:00
Morris Jobke
18824d476e
Merge pull request #5474 from nextcloud/wording-4925
...
Improve wording of various error messages
2017-06-21 17:28:54 -05:00
Jan-Christoph Borchardt
fd63577089
Improve wording of various error messages
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-21 14:51:59 -05:00
Joas Schilling
fa717d9706
Add unit tests for the new code
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 12:21:21 +02:00
Joas Schilling
7816c54625
Allow to force a language and set it via the ocs api
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 11:34:52 +02:00
Roger Szabo
0fcbc0954c
pass missing function parameter
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-06-21 14:40:44 +08:00
Nextcloud bot
146c699eb4
[tx-robot] updated from transifex
2017-06-21 00:08:15 +00:00
Joas Schilling
ca3a6ec607
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 14:25:24 +02:00
Joas Schilling
90fa27694a
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
Nextcloud bot
2660a3b49c
[tx-robot] updated from transifex
2017-06-20 00:08:41 +00:00
Morris Jobke
09a027ddff
Merge pull request #5450 from nextcloud/fix-appmenu-more-theming
...
Fix more icon in apps menu on bright backgrounds
2017-06-19 08:28:02 -05:00
Robin Appelman
c9ef998f17
Merge pull request #5091 from nextcloud/shared-cache-during-init
...
dont die if we try to access the shared cache while setting up the shared storage
2017-06-19 13:47:59 +02:00
Nextcloud bot
76d10bc46b
[tx-robot] updated from transifex
2017-06-19 00:08:20 +00:00
Julius Härtl
adf2f88873
Fix more icon in apps menu on bright backgrounds
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-06-17 10:14:21 +02:00
Nextcloud bot
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
Robin Appelman
cc0ff6f5e3
Merge pull request #5177 from Bekcpear/master
...
Fix upload remaining time
2017-06-16 14:11:55 +02:00
Joas Schilling
698a7cb7f0
Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-items
...
Allow dir-listing also when one child is blocked by access control
2017-06-16 10:47:08 +02:00
Bekcpear
8267e5e007
Fix uploadrate value of 'original-title' attribute
...
The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.
Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-16 15:35:51 +08:00
Bekcpear
82e263ed04
Fix upload remaining time
...
The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.
Signed-off-by: Yaojin Qian <i@ume.ink>
2017-06-16 15:33:10 +08:00
Nextcloud bot
74654288e6
[tx-robot] updated from transifex
2017-06-16 00:08:44 +00:00
Morris Jobke
ca3c69c8ae
Merge pull request #5298 from nextcloud/bugfix/4885/calendar_shares_url_special_char_issue
...
urldecode group principals in Cal- and CardDAV backend
2017-06-14 23:10:40 -05:00
Morris Jobke
ac565cecad
Merge pull request #5300 from nextcloud/bugfix/noid/fix_proppatch_requests_to_groupshares
...
allow users to send PropPatch request when calendar is group-shared with them
2017-06-14 23:00:39 -05:00
Morris Jobke
db14089d6c
Merge pull request #5375 from nextcloud/share-folder-for-remote-shares
...
Use the share_folder config for remote shares
2017-06-14 22:42:06 -05:00
Nextcloud bot
7a269ae872
[tx-robot] updated from transifex
2017-06-15 00:08:40 +00:00
Morris Jobke
2398d40d98
Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-email
...
Allow to find local users by their email address
2017-06-14 18:03:24 -05:00
Joas Schilling
f28511cac6
Add unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:32:34 +02:00
Joas Schilling
4f98852f52
Make sure to only add system users once
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 15:07:21 +02:00
blizzz
f3f3d077ae
Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-check
...
remove check, user_webdavauth is not an app anymore for long
2017-06-14 10:32:14 +02:00
Nextcloud bot
dc61fb999d
[tx-robot] updated from transifex
2017-06-14 00:08:39 +00:00
Morris Jobke
f38f2baa5a
Merge pull request #5295 from nextcloud/bugfix/5077/allow_proppatches_to_birthday_calendar
...
allow PropPatch requests to contact_birthdays
2017-06-13 18:11:13 -05:00
Morris Jobke
69fd3a3c7b
Merge pull request #5380 from nextcloud/global-scale-settings
...
fix "add to your nextcloud" input field
2017-06-13 14:41:32 -05:00
Morris Jobke
e7b5c5c268
Merge pull request #5372 from nextcloud/we-shall-monkey-patch-auth-headers-for-clients-that-dont-follow-specs
...
Prevent sending second WWW-Authenticate header
2017-06-13 12:36:31 -05:00
Morris Jobke
eafaa2f238
Merge pull request #5378 from patschi/fix-5349
...
Fix #5349 , no themed icon when dragging folder
2017-06-13 12:21:17 -05:00
Morris Jobke
666e4de55f
Merge pull request #5305 from nextcloud/add-quota-to-files-view
...
Add quota to the files view
2017-06-13 12:19:27 -05:00
Joas Schilling
ae693129db
Allow to find local users by their email address
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-13 18:07:47 +02:00
Bjoern Schiessle
2b3549610b
fix 'add to your nextcloud' input field, this is not an email address
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-13 17:46:46 +02:00
Morris Jobke
4a256aa6e4
Do not show icon for quota bar
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-13 10:30:26 -05:00
Lukas Reschke
2f7f6e28a2
Merge pull request #5373 from nextcloud/i-like-you-all-but-would-like-you-more-if-you-dont-ignore-red-ci-states
...
Remove duplicate dependencies entry
2017-06-13 17:22:11 +02:00