Andrew Chen Wang
1fa5d79813
Add "defer" for inline Javascript
...
* Also utilize ECMAScript 6, 2015 syntax
2020-11-14 10:27:14 -05:00
Bruno Alla
4b25e77297
Merge pull request #2932 from umgelurgel/jm/upgrade-factory-boy-to-3.1
...
Upgrade factory-boy to 3.1.0
2020-11-13 09:59:43 +00:00
Bruno Alla
ca2628fe09
Merge pull request #2933 from pydanny/pyup-update-sentry-sdk-0.19.2-to-0.19.3
...
Update sentry-sdk to 0.19.3
2020-11-13 09:58:23 +00:00
pyup-bot
eca1f45564
Update sphinx from 3.3.0 to 3.3.1
2020-11-12 13:10:45 -08:00
pyup-bot
aaaa26494a
Update sentry-sdk from 0.19.2 to 0.19.3
2020-11-12 13:10:42 -08:00
umgelurgel
9f3117c615
Upgrade factory-boy to 3.1.0
2020-11-12 18:53:29 +01:00
pyup-bot
3750aff394
Update djangorestframework from 3.12.1 to 3.12.2
2020-11-05 17:50:07 -08:00
Andrew Chen Wang
72da0bfa9c
Fix docs service and add RTD support ( #2920 )
...
Co-authored-by: Andrew-Chen-Wang <Andrew-Chen-Wang@users.noreply.github.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
2020-11-04 17:17:02 +00:00
Andrew-Chen-Wang
607c9676f5
Use defer for script tags ( Fix #2922 )
...
* This way, scripts from external URLs are loaded asynchronously. By putting it at the top of the file, the browser parses it first, downloads it while continuing to parse the HTML, and then executes on parsing finish
* Additionally, developers will not need to use $(window).ready() or the like in their files anymore.
* Added inline_javascript tag in case anyone wants to use the bottom of the HTML page to execute some Javascript. Using defer here has no effect as inline scripts defer by default
Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
2020-11-04 11:54:21 -05:00
Bruno Alla
4e7c86fe51
Merge pull request #2908 from pydanny/update/pre-commit-autoupdate
...
Auto-update pre-commit hooks
2020-11-04 09:42:11 +00:00
github-actions[bot]
63ea6bca76
Auto-update pre-commit hooks
2020-11-04 00:19:56 +00:00
Bruno Alla
9e9228d5f9
Merge remote-tracking branch 'origin/pyup-update-django-stubs-1.6.0-to-1.7.0' into update/mypy-stubs
...
# Conflicts:
# {{cookiecutter.project_slug}}/requirements/local.txt
2020-11-03 23:39:09 +00:00
Bruno Alla
a68b987f74
Merge remote-tracking branch 'origin/pyup-update-mypy-0.782-to-0.790' into update/mypy-stubs
2020-11-03 23:38:46 +00:00
Bruno Alla
5f913c0018
Merge pull request #2926 from pydanny/pyup-update-sentry-sdk-0.19.1-to-0.19.2
...
Update sentry-sdk to 0.19.2
2020-11-03 23:34:22 +00:00
Bruno Alla
f20a49cfb0
Merge pull request #2925 from pydanny/pyup-update-sphinx-3.2.1-to-3.3.0
...
Update sphinx to 3.3.0
2020-11-03 23:34:06 +00:00
Bruno Alla
574aa1fee2
Merge pull request #2924 from pydanny/pyup-update-django-3.0.10-to-3.0.11
...
Update django to 3.0.11
2020-11-03 23:33:45 +00:00
Bruno Alla
923d81061b
Merge pull request #2923 from pydanny/pyup-update-pytz-2020.1-to-2020.4
...
Update pytz to 2020.4
2020-11-03 23:33:34 +00:00
Bruno Alla
e33476082c
Merge pull request #2919 from pydanny/pyup-update-pre-commit-2.7.1-to-2.8.2
...
Update pre-commit to 2.8.2
2020-11-03 23:33:26 +00:00
Bruno Alla
a22eb3eabd
Merge pull request #2917 from pydanny/pyup-update-pytest-6.1.1-to-6.1.2
2020-11-03 23:32:57 +00:00
Bruno Alla
0dad87553a
Merge pull request #2911 from pydanny/pyup-update-pytest-django-4.0.0-to-4.1.0
...
Update pytest-django to 4.1.0
2020-11-03 23:32:29 +00:00
Bruno Alla
6f3940b9c7
Merge pull request #2910 from pydanny/pyup-update-pillow-8.0.0-to-8.0.1
...
Update pillow to 8.0.1
2020-11-03 23:32:12 +00:00
Bruno Alla
37be877a9b
Merge pull request #2907 from pydanny/pyup-update-django-celery-beat-2.0.0-to-2.1.0
...
Update django-celery-beat to 2.1.0
2020-11-03 23:31:54 +00:00
pyup-bot
4a5717c831
Update sentry-sdk from 0.19.1 to 0.19.2
2020-11-02 15:47:08 -08:00
pyup-bot
2bd2e4a8fc
Update sphinx from 3.2.1 to 3.3.0
2020-11-02 06:37:22 -08:00
pyup-bot
510ba4ca8a
Update django from 3.0.10 to 3.0.11
2020-11-02 06:37:19 -08:00
pyup-bot
b86ede6079
Update pytz from 2020.1 to 2020.4
2020-11-02 06:37:16 -08:00
pyup-bot
b14a033c8b
Update pre-commit from 2.7.1 to 2.8.2
2020-10-30 15:44:46 -07:00
pyup-bot
5224641a16
Update pytest from 6.1.1 to 6.1.2
2020-10-28 23:59:03 -07:00
pyup-bot
9c0f056817
Update django-stubs from 1.6.0 to 1.7.0
2020-10-28 02:10:16 -07:00
pyup-bot
edbc4d3a8c
Update pytest-django from 4.0.0 to 4.1.0
2020-10-22 15:52:35 -07:00
pyup-bot
eb400e4980
Update pillow from 8.0.0 to 8.0.1
2020-10-22 15:52:32 -07:00
pyup-bot
8e229ce0e0
Update django-celery-beat from 2.0.0 to 2.1.0
2020-10-19 23:39:07 -07:00
pyup-bot
81c9a4a76a
Update uvicorn from 0.12.1 to 0.12.2
2020-10-19 09:13:14 -07:00
pyup-bot
3d87a42055
Update sentry-sdk from 0.19.0 to 0.19.1
2020-10-19 03:32:37 -07:00
Bruno Alla
c4f46d0526
Merge pull request #2901 from pydanny/pyup-update-django-allauth-0.42.0-to-0.43.0
...
Update django-allauth to 0.43.0
2020-10-17 12:42:02 +01:00
pyup-bot
58b0359af6
Update pytest-django from 3.10.0 to 4.0.0
2020-10-16 10:36:51 -07:00
pyup-bot
4ecc00ea6c
Update django-allauth from 0.42.0 to 0.43.0
2020-10-15 12:30:53 -07:00
pyup-bot
4e6cc3ca60
Update pillow from 7.2.0 to 8.0.0
2020-10-14 15:58:12 -07:00
Bruno Alla
100c06f078
Merge pull request #2897 from pydanny/update/pre-commit-autoupdate
...
Auto-update pre-commit hooks
2020-10-14 11:46:41 +01:00
github-actions[bot]
a26d57a6e7
Auto-update pre-commit hooks
2020-10-14 00:29:18 +00:00
pyup-bot
acaeb0d950
Update sentry-sdk from 0.18.0 to 0.19.0
2020-10-13 05:31:37 -07:00
github-actions[bot]
62b20fd906
Auto-update pre-commit hooks
2020-10-12 00:29:27 +00:00
Bruno Alla
1e52382011
Merge pull request #2890 from pydanny/update/pre-commit-autoupdate
...
Auto-update pre-commit hooks
2020-10-11 15:27:18 +01:00
github-actions[bot]
8faa1e478b
Auto-update pre-commit hooks
2020-10-11 00:29:47 +00:00
pyup-bot
e043af811a
Update django-anymail from 8.0 to 8.1
2020-10-09 13:11:03 -07:00
pyup-bot
55a6674d0c
Update django-anymail from 8.0 to 8.1
2020-10-09 13:11:02 -07:00
pyup-bot
edd29c3982
Update django-anymail from 8.0 to 8.1
2020-10-09 13:11:01 -07:00
pyup-bot
ae526ad8df
Update django-anymail from 8.0 to 8.1
2020-10-09 13:11:00 -07:00
pyup-bot
fa2f09f27d
Update django-anymail from 8.0 to 8.1
2020-10-09 13:10:59 -07:00
pyup-bot
d0d50fe800
Update django-anymail from 8.0 to 8.1
2020-10-09 13:10:58 -07:00
pyup-bot
dee930cad5
Update django-anymail from 8.0 to 8.1
2020-10-09 13:10:58 -07:00
pyup-bot
be74011ba5
Update django-anymail from 8.0 to 8.1
2020-10-09 13:10:57 -07:00
pyup-bot
44689a8be6
Update django-anymail from 8.0 to 8.1
2020-10-09 13:10:56 -07:00
pyup-bot
21c69c7d45
Update mypy from 0.782 to 0.790
2020-10-09 12:09:05 -07:00
github-actions[bot]
90a0b16ae4
Auto-update pre-commit hooks
2020-10-09 00:27:59 +00:00
Andrew Chen Wang
7be855975b
Add dedicated websockets package
...
Ref: https://github.com/encode/uvicorn/issues/797
There used to be a package automatically installed; not anymore I guess. This came from a separate package and not cookiecutter-django, but the installation was similar.
2020-10-07 12:33:00 -04:00
pyup-bot
6e3f6acf07
Update pytest from 6.1.0 to 6.1.1
2020-10-04 06:03:31 -07:00
Bruno Alla
a5ab4ae1cb
Merge pull request #2874 from pydanny/mypy-django-stubs
...
Update mypy and django-stubs
2020-10-04 12:13:57 +01:00
Bruno Alla
b8012a54d2
Merge pull request #2876 from pydanny/update/pre-commit-autoupdate
...
Auto-update pre-commit hooks
2020-10-04 12:13:23 +01:00
pyup-bot
42b41b7215
Update flake8 from 3.8.3 to 3.8.4
2020-10-02 17:27:05 -07:00
github-actions[bot]
f1e87f264d
Auto-update pre-commit hooks
2020-10-03 00:26:55 +00:00
Bruno Alla
26f2a3d7ba
Fix mypy error
...
my_awesome_project/users/admin.py:15: error: No overload variant of "__add__" of "tuple" matches argument type "List[Tuple[Optional[str], _FieldOpts]]"
my_awesome_project/users/admin.py:15: note: Possible overload variants:
my_awesome_project/users/admin.py:15: note: def __add__(self, Tuple[Tuple[str, Dict[str, Tuple[str]]], ...]) -> Tuple[Tuple[str, Dict[str, Tuple[str]]], ...]
my_awesome_project/users/admin.py:15: note: def __add__(self, Tuple[Any, ...]) -> Tuple[Any, ...]
my_awesome_project/users/admin.py:15: note: Right operand is of type "Union[Tuple[Tuple[Optional[str], _FieldOpts], ...], List[Tuple[Optional[str], _FieldOpts]]]"
2020-10-01 20:01:26 +01:00
Bruno Alla
689c768abf
Fix mypy error
...
users/tests/test_views.py:67: error: unused 'type: ignore' comment
2020-10-01 19:16:22 +01:00
Bruno Alla
ef48467458
Merge pull request #2873 from pydanny/pyup-update-ipdb-0.13.3-to-0.13.4
...
Update ipdb to 0.13.4
2020-10-01 18:09:16 +01:00
Bruno Alla
4225c1b1ab
Bump mypy and django-stubs versions
2020-10-01 17:07:17 +01:00
Bruno Alla
070dada241
Merge pull request #2867 from pydanny/update/pre-commit-autoupdate
2020-10-01 17:02:51 +01:00
Bruno Alla
f54bfe3025
Merge pull request #2866 from pydanny/pyup-update-uvicorn-0.11.8-to-0.12.1
...
Update uvicorn to 0.12.1
2020-10-01 17:02:34 +01:00
Bruno Alla
656ce7b9e3
Merge pull request #2863 from pydanny/pyup-update-sentry-sdk-0.17.7-to-0.18.0
...
Update sentry-sdk to 0.18.0
2020-10-01 17:01:30 +01:00
Bruno Alla
1339dcb7ff
Merge pull request #2862 from pydanny/pyup-update-djangorestframework-3.11.1-to-3.12.1
...
Update djangorestframework to 3.12.1
2020-10-01 17:01:09 +01:00
Bruno Alla
9c426725b1
Merge pull request #2859 from pydanny/pyup-update-pytest-6.0.2-to-6.1.0
2020-10-01 17:00:38 +01:00
pyup-bot
58c06e558f
Update ipdb from 0.13.3 to 0.13.4
2020-10-01 08:58:53 -07:00
github-actions[bot]
aa6fd53813
Auto-update pre-commit hooks
2020-10-01 00:27:34 +00:00
pyup-bot
604325a1c6
Update uvicorn from 0.11.8 to 0.12.1
2020-09-30 06:31:39 -07:00
pyup-bot
ae346d4a6f
Update sentry-sdk from 0.17.7 to 0.18.0
2020-09-29 10:50:08 -07:00
pyup-bot
6fb51ed491
Update djangorestframework from 3.11.1 to 3.12.1
2020-09-28 12:11:17 -07:00
pyup-bot
11afe7af59
Update pytest from 6.0.2 to 6.1.0
2020-09-27 07:41:24 -07:00
pyup-bot
d5cb85ed9c
Update django-debug-toolbar from 3.1 to 3.1.1
2020-09-24 10:22:21 -07:00
Bruno Alla
8e062157a1
Merge pull request #2847 from pydanny/pyup-update-sentry-sdk-0.17.6-to-0.17.7
...
Update sentry-sdk to 0.17.7
2020-09-23 13:45:01 +01:00
pyup-bot
762f3b3ae2
Update sentry-sdk from 0.17.6 to 0.17.7
2020-09-22 02:49:28 -07:00
pyup-bot
e715b8f43d
Update django-debug-toolbar from 3.0 to 3.1
2020-09-21 14:13:08 -07:00
Arnav Choudhury
b064e09f12
Adding GitHub-Action CI Option ( #2837 )
2020-09-21 11:20:24 +01:00
Bruno Alla
55aa86878b
Merge pull request #2842 from pydanny/pyup-update-django-debug-toolbar-2.2-to-3.0
...
Update django-debug-toolbar to 3.0
2020-09-21 10:37:20 +01:00
github-actions[bot]
561e9744bf
Auto-update pre-commit hooks
2020-09-21 00:26:05 +00:00
pyup-bot
859766941d
Update django-debug-toolbar from 2.2 to 3.0
2020-09-20 12:27:04 -07:00
Arnav Choudhury
2408fc7756
Added a comment to relevant part of documentation. Also removed the unnecessary scheme key as the default value for scheme is https anyway
2020-09-18 22:14:18 +05:30
pyup-bot
ade8aede47
Update django-extensions from 3.0.8 to 3.0.9
2020-09-17 15:04:31 -07:00
Arnav Choudhury
35b89997ef
Made Traefik conf much easier to understand and improved redirect response to entrypoint as opposed to middleware layer that is hit after entrypoint and routing layers.
2020-09-17 22:22:42 +05:30
Bruno Alla
46b03b65df
Merge pull request #2833 from pydanny/pyup-update-sentry-sdk-0.17.5-to-0.17.6
...
Update sentry-sdk to 0.17.6
2020-09-16 14:18:36 +02:00
pyup-bot
c06869367d
Update sentry-sdk from 0.17.5 to 0.17.6
2020-09-16 04:29:06 -07:00
pyup-bot
fa85682910
Update pytest-django from 3.9.0 to 3.10.0
2020-09-16 04:28:56 -07:00
Bruno Alla
a2c4453cf5
Fix isort errors
2020-09-16 09:39:02 +01:00
Daniel Feldroy
ec3922cfe6
Give admin_forms the forms namespace
...
This will make extending various signup and registration forms easier.
2020-09-14 11:36:47 -07:00
Bruno Alla
c62c3eada8
Merge pull request #2829 from pydanny/revert/celery-4.4.6
...
Downgrade Celery to 4.4.6
2020-09-14 18:34:33 +02:00
Bruno Alla
b76d8d4f02
Revert Celery to 4.4.6
...
It looks like 4.4.7 has some issues with Redis broker:
https://github.com/celery/celery/issues/6285
2020-09-14 17:24:16 +01:00
pyup-bot
584267d8a4
Update sentry-sdk from 0.17.4 to 0.17.5
2020-09-14 08:03:16 -07:00
Bruno Alla
7780065025
Merge pull request #2826 from pydanny/pyup-update-coverage-5.2.1-to-5.3
2020-09-14 12:30:50 +02:00
pyup-bot
f1600ef17b
Update coverage from 5.2.1 to 5.3
2020-09-14 01:40:37 -07:00
pyup-bot
8b4c87fd12
Update django-storages from 1.10 to 1.10.1
2020-09-14 01:40:33 -07:00
pyup-bot
a6b88a9370
Update django-storages from 1.10 to 1.10.1
2020-09-14 01:40:32 -07:00
Bruno Alla
b78c244e4d
Merge pull request #2814 from arnav13081994/update-traefik-version
...
Updating Traefik version from 2.0 to 2.2.11
2020-09-12 12:22:39 +02:00
Bruno Alla
62c7f40d14
Merge pull request #2819 from pydanny/pyup-update-pytest-6.0.1-to-6.0.2
2020-09-12 12:22:03 +02:00
pyup-bot
12cc96817d
Update pytest from 6.0.1 to 6.0.2
2020-09-11 19:16:17 -07:00
pyup-bot
192ca300af
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:49 -07:00
pyup-bot
bc0805549b
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:48 -07:00
pyup-bot
8241615edd
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:47 -07:00
pyup-bot
e591022c6f
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:46 -07:00
pyup-bot
99c9b04319
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:45 -07:00
pyup-bot
e5c2f82949
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:45 -07:00
pyup-bot
8cddc2f740
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:44 -07:00
pyup-bot
11d089c859
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:43 -07:00
pyup-bot
13ca7bf4a4
Update django-anymail from 7.2.1 to 8.0
2020-09-11 15:59:42 -07:00
Arnav Choudhury
e1922807aa
Updating Traefik version from 2.0 to 2.2.11
2020-09-11 21:47:00 +05:30
github-actions[bot]
806080e53e
Auto-update pre-commit hooks
2020-09-11 00:24:40 +00:00
pyup-bot
8df38802f3
Update sentry-sdk from 0.17.3 to 0.17.4
2020-09-09 15:41:47 -07:00
Bruno Alla
9b81501a1b
Merge pull request #2800 from pydanny/gitignore-cleanup
...
Clean up nested venv files from `.gitignore`
2020-09-09 14:19:39 +02:00
Arnav Choudhury
536e86ecad
Traeffik and Django dockerfile changes ( #2801 )
2020-09-08 09:04:10 +01:00
Bruno Alla
2a0f40e767
Clean up nested venv files from .gitignore
...
Fixes #2226
2020-09-07 15:30:37 +02:00
Bruno Alla
ffaec00084
Remove --no-binary option for psycopg2 ( #2798 )
...
It was required in 2.7, but it's now the default in 2.8
2020-09-07 14:10:57 +01:00
Bruno Alla
0b3dd776c6
Fix options for sphinx-autobuild in docs Makefile ( #2799 )
...
Fix #2796
2020-09-07 14:06:18 +01:00
Wes Turner
624dd94dd3
Add :z/:Z to mounted volumes in {local,production}.yml ( #2663 )
2020-09-07 13:51:52 +01:00
Bruno Alla
49479fb118
Merge pull request #2797 from pydanny/pyup-update-psycopg2-binary-2.8.5-to-2.8.6
2020-09-07 14:39:03 +02:00
Arnav Choudhury
7fb71507d2
Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ( #2794 )
2020-09-07 13:28:49 +01:00
Bruno Alla
cbc46cb34f
Update psycopg2 from 2.8.5 to 2.8.6
2020-09-07 14:23:02 +02:00
pyup-bot
9cdae535b3
Update psycopg2-binary from 2.8.5 to 2.8.6
2020-09-06 19:12:31 -07:00
github-actions[bot]
77a00376e8
Auto-update pre-commit hooks
2020-09-05 00:40:41 +00:00
pyup-bot
c6c0bd9289
Update django-extensions from 3.0.7 to 3.0.8
2020-09-04 08:26:40 -07:00
github-actions[bot]
84713cf724
Auto-update pre-commit hooks
2020-09-04 00:24:21 +00:00
pyup-bot
a7c69639f2
Update sentry-sdk from 0.17.2 to 0.17.3
2020-09-02 02:51:48 -07:00
Bruno Alla
cc97340c25
Merge pull request #2777 from foarsitter/sentry_environment_and_performance_tracing
...
Add environment and traces_sample_rate keyword to sentry_sdk.init
2020-09-02 11:51:41 +02:00
pyup-bot
bd977e29af
Update django-extensions from 3.0.6 to 3.0.7
2020-09-01 17:08:30 -07:00
Bruno Alla
fe36bb3574
Merge pull request #2781 from pydanny/pyup-update-django-storages-1.9.1-to-1.10
2020-09-01 22:42:12 +02:00
Bruno Alla
2217e69aa5
Merge pull request #2780 from howiezhao/patch-1
2020-09-01 22:41:07 +02:00
Bruno Alla
53b4371c09
Remove deprecated setting from django-storages
2020-09-01 22:20:02 +02:00
Bruno Alla
18da9c910d
Merge pull request #2784 from pydanny/pyup-update-sentry-sdk-0.17.1-to-0.17.2
...
Update sentry-sdk to 0.17.2
2020-09-01 22:04:29 +02:00
pyup-bot
007ab4aefd
Update django from 3.0.9 to 3.0.10
2020-09-01 07:56:59 -07:00
pyup-bot
18c53d0a3b
Update sentry-sdk from 0.17.1 to 0.17.2
2020-09-01 07:56:55 -07:00
Bruno Alla
0328a8bbaa
Merge pull request #2782 from pydanny/pyup-update-sphinx-autobuild-0.7.1-to-2020.9.1
...
Update sphinx-autobuild to 2020.9.1
2020-09-01 10:52:56 +02:00
pyup-bot
fe9c9b5e48
Update django-extensions from 3.0.5 to 3.0.6
2020-08-31 11:53:48 -07:00
pyup-bot
2f7a6c3013
Update sphinx-autobuild from 0.7.1 to 2020.9.1
2020-08-31 05:45:27 -07:00
pyup-bot
0c23267806
Update django-storages from 1.9.1 to 1.10
2020-08-31 00:15:41 -07:00
pyup-bot
aeefbc060f
Update django-storages from 1.9.1 to 1.10
2020-08-31 00:15:40 -07:00
Howie Zhao
2c82c4e1da
chore: update document link
2020-08-29 11:59:29 +08:00
Howie Zhao
baf5e6e74e
chore: exclude venv directory
2020-08-29 11:53:24 +08:00
pyup-bot
d17321dfbe
Update sentry-sdk from 0.17.0 to 0.17.1
2020-08-28 14:55:22 -07:00
Jelmer Draaijer
688739cb39
Add environment and traces_sample_rate keyword to sentry_sdk.init
2020-08-28 10:25:40 +02:00
Bruno Alla
3ab741545c
Merge pull request #2764 from pydanny/pyup-update-django-cors-headers-3.4.0-to-3.5.0
...
Update django-cors-headers to 3.5.0
2020-08-27 16:01:40 +02:00
Bruno Alla
7614bd9958
Merge branch 'master' into update/pre-commit-autoupdate
2020-08-27 09:52:55 +02:00
Bruno Alla
e21869c1d4
Fix black formatting issues
2020-08-27 09:41:28 +02:00
github-actions[bot]
bc58420364
Auto-update pre-commit hooks
2020-08-27 00:22:07 +00:00
pyup-bot
0dc3fe0b3d
Update black from 19.10b0 to 20.8b1
2020-08-26 10:05:24 -07:00