Lukas Reschke
ee4262f567
Merge pull request #7263 from nextcloud/clean-bruteforce-attempt-on-success
...
Reset bruteforce attempt table on successful login
2017-11-24 15:53:08 +01:00
Arthur Schiwon
134192d76c
fix sorting test on phantomjs
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-24 15:33:26 +01:00
Morris Jobke
44adcad757
Merge pull request #7273 from nextcloud/remove-unused-code
...
Remove unused checkCode method
2017-11-24 15:08:29 +01:00
Morris Jobke
5a270c2715
Reset bruteforce attempt table on successful login
...
* only clear the entries that come from the same subnet, same action and same metadata
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 14:58:57 +01:00
Daniel Calviño Sánchez
5e6d4ad27c
Disable elements while a comment is being deleted
...
When a comment is being deleted the "disabled" class is added to the
comment div, which causes it to look disabled. However, the input
elements and the content editable div were not truly disabled, and thus
it was still possible to interact with them. This commit ensures that
they are properly disabled while the comment is being deleted.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 13:17:55 +01:00
Morris Jobke
05abb9ea66
Remove unused checkCode method
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-24 10:50:50 +01:00
Lukas Reschke
3a6d16e6d4
Merge pull request #7268 from nextcloud/update-crl
...
Update CRL due to files_frommail
2017-11-24 10:01:21 +01:00
Nextcloud bot
dc1d13a18d
[tx-robot] updated from transifex
2017-11-24 01:09:53 +00:00
Julius Härtl
cd7aba3171
Fix loading icon position in the app menu
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-23 21:15:05 +01:00
Morris Jobke
7a49270c64
Update CRL due to aboutconfig
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 18:37:23 +01:00
Morris Jobke
eaafa72ae0
Update CRL due to files_frommail
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 17:56:58 +01:00
Arthur Schiwon
5a9c99e6ac
recycle SharedFileInfo values in fileInfo
...
fileInfo is composed of data from sharing, however additional data is
pulled when sidebar opens, e.g. the size. Then, existing data is
overwritten by data from the other source (files). The data points that
would be lost are not dirty however and still used, so we keep them.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 17:51:56 +01:00
Daniel Calviño Sánchez
b248c53c6a
Make "contenteditable=false" divs look like disabled input fields
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 16:37:43 +01:00
Daniel Calviño Sánchez
bbe00079cc
Fix input field not disabled while a comment is being sent
...
Since the change of the text area to a content editable div the input
field was no longer disabled while a new comment was being sent. It was
caused by still trying to disable the div using the "disabled" property,
which works only on real input fields; when using a content editable div
the way to disable it is by setting "contenteditable" to "false".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 14:34:09 +01:00
Arthur Schiwon
b3b34c08d1
fix tooltips for good
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
Arthur Schiwon
f8b9ddc0ea
apply tooltip to all avatars
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
Arthur Schiwon
077381c7b3
rip out obsolete recipientsDisplayName
...
also needs tests adjustements, and this also brings in natural sorting
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:14 +01:00
Arthur Schiwon
9d95391ff1
adjust tests and apply sorting
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon
3a1d8fa45f
adjust, fix and extend tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon
4247936dd6
Fix avatars in file rows of incoming shares
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:13 +01:00
Arthur Schiwon
dcfd7bf7ff
fix avatars in file rows of outgoing shares
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-23 13:32:09 +01:00
Morris Jobke
2f3484ba88
Merge pull request #7260 from nextcloud/cleanup-unused-code
...
Use basename() instead of self implementation
2017-11-23 13:07:47 +01:00
Morris Jobke
be4e921306
Use basename() instead of self implementation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-23 12:35:47 +01:00
John Molakvoæ (skjnldsv)
5591ea6e8b
Fixed alignment of items in comments
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 12:26:22 +01:00
blizzz
98cdd9885f
Merge pull request #7168 from nextcloud/fix-user-list
...
Fix accesslist when a user has an ID only containting 0-9
2017-11-23 12:17:11 +01:00
Morris Jobke
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root
...
Use the correct root for shared jail when the source storage is also a jail
2017-11-23 12:03:36 +01:00
John Molakvoæ (skjnldsv)
a936aea8a4
Fixed top
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 09:23:24 +01:00
Daniel Calviño Sánchez
60a73bab1c
Submit comments with Enter and use Shift+Enter for new lines
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 03:27:16 +01:00
Daniel Calviño Sánchez
4eb9c0142d
Fix contacts menu vertical position for comment authors
...
The contacts menu was being shown as "inline-block", which caused the
top of the menu to be aligned to the top of the author row.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 02:12:09 +01:00
John Molakvoæ (skjnldsv)
c4e2fc2aa6
Fixed contact menu horizontal position
...
The arrow tip was 1px off from the avatar centre.
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 02:10:05 +01:00
Nextcloud bot
b6a39b7927
[tx-robot] updated from transifex
2017-11-23 01:09:47 +00:00
Jan-Christoph Borchardt
90c1d3e129
Merge pull request #7247 from nextcloud/give-audio-icons-shadow
...
Give audio-white and audio-off-white shadow via CSS
2017-11-22 18:07:06 +01:00
Robin Appelman
95d0b3d490
run postgresql 10 tests in drone
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-22 17:57:17 +01:00
Robin Appelman
da3004b8f5
add postgresql10 compatibility to dbal
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-22 17:57:17 +01:00
William Pain
beac223fa6
Add HTML5 audio player in public view
...
Signed-off-by: William Pain <pain.william@gmail.com>
2017-11-22 16:07:17 +01:00
John Molakvoæ (skjnldsv)
1c5a1906d6
Fixed heigh resize
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-22 15:40:25 +01:00
John Molakvoæ (skjnldsv)
ec8c7d612d
Use flex for guest full screen alignment
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-22 15:34:40 +01:00
Marin Treselj
c5e51b34be
Give audio-white and audio-off-white shadow via CSS
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-22 14:16:39 +01:00
Jan-Christoph Borchardt
968da5ef23
Merge pull request #7239 from nextcloud/larger-close-button
...
Make close icon fill more space
2017-11-22 14:00:57 +01:00
Nextcloud bot
3aaccc9a23
[tx-robot] updated from transifex
2017-11-22 01:10:09 +00:00
Marin Treselj
bf68d6374b
Less exaggerated size increase for close icon
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 16:07:43 +01:00
Marin Treselj
7f36c2090a
Make close icon fill more space
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 15:33:23 +01:00
John Molakvoæ
399a965240
Merge pull request #7236 from nextcloud/remove-deprecated-icons
...
Remove unused, deprecated icons
2017-11-21 14:52:08 +01:00
Marin Treselj
2f4e036a15
Remove unused, deprecated icons
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-21 14:06:46 +01:00
Nextcloud bot
a8ec62dcc2
[tx-robot] updated from transifex
2017-11-21 01:10:07 +00:00
Morris Jobke
fe3f094127
Merge pull request #7230 from nextcloud/fix-autoload-section-failure
...
Remove wrong entry in admin_settings that causes 500
2017-11-20 22:14:20 +01:00
Bjoern Schiessle
7bc28f14de
show e2e folder icon on encrypted folders
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 21:00:26 +01:00
Daniel Calviño Sánchez
37d8d3d858
Add data attribute to file list rows telling if the file is encrypted
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-20 21:00:04 +01:00
Morris Jobke
6fd51426bf
Remove wrong entry in admin_settings that causes 500
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-20 20:49:03 +01:00
Bjoern Schiessle
670ac48eb7
adjust permissions in web view for encrypted folders
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-20 18:24:50 +01:00