aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | | | | | | | | | | | | | | | | Bump flake8-bugbear from 22.10.25 to 22.10.27Gravatar dependabot[bot]2022-10-27-5/+5
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.10.25 to 22.10.27. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.10.25...22.10.27) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
| * | | | | | | | | | | | | | | | | Clarify Code IntentionsGravatar Hassan Abouelela2022-10-28-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | Implicitly Close Client Using `with`Gravatar Hassan Abouelela2022-10-28-22/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | Use `casefold` Instead Of `lower`Gravatar Hassan Abouelela2022-10-28-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | Clean Up TypingGravatar Hassan Abouelela2022-10-28-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | Update pydis_site/apps/content/utils.pyGravatar Hassan Abouelela2022-10-28-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Johannes Christ <[email protected]>
| * | | | | | | | | | | | | | | | | Merge branch 'main' into bot-tagsGravatar Hassan Abouelela2022-10-27-164/+165
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]> # Conflicts: # poetry.lock # pyproject.toml
| * | | | | | | | | | | | | | | | | Merge branch 'main' into bot-tagsGravatar Hassan Abouelela2022-10-27-627/+768
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]> # Conflicts: # poetry.lock # pydis_site/settings.py # pyproject.toml
| * | | | | | | | | | | | | | | | | Rename Tag Model Author FieldGravatar Hassan Abouelela2022-08-23-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renames the tag model `author` field to `authors` to better indicate what's contained in the field, and updates the documentation. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | Support Hyperlinked Tag Group ReplacementGravatar Hassan Abouelela2022-08-23-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | Merge branch 'main' into bot-tagsGravatar Hassan Abouelela2022-08-23-7/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Clarify Tag Model DocstringGravatar Hassan Abouelela2022-08-23-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: ChrisJL <[email protected]>
| * | | | | | | | | | | | | | | | | | Improve Tag Commit NamingGravatar Hassan Abouelela2022-08-23-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Fix Tests For Tag MetadataGravatar Hassan Abouelela2022-08-16-29/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Fix Tag Metadata For Static BuildsGravatar Hassan Abouelela2022-08-16-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Better Split Up Tag Commit MessagesGravatar Hassan Abouelela2022-08-16-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add Tag MetadataGravatar Hassan Abouelela2022-08-16-25/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses the commit API to obtain tag metadata such as when it was last edited, and by whom. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Unify Tag Migrations & Add Commit ModelGravatar Hassan Abouelela2022-08-16-47/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Move GitHub strptime Format To SettingsGravatar Hassan Abouelela2022-08-16-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Update Tests For Tag GroupsGravatar Hassan Abouelela2022-08-14-24/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Change Hyperlink Color On HoverGravatar Hassan Abouelela2022-08-14-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add Tag Group SupportGravatar Hassan Abouelela2022-08-14-52/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for tag groups in content. This involves some modification to the routing, and templating. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Move Tag URL To Property And Add GroupGravatar Hassan Abouelela2022-08-14-10/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The URLs can be simply constructed using the other tag properties, so they were removed from the database in favor of a property. A group field was also added to support tags within groups. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Improve Tag CroppingGravatar Hassan Abouelela2022-08-13-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the tag cropping logic to the frontend, which makes it easier to crop without crossing boundaries such as link or code block boundaries. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Enable Code Highlighting On All Content PagesGravatar Hassan Abouelela2022-08-13-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Clean Up Tag Link SubstitutionGravatar Hassan Abouelela2022-08-13-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: ChrisJL <[email protected]> Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Set Link Color For Sub-elementsGravatar Hassan Abouelela2022-08-13-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add Tag View TestsGravatar Hassan Abouelela2022-08-13-4/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Export Tag Model As Top Level Model ObjectGravatar Hassan Abouelela2022-08-13-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add Content App To NavbarGravatar Hassan Abouelela2022-08-13-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add PyMDown ExtensionsGravatar Hassan Abouelela2022-08-13-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the python-markdown extension pack as it offers better support for things such as codeblocks. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add Tag Page TemplateGravatar Hassan Abouelela2022-08-13-5/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a template for the tag page itself, and add a route to use it. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add Tags To Content ListingsGravatar Hassan Abouelela2022-08-13-12/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds bot tags to the content page, as well as a model to go along with it. Signed-off-by: Hassan Abouelela <[email protected]>
| * | | | | | | | | | | | | | | | | | Add Setting For Static BuildsGravatar Hassan Abouelela2022-08-13-11/+11
| | |_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an explicit setting for static builds instead of relying on the environment variable. Signed-off-by: Hassan Abouelela <[email protected]>
| | | | * | | | | | | | | | | | | | Include users with no messages in response, and simplify response formatGravatar wookie1842022-11-17-13/+10
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Change the endpoint to be a POST not a GETGravatar wookie1842022-11-02-29/+13
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Add tests for metricity activity endpointGravatar wookie1842022-10-27-0/+100
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Add API endpoint for activity dataGravatar wookie1842022-10-27-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I really had to work against DRF to get this working. Using the validator manually here isn't ideal but I couldn't see an obvious better way without adding a bunch of boilerplate code. It seems to work.
| | | | * | | | | | | | | | | | | | Add metricity query for messages in past n daysGravatar wookie1842022-10-27-0/+28
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Takes multiple users for efficiency as we may want to calculate this for many users at once.
* | | | | | | | | | | | | | | | | Merge pull request #784 from python-discord/dependabot/pip/sentry-sdk-1.10.1Gravatar Xithrius2022-10-26-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Bump sentry-sdk from 1.9.10 to 1.10.1Gravatar dependabot[bot]2022-10-26-5/+6
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.9.10 to 1.10.1. - [Release notes](https://github.com/getsentry/sentry-python/releases) - [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-python/compare/1.9.10...1.10.1) --- updated-dependencies: - dependency-name: sentry-sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
* | | | | | | | | | | | | | | | | Merge pull request #781 from python-discord/dependabot/pip/pyjwt-2.6.0Gravatar Xithrius2022-10-26-23/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Bump pyjwt from 2.5.0 to 2.6.0Gravatar dependabot[bot]2022-10-26-23/+10
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [pyjwt](https://github.com/jpadilla/pyjwt) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/jpadilla/pyjwt/releases) - [Changelog](https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst) - [Commits](https://github.com/jpadilla/pyjwt/commits) --- updated-dependencies: - dependency-name: pyjwt dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
* | | | | | | | | | | | | | | | | Merge pull request #787 from python-discord/dependabot/pip/psycopg2-binary-2.9.5Gravatar Xithrius2022-10-26-62/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Bump psycopg2-binary from 2.9.4 to 2.9.5Gravatar dependabot[bot]2022-10-26-62/+71
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [psycopg2-binary](https://github.com/psycopg/psycopg2) from 2.9.4 to 2.9.5. - [Release notes](https://github.com/psycopg/psycopg2/releases) - [Changelog](https://github.com/psycopg/psycopg2/blob/master/NEWS) - [Commits](https://github.com/psycopg/psycopg2/commits) --- updated-dependencies: - dependency-name: psycopg2-binary dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
* | | | | | | | | | | | | | | | | Merge pull request #786 from ↵Gravatar Xithrius2022-10-26-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python-discord/dependabot/pip/flake8-bugbear-22.10.25
| * | | | | | | | | | | | | | | | Bump flake8-bugbear from 22.9.23 to 22.10.25Gravatar dependabot[bot]2022-10-25-7/+7
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.9.23 to 22.10.25. - [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) - [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.9.23...22.10.25) --- updated-dependencies: - dependency-name: flake8-bugbear dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
* | | | | | / / / / / / / / / / Update off-topic etiquette to reflect server size (#785)Gravatar Gustav Odinger2022-10-25-1/+1
| |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | With more than 350k members, saying that we have “tens of thousands of members” seems like an understatement.
* | | | | | | | | | | | | | | Merge pull request #780 from python-discord/repo-token-removeGravatar Xithrius2022-10-13-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | `REPO_TOKEN` env var obliteratedGravatar Xithrius2022-10-12-1/+0
|/ / / / / / / / / / / / / / /