Ralf Becker
|
ca73a54d89
|
* Security: allow to configure SameSite cookie attribute
|
2020-07-27 14:03:48 +02:00 |
|
nathangray
|
7c2ff113cb
|
Admin: Turn on password suggest for admin edit account
|
2020-07-24 14:59:19 -06:00 |
|
Ralf Becker
|
2c489ef5b8
|
change default for password attribute plaintext back to true, to not break every existing usage of that widget
|
2020-06-16 08:37:51 +02:00 |
|
nathangray
|
d7d5837ecf
|
Nicer password widget on account edit dialog
- Added plain-text attribute to avoid encrypting password
- Suggest password now fills both fields the same
|
2020-06-15 16:08:24 -06:00 |
|
nathangray
|
836a3b07e3
|
Mail: Only show EPL version needed blur if EPL is not available
|
2020-06-08 13:30:57 -06:00 |
|
nathangray
|
b398935fd6
|
* Preferences: Fix delete personal category required admin permission
|
2020-06-03 15:45:25 -06:00 |
|
Ralf Becker
|
28fb99ba51
|
fix typo preventing account creation or update: "password do not match"
|
2020-03-23 16:14:22 +01:00 |
|
Ralf Becker
|
f0f4fd2ee3
|
fix to allow setting "anonymous" flag for other accounts and try to fix Chrome autocomplete
|
2020-03-21 14:38:32 +01:00 |
|
Hadi Nategh
|
b8d36ce2b0
|
Apply large title again to account delete dialogHeader
|
2020-02-18 11:41:57 +01:00 |
|
Hadi Nategh
|
b058051170
|
Rearrange admin delete dialog
|
2020-02-18 11:29:24 +01:00 |
|
Hadi Nategh
|
c9ccb313ba
|
Fix delete user dialog style
|
2020-02-17 17:43:26 +01:00 |
|
Ralf Becker
|
7b30bb7b0d
|
* Admin: optional session-action column in access-log and sessions
also no longer update access-log in session-class destructor, as it fails with skipping permanent logging for WebDAV and others
|
2019-12-14 13:09:22 +02:00 |
|
Hadi Nategh
|
77dba49f9e
|
Fix double scrollbar in edit acl dialog
|
2019-11-27 13:57:17 +01:00 |
|
nathangray
|
d8faef3503
|
Admin: Extend Vfs::deleteAccount hook to all the files it can find, not just home dir.
|
2019-11-07 13:46:14 -07:00 |
|
Ralf Becker
|
5d8afa96c9
|
* Statistik: add maintenance release version and docker install type
|
2019-10-29 13:09:06 +01:00 |
|
nathangray
|
60ab28fd0e
|
Missing translations reported by Stefan Unverricht
|
2019-08-27 15:43:58 -06:00 |
|
Hadi Nategh
|
a76dd729be
|
Hide groups template on initialization (since it's getting disabled on et2_ready after nm resized) otherwise nm resize takes its raw height into account which breaks users list size
|
2019-08-06 10:45:36 +02:00 |
|
Ralf Becker
|
2776d215e2
|
* Login: RememberMe token for either automatic login or as 2. factor for 2-Factor-Auth
|
2019-08-03 18:37:18 +02:00 |
|
nathangray
|
374ebecb2e
|
Admin - better sizing on delete account popup to avoid scrollbar
|
2019-07-22 15:45:25 -06:00 |
|
nathangray
|
f160c697e4
|
Admin - When deleting a user, separately list apps that cannot handle it through hook
|
2019-07-22 15:11:09 -06:00 |
|
nathangray
|
aefa8258a1
|
Admin - Ask which apps to transfer (others are discarded) when deleting account
|
2019-07-19 14:31:27 -06:00 |
|
nathangray
|
4592a81958
|
Admin - Make delete warning bold
|
2019-07-08 14:03:18 -06:00 |
|
nathangray
|
2737ae2b99
|
Admin - delete account - add missing lines about mail & filemanager
|
2019-06-24 09:17:22 -06:00 |
|
nathangray
|
7306cc36ab
|
Admin - Add warning about deleting all records if nobody is selected to account delete popup
|
2019-06-21 09:36:07 -06:00 |
|
nathangray
|
e08247d60a
|
Admin - show a count of how many entries a user owns in delete dialog
|
2019-06-19 10:34:09 -06:00 |
|
Ralf Becker
|
ad3576903a
|
allow to disable or require 2-Factor-Auth
|
2019-06-07 20:28:49 +02:00 |
|
Ralf Becker
|
914de29859
|
improve user-agent formatting and use is also for accesslog
|
2019-06-05 18:18:23 +02:00 |
|
nathangray
|
34efaaa274
|
Add documentation tab when deleting custom application type
|
2019-05-22 09:35:20 -06:00 |
|
Hadi Nategh
|
84e4a6d1ce
|
WIP of admin cmds template:
- Fix splitter bar background
|
2019-05-09 15:50:10 +02:00 |
|
Hadi Nategh
|
73eda7ec30
|
WIP of admin cmds template:
- fix template for admin cmds
|
2019-05-09 12:24:45 +02:00 |
|
Hadi Nategh
|
1a69912a9c
|
WIP of admin cmds template:
- fix wrong class name
|
2019-05-09 11:50:28 +02:00 |
|
nathangray
|
4fe4e0a553
|
Fix deleting category from edit dialog didn't work
|
2019-05-08 14:32:53 -06:00 |
|
nathangray
|
d046cf67fd
|
Fix deleting category from edit dialog didn't work
|
2019-05-08 14:31:50 -06:00 |
|
Hadi Nategh
|
ff84674275
|
WIP of admin cmds template
|
2019-05-08 18:42:37 +02:00 |
|
nathangray
|
7915bfd5b2
|
Add documentation tab to deleting ACL
|
2019-05-07 15:23:34 -06:00 |
|
nathangray
|
25f073a0b7
|
Changes for Policy
- Add tab to edit category dialog
- Change delete context menu action to use popup instead of dialog
|
2019-05-03 14:45:40 -06:00 |
|
Ralf Becker
|
bf2de7f653
|
* Admin: white-list IP addresses from blocking or set higher number of attempts
|
2019-04-26 17:11:54 +02:00 |
|
nathangray
|
e44b302609
|
Add documentation tab to customfield edits
|
2019-04-09 14:48:44 -06:00 |
|
Hadi Nategh
|
08ac18c4db
|
Apply new style for row selection and hover
|
2019-04-03 11:26:32 +02:00 |
|
nathangray
|
1c8db476f3
|
Missing or not translated phrases from Stefan Unverricht
|
2019-03-29 09:22:06 -06:00 |
|
Hadi Nategh
|
266d4ebd70
|
Some more styling changes:
- Add png version of app icons
- Add nm header column selection icon
|
2019-03-26 12:21:33 +01:00 |
|
Hadi Nategh
|
f3b0362653
|
Remove extra navbar icons from mobile template
|
2019-03-21 16:43:23 +01:00 |
|
Hadi Nategh
|
d8d6d4d247
|
Apply new app color codes
|
2019-03-21 11:53:37 +01:00 |
|
nathangray
|
ee70e699e2
|
Get a nice history for admin_cmd_edit_user
|
2019-03-18 16:32:54 -06:00 |
|
Ralf Becker
|
8c6fc0f4d5
|
WIP admin history
|
2019-03-14 18:57:07 +01:00 |
|
Hadi Nategh
|
3304322c6c
|
Revert commit 39135d8d42 and use nextmatch-customfilter instead
|
2019-03-14 09:51:30 +01:00 |
|
Hadi Nategh
|
39135d8d42
|
Fix Application column selection for admin queue and history
|
2019-03-13 10:55:48 +01:00 |
|
Ralf Becker
|
21962bdfe4
|
WIP admin history
|
2019-03-12 17:13:36 +01:00 |
|
Hadi Nategh
|
16ea4e6e8d
|
Fix upload header logo label and translations
|
2019-03-08 15:06:02 +01:00 |
|
Hadi Nategh
|
1ec869538d
|
Allow style tag in content of main/login messages
|
2019-03-05 14:08:19 +01:00 |
|
Hadi Nategh
|
e90808ac2b
|
Move minifying option into general tab
|
2019-01-15 11:41:10 +01:00 |
|
Hadi Nategh
|
4e59184d00
|
Fix translations for Home screen
|
2018-12-20 16:06:12 +01:00 |
|
Hadi Nategh
|
d9e1ddf506
|
W.I.P. of modern theme with SVG icons enabled:
- add colored svg navbars
|
2018-12-11 16:52:55 +01:00 |
|
Hadi Nategh
|
ec1c6360f0
|
Switch main and login screen positions and add some description regarding default page
|
2018-11-06 17:12:32 +01:00 |
|
Hadi Nategh
|
28f270e98c
|
W.I.P. migration of mainscreen to et2:
- Delete no longer used old template
|
2018-10-30 12:07:05 +01:00 |
|
Hadi Nategh
|
e6735f635d
|
W.I.P. migration of mainscreen to et2:
- Fix extra space added when save the entry
- Fix htmlarea not getting a right height when is in inactive tab
|
2018-10-30 12:02:55 +01:00 |
|
Hadi Nategh
|
631e554d56
|
W.I.P. migration of mainscreen to et2:
- Fix data not being loaded on initiation
|
2018-10-29 17:50:55 +01:00 |
|
Hadi Nategh
|
c9ec548a53
|
W.I.P. migration of mainscreen to et2
|
2018-10-26 16:39:55 +02:00 |
|
Hadi Nategh
|
1cbd0aa2a3
|
W.I.P. implementing TinyMCE editor and deprecating CKEditor
|
2018-10-19 16:35:18 +02:00 |
|
Ralf Becker
|
610f44559f
|
fix PHP 7.2 Warning: Use of undefined constant in xet files: {$cont[nm][something]} --> {$cont['nm']['something']}
|
2018-10-19 09:46:54 +02:00 |
|
nathangray
|
522b30c62e
|
Add type and comment columns to command log
|
2018-10-09 11:54:50 -06:00 |
|
nathangray
|
d7c5dc71cf
|
Admin - add filter for periodic runs
- Store & display exec results for periodic runs
|
2018-09-25 13:17:52 -06:00 |
|
nathangray
|
63fddef20b
|
Run ACL changes through an admin_cmd
|
2018-08-24 12:03:19 -06:00 |
|
Hadi Nategh
|
b4b2b9d5d2
|
Implement an admin-config setting to be able to disable PGP encryption feature
|
2018-08-23 16:58:14 +02:00 |
|
Ralf Becker
|
c93719bc02
|
allow to document group deletion
|
2018-08-23 15:25:49 +02:00 |
|
Ralf Becker
|
51166dc338
|
allow to document account deletion
|
2018-08-23 12:11:33 +02:00 |
|
Ralf Becker
|
b1b31e2b0b
|
fix not working admin >> site configuration
|
2018-08-20 17:27:11 +02:00 |
|
Ralf Becker
|
e50ef193a5
|
allow application config to use tabs and fall back to (empty) tabs widget in admin.site-config
|
2018-08-17 14:39:27 +02:00 |
|
Ralf Becker
|
e53482289a
|
fix not displayed requrested and comment
|
2018-08-03 15:38:34 +02:00 |
|
Ralf Becker
|
7f662f8f70
|
fix edit user to log old values and only run if there is any change
|
2018-08-03 11:56:34 +02:00 |
|
Hadi Nategh
|
5333be69b3
|
Fix acl dialog gets scrollbar when editing rights
|
2018-07-06 14:33:40 +02:00 |
|
Hadi Nategh
|
f586b9e6e9
|
Add more rows to category selection in global category edit dialog
|
2018-06-18 11:50:37 +02:00 |
|
Hadi Nategh
|
0d806be6fe
|
Make category owner a taglist selection
|
2018-06-08 16:43:38 +02:00 |
|
Ralf Becker
|
84b715c5af
|
* Admin: allow to show last login, IP and password change in list
|
2018-06-01 14:46:52 +02:00 |
|
Hadi Nategh
|
e9f1e8bcad
|
Implement taglist-thumbnail for rest of upload image fields in admin site configuration
|
2018-05-29 11:05:08 +02:00 |
|
Hadi Nategh
|
b205e2f4a2
|
Implement new kind of taglist to show thumbnail of set value
|
2018-05-28 17:41:52 +02:00 |
|
Hadi Nategh
|
6aeb7a5c1e
|
* Admin: Implement new feature to upload multiple images for login background image in site-configuration and show them randomly.
|
2018-05-28 15:31:32 +02:00 |
|
Hadi Nategh
|
fefe0e803f
|
Exclude more apps from mobile available app list
|
2018-05-25 16:58:13 +02:00 |
|
Hadi Nategh
|
6c9cf51a00
|
* Admin: Exclude not supported apps from mobile's available app list
|
2018-05-22 14:41:08 +02:00 |
|
nathangray
|
8082ce4c65
|
Fix missing icon on Category change owner cancel button
|
2018-05-14 13:40:58 -06:00 |
|
Ralf Becker
|
ba366467b0
|
* Admin/Mail: fix saving mail-accounts for multiple accounts
|
2018-05-04 15:07:06 +02:00 |
|
nathangray
|
709c4e4f1f
|
Fix some translation problems, reported by Stefan Unverricht
|
2018-04-16 09:32:48 -06:00 |
|
Ralf Becker
|
e72c7c76b6
|
* EMail/sMime: allow non-admin users to upload their keys
|
2018-04-10 13:15:09 +02:00 |
|
Ralf Becker
|
8b88e748f7
|
* Admin: new config to generate no or lowercase email addresses for new users
|
2018-02-20 09:15:42 +01:00 |
|
nathangray
|
cf2b759054
|
* Admin - fix group list filter & sort
- Remove created & modified columns since they're not stored for groups
- Fix email sort
- Fix search returned all results
|
2018-01-30 11:28:27 -07:00 |
|
nathangray
|
504e70ae82
|
Fix missing translations, found by Stefan Unverricht
Also fix a design complaint
|
2018-01-29 16:31:58 -07:00 |
|
Hadi Nategh
|
62b00b3f75
|
Add/fix some translations
|
2018-01-04 11:34:26 +01:00 |
|
Hadi Nategh
|
8b6acb00fa
|
* Admin: fix site-config not working in mobile template
|
2018-01-03 15:01:45 +01:00 |
|
nathangray
|
71a7609b34
|
* Admin - update config to show correct default values
|
2017-12-05 11:01:57 -07:00 |
|
nathangray
|
8114d14e36
|
* Admin - ACL dialog - fix ACL levels not updated when changing app or user
|
2017-11-17 10:05:46 -07:00 |
|
nathangray
|
6272adfa16
|
Make group members & applications fully visible when printing
|
2017-10-30 10:14:50 -06:00 |
|
Ralf Becker
|
5d6deed27d
|
add token to deny access
|
2017-10-27 16:22:56 +02:00 |
|
Hadi Nategh
|
fdb3202b6b
|
Add new config to the admin site configuration in order to be able to upload a custom header logo
|
2017-10-23 13:23:52 +02:00 |
|
nathangray
|
7e4570d46f
|
Admin - Add a group list
|
2017-09-19 11:11:21 -06:00 |
|
Hadi Nategh
|
ef50e36b49
|
Fix toolbar button in mail account dialog for mobile view
|
2017-09-14 12:03:11 +02:00 |
|
Hadi Nategh
|
3882293c85
|
S/MIME:
- Implement encryption tab in mail account dialog for mobile view
|
2017-09-14 11:50:06 +02:00 |
|
Hadi Nategh
|
1d24707143
|
S/MIME:
- Allow user to upload certificate even for readonly account
- Allow user to delete certificate
|
2017-09-13 16:05:43 +02:00 |
|
Hadi Nategh
|
3f06a89db5
|
S/MIME:
- Store full binary (pkcs12) certificate into credentials
- Extract cacert from pkcs12 and feed it into signing process
- Implement p12 export
|
2017-08-30 17:00:28 +02:00 |
|
Hadi Nategh
|
63440ddbc5
|
S/MIME:
- Keep private key encrypted
- Show password field always
|
2017-08-24 18:15:40 +02:00 |
|
Hadi Nategh
|
7dc5c2e2b0
|
W.I.P. S/MIME:
- Make p12 password field visible after file gets uploaded
- Add icons to operational buttons
- Fix some of the misalignments
|
2017-08-23 11:19:20 +02:00 |
|
Hadi Nategh
|
bbea403298
|
W.I.P S/MIME:
- Generate private key and certificate
- Add export buttons for private key and certificate
- Add certificate field
|
2017-08-22 17:25:29 +02:00 |
|
Ralf Becker
|
a839e46965
|
fix fatal error if sambaadmin is not installed, but was before (fix typo in template)
|
2017-07-12 18:50:36 +02:00 |
|
Ralf Becker
|
79c1d2e41c
|
* Admin/EMail: allow admins to always add arbitrary aliases, even if not allowed for regular user
|
2017-07-12 18:43:05 +02:00 |
|
Ralf Becker
|
a9e750c8b2
|
WIP spam workflow and SpamTitian integration
|
2017-05-31 15:10:58 +02:00 |
|
Hadi Nategh
|
9f98d0fe56
|
WIP of background & logo image upload into instance dir:
- Add some translation
- Add filemtime timestamp into url
|
2017-04-28 16:30:01 +02:00 |
|
Hadi Nategh
|
c55e0bdae3
|
WIP of background & logo image upload into instance dir:
- Generate url for anon_images.php
|
2017-04-28 12:40:33 +02:00 |
|
Hadi Nategh
|
33bc6f6ce0
|
WIP of background & logo image upload into instance dir
|
2017-04-27 16:50:35 +02:00 |
|
nathangray
|
e34e679733
|
Fix unable to add ACLs
|
2017-03-09 08:55:13 -07:00 |
|
Hadi Nategh
|
262d245029
|
WIP of modern login page:
- Add login_background option to admin site configuration
|
2017-02-10 16:02:32 +01:00 |
|
Hadi Nategh
|
c4245111e5
|
Fix mail account dialog always gets scrollbar
|
2017-02-10 11:18:20 +01:00 |
|
Hadi Nategh
|
c78042d522
|
Update PUBLIC ID of etemplate2.dtd in all templates
|
2017-02-01 09:59:37 +01:00 |
|
Hadi Nategh
|
34e04a1315
|
WIP of SMIME support: Implement an interface for importing smime private key into mail account
|
2017-01-25 18:06:17 +01:00 |
|
Hadi Nategh
|
5f4fc359be
|
Implement google recaptcha for sitemanager forms
|
2016-12-09 10:32:56 +01:00 |
|
Ralf Becker
|
74e2c62b48
|
* Admin/Mail: allow to limit users to only create identities for aliases
|
2016-10-28 14:27:59 +02:00 |
|
Ralf Becker
|
9b77cd9971
|
fix documentation where to put log to api/templates/default/images
|
2016-09-19 10:16:56 +02:00 |
|
Ralf Becker
|
f987caa5c2
|
* Admin: warn admin if passwords for new accounts / password reset lack in strength
|
2016-08-12 13:47:01 +02:00 |
|
Ralf Becker
|
3752c35a5a
|
add ajax=true to diverse admin pages of apps, changing customfields class to autoloadable admin_customfields (with old class extending new one, just in case), fix wrong English phrase "typ" in infolog
|
2016-08-12 11:35:30 +02:00 |
|
nathangray
|
7c3d97ba12
|
Load app hooks with ajax=true into a div instead of an iframe
|
2016-06-29 09:48:54 -06:00 |
|
Hadi Nategh
|
b14b3dcddc
|
Update css files with running new LESS version
|
2016-05-19 13:44:07 +02:00 |
|
Ralf Becker
|
51731f2e9b
|
fix admin_statistics to use eT2
|
2016-05-14 12:40:15 +02:00 |
|
Hadi Nategh
|
d290485058
|
Nm resize fix:
- Fix dataview grid resize not taking care of category color border
- Fix Category borders make headers misaligned
|
2016-05-11 16:33:54 +00:00 |
|
Ralf Becker
|
08549368a0
|
fix custom translations to use eT2
|
2016-05-08 12:23:54 +00:00 |
|
Ralf Becker
|
b4148d1b5a
|
port "Admin Queue and History" and "Remote Administration Instances" to eT2
|
2016-05-07 16:57:18 +00:00 |
|
Ralf Becker
|
b06fc3f3e1
|
no more dynamic minifying
|
2016-04-30 14:30:38 +00:00 |
|
Klaus Leithoff
|
8e02180904
|
* Mail: allow to define an existing folder as archive folder and allow to move messages to the specified folder with either right-click action or EGW-shortcut
|
2016-04-29 11:23:05 +00:00 |
|
Ralf Becker
|
c14f25c0e8
|
hide spellchecker config and always use browser native spellchecker
|
2016-04-25 20:14:47 +00:00 |
|
Ralf Becker
|
220aacf48b
|
no longer allow to use lang syntax %1 in eT2 instead of native %s, as it does not allow to use %1 and costs unnecessary performance
|
2016-04-25 15:15:02 +00:00 |
|
Ralf Becker
|
1742ebf6f1
|
use new et2 config
|
2016-04-24 13:41:36 +00:00 |
|
Hadi Nategh
|
103141312e
|
Mobile theme:
- Implement categories list and edit view
|
2016-04-22 14:42:06 +00:00 |
|
Ralf Becker
|
37f61b1f03
|
move admin >> Site config to new et2 based site-config
|
2016-04-21 16:39:59 +00:00 |
|
Ralf Becker
|
22701ce83f
|
WIP et2 based site configuration
|
2016-04-20 18:52:55 +00:00 |
|
Hadi Nategh
|
28a59d0d29
|
Styling in addressbook edit dialog
- Fix alignments for account tab
|
2016-04-11 07:44:49 +00:00 |
|
Hadi Nategh
|
50aae863b6
|
Edit dialogs style W.I.P.:
- Give tab widget new look
- Style grid header different
- Re-design calendar edit dialog
- Some fixes for multi et2_taglist
|
2016-04-06 16:43:51 +00:00 |
|
Ralf Becker
|
00abda4682
|
moving emailadmin to api and admin, only emailadmin_hooks and tables still need moving
|
2016-03-28 18:51:38 +00:00 |
|
Hadi Nategh
|
f5a6d52ae2
|
Mobile theme:
- Implement apps color code
|
2016-03-09 11:55:26 +00:00 |
|
Ralf Becker
|
c0e3684806
|
move [+ Add] button to left of NM header
|
2016-03-09 10:14:48 +00:00 |
|
Ralf Becker
|
0493ca041c
|
nicer UI to select apps for mobile device and not storing default, to allow chaning it, when more apps become available
|
2016-03-09 09:29:13 +00:00 |
|
Hadi Nategh
|
073144dd92
|
Mobile theme W.I.P.:
- Add list of enabled apps for mobile template as a site configuration option in admin
|
2016-03-08 09:59:18 +00:00 |
|
Hadi Nategh
|
1fffd4bc32
|
Mobile theme W.I.P:
- Fix first column shrinks when open some tabs
|
2016-03-07 10:55:04 +00:00 |
|
Hadi Nategh
|
64cd481e98
|
Mobile theme W.I.P:
- Fix admin account tab
- Switch category tree to taglist-cat for addressbook
|
2016-03-04 13:54:29 +00:00 |
|
Ralf Becker
|
0bc507ca7e
|
remove invalid / not working style
|
2016-03-04 13:15:35 +00:00 |
|
Ralf Becker
|
91f3671be4
|
fix [Add] button in ACL and render it as popup, needs fixing of scrollbars shown
|
2016-02-25 08:42:33 +00:00 |
|
Hadi Nategh
|
845e37e66d
|
SVG images W.I.P.:
- Add svg icons
- Implement color change for stylesheet2svg script
|
2016-02-23 18:49:14 +00:00 |
|
Hadi Nategh
|
c008c6ef70
|
Mobile theme W.I.P.:
-Fix broken add buttons
|
2016-02-17 12:09:34 +00:00 |
|
Ralf Becker
|
60d41a7a48
|
WIP aligning nextmatch header and styling it as toolbar
|
2016-02-16 17:18:02 +00:00 |
|
Ralf Becker
|
1f762e92b2
|
put an [Add] button left of nm-header
|
2016-02-15 12:00:26 +00:00 |
|
Hadi Nategh
|
f52c965cbe
|
Mobile theme W.I.P.:
- Fix addressbook edit gets x-scrollbar
|
2016-02-05 09:43:26 +00:00 |
|
Hadi Nategh
|
c7aaaa766e
|
Mobile theme W.I.P.:
- Implement account tab for admin
|
2016-02-03 11:45:03 +00:00 |
|
Hadi Nategh
|
9332ce4a80
|
Mobile theme WIP:
- Add plus button for all apps list views
|
2016-01-14 10:56:48 +00:00 |
|
Hadi Nategh
|
f6cc24cb15
|
Mobile theme W.I.P.:
-Implement listview templates for projectmanager list and admin
|
2015-12-08 18:07:02 +00:00 |
|