b6c9029c82
Use proper return function
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 15:14:32 +01:00
d001dbd259
Adjust unit tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:03 +01:00
e53e585e91
put explanatory text directly in popup
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
f7f70028d1
Search on lookup server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:30:00 +01:00
fb91bf6a5b
Add a signer class for signing
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
6f4cb12be2
Add identity proof
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
b23a4ca96b
push public user data to the lookup server
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
b75ef0f8b3
Fix popover layout fix for files and global
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
91774208b1
Fix popover layout
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
ba9b17c906
[tx-robot] updated from transifex
2016-11-21 01:06:58 +00:00
97af4f762d
[tx-robot] updated from transifex
2016-11-20 01:06:44 +00:00
b1ee9862f8
[tx-robot] updated from transifex
2016-11-19 01:06:44 +00:00
4458e294bc
Merge pull request #2107 from nextcloud/fix-scrollbar-firefox
...
fix scrollbar in settings area in Firefox, improve on @pgys pull request
2016-11-18 21:32:08 +01:00
cdf248f92e
Merge pull request #1855 from nextcloud/focus-onslidetoggle
...
Add focus to autofocus form element on slide toggle
2016-11-18 21:11:46 +01:00
c0b376d82a
Fix select2 dropdown
...
Fix #1932
+ no result fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-18 16:30:36 +01:00
332eaec4c0
Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions
...
Password confirmation for some actions
2016-11-18 15:42:30 +01:00
faee255ff4
Merge pull request #840 from nextcloud/theming-icon-endpoint
...
Add dynamic icon creation
2016-11-18 15:35:34 +01:00
8d33d76ce8
Use the existing prompt
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
e80d3c2a10
Submit on enter
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-18 12:10:51 +01:00
80abb69b60
Show a little explanation above the input field
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
05df523395
Empty the password field on submission of the form
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:51 +01:00
71c4edf827
use proper method call for _.bind()
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 12:10:50 +01:00
145da710a5
Require confirmation for app config changes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
cc33f8695b
Make sure it is a function
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 12:10:50 +01:00
a0d6c6593a
Allow to check it via the API
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 11:57:16 +01:00
d75e35b75e
Introduce the UI for password confirmation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-18 11:57:16 +01:00
50d9793d72
fix glitch in Chrome
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 11:55:12 +01:00
c72db8589e
fix scrollbar in settings area in Firefox, improve on @pgys pull request
2016-11-18 11:52:30 +01:00
c02b0199b0
Merge pull request #2194 from nextcloud/jquery-dropdown-fixes
...
jQuery dropdown fixes
2016-11-18 11:34:18 +01:00
9e28a3ba12
Theming: Code cleanup and cache buster for mime icons
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:24 +01:00
4945592a86
Fix IconController after rebase
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:23 +01:00
e5f8f28d04
Core: Load mimetype icons from theming app if available
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-18 10:23:22 +01:00
00fffae47f
[tx-robot] updated from transifex
2016-11-18 01:07:04 +00:00
6fa5c18a79
Merge pull request #2136 from nextcloud/sharing-layout
...
Sharing layout fixes
2016-11-18 00:40:46 +01:00
3d3db5bc1a
jQuery UI dropdown: correct max-height of 4 1/2 entries
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 23:48:42 +01:00
9eff298fa8
jQuery UI dropdown: correct clickable area of 44px
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 23:48:12 +01:00
9f5d019df9
resize and pixel-perfectly align copy icon
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:39:31 +01:00
cf78942253
fix spacing in sidebar tabs
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 21:39:11 +01:00
5eab1cdece
fix layout of sharing list
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 19:02:33 +01:00
978c02e7a8
select2: show cursor pointer on hovering entries
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 18:18:38 +01:00
da4f68b80a
select2: make sure dropdown always shows a last half entry to hint at more
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 17:21:20 +01:00
ff9d05e3f9
select2: ellipsize long names
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 17:20:29 +01:00
64be76008a
remove Unshare icon in list
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 16:39:01 +01:00
de983e61e3
Merge pull request #2170 from nextcloud/ocs_person_to_controller
...
OCS person to controller
2016-11-17 09:40:16 +01:00
549e76425c
add icons for audio mute and video off
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-17 05:53:01 +01:00
ab18d2f55e
[tx-robot] updated from transifex
2016-11-17 01:07:02 +00:00
204a0849b4
Merge pull request #2141 from nextcloud/icon-background
...
add dark background fade to icons to make them visible on light backgrounds
2016-11-17 00:00:17 +01:00
4035d60847
Merge pull request #2157 from nextcloud/fix-checkboxes
...
Fix checkboxes when theming color is enabled
2016-11-16 19:25:25 +01:00
1baa2b8deb
Move OC\OCS\Person to OCSController
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-16 19:21:00 +01:00
cc8750ca30
Merge pull request #2160 from nextcloud/its-nextcloud
...
It's Nextcloud
2016-11-16 18:01:39 +01:00
319c7ee1c0
Merge pull request #2166 from nextcloud/logreader-shipped
...
set logreader as shipped
2016-11-16 18:00:49 +01:00
7100a1b347
Merge pull request #2146 from nextcloud/add_copy_tooltip_to_clipboard
...
Adds copy tooltip to clipboards
2016-11-16 17:57:35 +01:00
bd10c960ee
set logreader as shipped
2016-11-16 17:08:30 +01:00
b7e6e9f83c
Fix tooltips - they now properly change on click
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-16 15:43:26 +01:00
46edb4e1a7
It's Nextcloud
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2016-11-16 14:56:30 +01:00
beeb819292
Fix margin for checkboxes in multiselect options
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-16 14:06:33 +01:00
51688986df
Merge pull request #2139 from nextcloud/increase-version-to-ELF
...
Use 11.0 instead 9.2
2016-11-15 20:56:41 +01:00
f7c637071a
Adds copy tooltip to clipboards
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-15 19:30:59 +01:00
f07d75a4dd
@since 9.2.0 to @since 11.0.0
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-15 18:51:52 +01:00
fd3a32836e
add dark background fade to icons to make them visible on light backgrounds
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-15 17:40:07 +01:00
34e3acd897
specify Federated Cloud ID syntax
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-15 12:07:54 +01:00
571c5aac5e
[tx-robot] updated from transifex
2016-11-15 01:07:05 +00:00
b35812fce6
Show specific empty message for tag input fields
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-14 11:46:21 +01:00
8c1cd07de3
[tx-robot] updated from transifex
2016-11-14 01:07:06 +00:00
150b86a7db
[tx-robot] updated from transifex
2016-11-13 01:07:09 +00:00
1d65d31e0f
[tx-robot] updated from transifex
2016-11-12 01:07:11 +00:00
9fff4b017d
Merge pull request #2088 from nextcloud/issue-2079-breadcrumb-padding
...
Restore the padding on the home icon
2016-11-11 18:55:48 +01:00
6c5e777bb9
Restore the padding on the home icon
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-11 09:04:30 +01:00
0f06034239
Replace more vendor naming
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-11 08:54:21 +01:00
d969fc4ac6
[tx-robot] updated from transifex
2016-11-11 01:07:18 +00:00
cfda17d8f3
[tx-robot] updated from transifex
2016-11-10 01:07:14 +00:00
5f15020b9b
Merge pull request #1618 from nextcloud/show-folder-shared-status
...
make it possible to share the current folder
2016-11-08 16:23:47 +01:00
742ece8b7a
Fix styling of the breadcrumbs icon
...
* properly center share icon
* also apply styles for public share icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-08 11:14:36 +01:00
d3d49c1e98
Apply firefox workaroud to svg filters
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-08 09:55:29 +01:00
5bf7e5533d
visually reflect sharing state of current folder
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-07 14:58:45 +01:00
8e5651cd9e
Make sure the object exists before adding it.
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-07 14:56:32 +01:00
dc5c7d2b04
First list tags the user used lately
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-07 14:56:31 +01:00
6c27b74e75
Fix the push state
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-07 12:51:32 +01:00
494c3b1533
Add focus to autofocus form element on slide toggle
...
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-11-07 10:51:05 +01:00
8d954c0ece
[tx-robot] updated from transifex
2016-11-07 01:07:03 +00:00
e217040402
[tx-robot] updated from transifex
2016-11-06 01:07:48 +00:00
a756396739
Merge pull request #2018 from nextcloud/firefox-svg-workaround
...
Workaround for disappearing app icons for Firefox before version 51
2016-11-05 17:05:46 +01:00
ca3616cb58
[tx-robot] updated from transifex
2016-11-05 01:07:14 +00:00
71275ced28
Workaround for disappearing app icons for Firefox before version 51
...
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2016-11-04 15:39:04 +01:00
479d76d426
[tx-robot] updated from transifex
2016-11-04 01:07:04 +00:00
ac61f64190
Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-link
...
Use mail for encrypting the password reset token as well
2016-11-03 22:11:43 +01:00
6d686c213b
[WIP] Use mail for encrypting the password reset token as well
2016-11-03 14:27:26 +01:00
9e6b26dcd0
Add cache 1 day cache to preview endpoint
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
55af6b45f7
More tests
...
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
5466fbf761
Move Ipreview to more of DI thingy
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
d6f1287ae6
Move file
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
02525fd98b
Move preview endpoint to controller
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:33 +01:00
743132650a
Move to AppData
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:32 +01:00
958c1289b1
New preview generator
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-03 14:00:32 +01:00
e11197bc48
Merge pull request #1954 from nextcloud/issue_#1953
...
#1953 add can to subshare options
2016-11-03 11:50:29 +01:00
09c4fe6d62
Fixes https://github.com/nextcloud/server/issues/1953
...
Signed-off-by: Andreas Hechenberger <world@greenstation.de>
2016-11-03 11:19:45 +01:00
8471219b7c
[tx-robot] updated from transifex
2016-11-03 01:07:06 +00:00
39573e602d
Merge pull request #1978 from nextcloud/remove-send-mail-option
...
Remove send mail option
2016-11-02 22:36:05 +01:00
7d17b42f4d
Remove from core.json
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 21:17:05 +01:00
d235c4833f
remove the 'shareapi_allow_mail_notification' setting
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 21:17:05 +01:00
e6b52ef4cd
Merge pull request #1347 from nextcloud/bring-back-remember-me
...
fix remember me login
2016-11-02 18:32:38 +01:00
f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
e81d04cd8d
Merge pull request #1940 from nextcloud/new-appstore
...
Use new appstore API
2016-11-02 17:00:24 +00:00
d907666232
bring back remember-me
...
* try to reuse the old session token for remember me login
* decrypt/encrypt token password and set the session id accordingly
* create remember-me cookies only if checkbox is checked and 2fa solved
* adjust db token cleanup to store remembered tokens longer
* adjust unit tests
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-02 13:39:16 +01:00
7da3ba3f91
Merge pull request #657 from nextcloud/share-by-mail
...
New share provider: Share by mail
2016-11-02 11:04:33 +01:00
42b0a0d2af
Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the-admin
...
Color the trusted domain to alert the admin a bit more
2016-11-02 10:06:35 +01:00
19af06cdea
Merge pull request #1951 from nextcloud/settingsmaxheight
...
restricted the height of the settings area in core/css/apps.css
2016-11-02 08:45:05 +01:00
122fbf0092
[tx-robot] updated from transifex
2016-11-02 01:07:09 +00:00
86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
ce08682c2f
enabled by default and add to shipped.json
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
392c8a115f
unified way to display remote shares and mail shares
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
77f74b9780
handle case if no share-by-mail share provider is loaded
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
a17c6a485d
add share by mail share provider
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
0a6f02801f
introduce share by mail, ui part
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
20f45e6fe4
[tx-robot] updated from transifex
2016-11-01 01:06:57 +00:00
8d83e239f3
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:45 +01:00
247b7f37ce
Color the trusted domain to alert the admin a bit more
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-31 12:22:21 +01:00
7f30cf9119
Remove config.php for oc.js
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-31 11:00:39 +01:00
6d2d069c17
[tx-robot] updated from transifex
2016-10-31 01:06:55 +00:00
a08a4b5981
Merge pull request #1955 from nextcloud/issue_#1776
...
Issue-1776: Add unshare function to 3-dot menu.
2016-10-30 11:27:57 +01:00
1187a8c183
[tx-robot] updated from transifex
2016-10-30 00:06:56 +00:00
bd7abc2d0a
restricted the height of the settings area in core/css/apps.css to max 80%
...
Signed-off-by: pgys <info@pexlab.space>
2016-10-29 17:50:51 +02:00
2d91831b50
Issue-1776: Add unshare function to 3-dot menu.
...
Signed-off-by: Julia Bode <julia.bode@lulisaur.us>
2016-10-29 17:07:06 +02:00
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
035890aeb1
[tx-robot] updated from transifex
2016-10-29 00:07:14 +00:00
740659a04c
Move away from OC_L10N
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-28 21:46:28 +02:00
ad597d498d
[tx-robot] updated from transifex
2016-10-28 00:07:11 +00:00
0a2e2f70f6
Merge pull request #1929 from nextcloud/share_email_to_OCS
...
Remove notify recipient function
2016-10-27 09:03:29 +02:00
7cae758ef9
Merge pull request #1930 from nextcloud/fix_avatars_exif
...
Fix avatar on exif rotated images
2016-10-27 08:56:56 +02:00
9984eba727
[tx-robot] updated from transifex
2016-10-27 00:07:01 +00:00
b05fe45d52
Fix avatar on exif rotated images
...
Fixes #1928
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-26 21:37:11 +02:00
57e61250ac
Remove notify recipient option
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-26 20:52:36 +02:00
a973c1bfb9
[tx-robot] updated from transifex
2016-10-26 00:07:12 +00:00
015affb082
Missing returns + autoloader file
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-25 22:13:09 +02:00
6dbe417c51
Inlince oc.js if possible!
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-25 22:03:18 +02:00
d5589a15d5
Move oc.js to a proper class
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-25 22:03:02 +02:00
08268bca39
Merge pull request #1891 from nextcloud/downstream-26430
...
add upgrade command before repair, handle NeedsUpgradeException better
2016-10-25 18:42:44 +02:00
89574367bc
Merge pull request #1871 from nextcloud/use-csp-nonces
...
Use CSP nonces
2016-10-25 14:46:00 +02:00
e23a298a81
[tx-robot] updated from transifex
2016-10-25 09:36:09 +00:00
890f752a6b
Merge pull request #1452 from nextcloud/appconfig-endpoint
...
Appconfig endpoint
2016-10-25 10:57:48 +02:00
79706e0ddc
Merge pull request #1283 from nextcloud/us_files-ui-webdav-upload
...
Use Webdav PUT for uploads
2016-10-25 10:31:03 +02:00
1ff328ae65
Merge pull request #1823 from nextcloud/filepicker-folder-fix
...
Fix picking a folder with the filepicker
2016-10-25 08:22:59 +02:00
60fa82d92f
Merge pull request #1860 from ryanwr/feature-sort-favorite
...
Sort favorite files first
2016-10-25 08:22:33 +02:00
44e9f5d5a1
Merge pull request #1850 from nextcloud/filepicker-empty-folder
...
show empty folder message in filepicker
2016-10-25 08:20:57 +02:00
f374eb5f1d
More fixes to file upload
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 21:45:00 +02:00
25d9dce067
JS utility function to compare paths
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-24 21:45:00 +02:00
3e96f33995
Sort favorite files first Issue #1802
...
Signed-off-by: Ryan Welch <ryantwr@gmail.com>
2016-10-24 17:55:47 +01:00
817729dc3f
add upgrade command before repair, handle NeedsUpgradeExcaption better
2016-10-24 17:52:49 +02:00
38b3ac8213
Add ContentSecurityPolicyNonceManager
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-24 16:35:31 +02:00
Lukas Reschke
Jan-Christoph Borchardt
Roeland Jago Douma
Bjoern Schiessle
John Molakvoæ (skjnldsv)
Nextcloud bot
Morris Jobke
John Molakvoæ
Joas Schilling
Julius Haertl
Roeland Jago Douma
Robin Appelman
Marius Blüm
Christoph Wurst
Felix A. Epp
Christoph Wurst
Andreas Hechenberger
Michael Grosser
pgys
Julia Bode
Vincent Petry
ryanwr
Jörn Friedrich Dreyer