Commit Graph

395 Commits

Author SHA1 Message Date
Maxime Beauchemin
5cb6c25ca0
docs: add support for Google Analytics on superset.apache.org (#11613)
* docs: add support for Google Analytics

* fix failing cypress test in list_view.test.ts

* xit some tests
2020-11-12 13:57:05 -08:00
dependabot[bot]
9c832440b9
build(deps): bump object-path from 0.11.4 to 0.11.5 in /docs (#11484)
Bumps [object-path](https://github.com/mariocasciaro/object-path) from 0.11.4 to 0.11.5.
- [Release notes](https://github.com/mariocasciaro/object-path/releases)
- [Commits](https://github.com/mariocasciaro/object-path/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-10-30 14:19:24 -07:00
Daniel Vaz Gaspar
5674309080
docs: fix db drivers PG and ES (#11504) 2020-10-30 12:53:13 +00:00
Tony Klin
62629eceab
Add IBM Cloud deployment guide (#11473) 2020-10-28 22:01:39 -07:00
Naren
2e6afdf7e7
docs: Update Dremio doc with Arrow Flight connection details (#11422)
* update dremio doc w arrow flight connection

* Add connection string via Arrow Flight
* Modify the connector link

* Update dremio.mdx
2020-10-26 17:01:16 +02:00
Pavel T
6f85d8d85c
docs: fix typo (#11129) 2020-10-22 16:18:44 -07:00
Maxime Beauchemin
43aca6a26c
docs: add a roadmap page pointing to SIP-53 (#11169)
* docs: add a roadmap page pointing to SIP-53

* large file
2020-10-20 21:36:06 -07:00
Maxime Beauchemin
8676c3ebd6
docs: don't link to database engine pages (#11242)
* docs: don't link to database engine pages

* making the linter happy

* updating database installation link

Co-authored-by: Evan Rusackas <evan@preset.io>
2020-10-13 14:10:06 -07:00
Naren
dcdf15f4d7
docs: Added Dremio to superset home page (#11231)
* add dremio

* dremio logo
2020-10-12 13:02:50 -07:00
Evan Rusackas
fa9963519e
fix: adding nofollow (#11225) 2020-10-09 23:47:57 -07:00
jharding-blw
5561b429f3
Fix typo "insode" -> "inside" (#11204) 2020-10-08 13:58:58 -07:00
John Bodley
6e0d1b8409
chore: cleanup FAB update perms (#11155)
* chore: Using cache factory method

* chore: Deprecate outdated FAB_UPDATE_PERMS information

Co-authored-by: John Bodley <john.bodley@airbnb.com>
2020-10-07 08:33:41 -07:00
Maxime Beauchemin
071c81f82e
fix: 📜 /docs/api won't render (#11168)
* fix: docs/api won't render

    fix: docs/api won't render

    It's unclear to me exactly why, but docz is flimsy with the way
    things are named and runs into odd collision and error messages.

    Somehow renaming the route seem to help. Jut rolling with it after many
    `gatsby clean`

* kill paths-ignore on github-actions

* trigger
2020-10-06 13:51:40 -07:00
Johannes Lange
3a0446f00d
docs: typo (#11152)
* docs: typo

* docs: consistent two-line gap before sections in README

this is merely to touch something outside of docs/ to work around a CI
issue (comment in #11152), while not creating diff-noise only
2020-10-05 13:29:47 -07:00
Maxime Beauchemin
6358a7f1b5
docs: add API page to docs using Swagger UI (#11154)
* docs: add API page to docs using Swagger UI

* silence fossa
2020-10-04 22:01:36 -07:00
Evan Rusackas
2cb2a0093d
docs: docs site footer link tweak (#11140)
* rescinding htaccess rewrite

* Changing License link title to make Apache happy

* Revert "rescinding htaccess rewrite"

This reverts commit 0ee153ef08.

* changing url in asf.yaml
2020-10-01 23:31:52 -07:00
Maxime Beauchemin
d578d8133f
docs: comply to ASF requirements (#11133)
* docs: comply to ASF requirements

* touch something out of docs/

* Just a few more things...

* messing with .htaccess

* SEO
2020-10-01 22:15:36 -07:00
Erik Ritter
fa5dab85c4
feat: more specific presto error messages (#11099) 2020-09-29 21:50:58 -07:00
Srini Kadamati
66e49807ef
fixed routes for customer in docs (#11052) 2020-09-24 20:43:03 -07:00
Maxime Beauchemin
3be8bdad9a
docs: add gallery screenshot & link in README (#10988)
* docs: add gallery screenshot & link in README

* deallowing large files
2020-09-21 22:48:55 -07:00
Maxime Beauchemin
8e4a1c8356
docs: add a "Gallery" page (#10968)
* docs: add a gallery page

* Adding image gallery

* linted

* add more screenshots

* a few more screenshots
2020-09-21 22:27:03 -07:00
Srini Kadamati
4a4fdb1e02
docs: set up client-side redirects from previous era docs urls (#10921)
* one simple redirect, as a test

* adding license to header

* painstakingly added SEO redirects!

* addressed feedback and ran lint-fix!

* lets try newline again!

* Revert "lets try newline again!"

This reverts commit 20f89bd23c.

* Revert "Revert "lets try newline again!""

This reverts commit e441edc54a.

* wait... there were TWO newlines?

Co-authored-by: Evan Rusackas <evan@preset.io>
2020-09-18 13:31:22 -07:00
Evan Rusackas
d4f33cc9de
Ignore '/docs' on some GH actions, give docs its own action (#10949)
* ignore docs on several actions, give docs its own action

* Random doc change to see if the new action runs.

* umm... not paths-ignore, paths!

* eof fix

* enabling typescript checking on docs
2020-09-18 12:23:48 -07:00
Evan Rusackas
2a5946d117
docs: Client side redirects (one POC) (#10898)
* one simple redirect, as a test

* adding license to header
2020-09-16 13:24:26 -07:00
Evan Rusackas
d4ee073bfe
simplifying/clarifying youtube video code/datastructures (#10882)
* simplifying/clarifying youtube video code/datastructures

* adding role to clickable div
2020-09-16 09:57:04 -07:00
Evan Rusackas
87fc425be9
Fixing docs site home screen mobile layout issues (#10886)
* fixing phone layout issues, "sqlab" -> "SQL Lab"

* fixing docs width/scrolling issues

* Revert "fixing docs width/scrolling issues"

This reverts commit 53c6482083.

* minor cherry on top-> remove nowrap and improve a link in README

Co-authored-by: Maxime Beauchemin <maximebeauchemin@gmail.com>
2020-09-16 09:56:56 -07:00
Erik Ritter
f9cfb3ed0e
fix: spelling in docs homepage (#10912) 2020-09-16 09:48:08 -07:00
Maxime Beauchemin
0870d3ae2b
docs: add back issue code links (#10903)
* docs: add back issue code links

closes: https://github.com/apache/incubator-superset/issues/10852

* Addressing comments
2020-09-16 09:28:53 -07:00
Maxime Beauchemin
3b035d2af3
docs: redirect http -> https (#10900)
* docs: redirect http -> https

* fix issues
2020-09-16 08:24:08 -07:00
Evan Rusackas
1f7301025a
correcting 2 steps in docs deployment readme (#10899) 2020-09-15 22:09:32 -07:00
John Bodley
b48dd4b7d9
chore: Using cache factory method (#10887)
Co-authored-by: John Bodley <john.bodley@airbnb.com>
2020-09-15 12:48:19 -07:00
Ville Brofeldt
838a70ea8d
docs: fix ubuntu 20.04 installation instructions (#10888) 2020-09-15 21:16:57 +03:00
Maxime Beauchemin
08ec509dc9
docs(style): make more responsive for mobile (#10853)
* docs(style): make more responsive for mobile

* Make a responsive navbar

* more fixes and tweaks

* Add README instructions
2020-09-14 11:58:45 -07:00
Phillip Kelley-Dotson
85a916036c
docs(new docs site): removes old sphinx doc site with gatsby (#10784)
* Remove old apache sphinx doc site with refreshed gatsby

* remove rando

* add licenses

* excluing .mdx files from license checks

* fixes

* Clean up sphinx references

* Addressed comments

* colors and tweaks

* more fixes

* add dummy docs/requirements.txt to satisfy stupid fossa

* cp .prettierrc

* more licenses

* minor touchups

* reqs

* removing old videos

* add github buttons

* prettier

* tweaks

* Eugenia/Fix some of the images and modified some of database pages

* add subheadernav

* add side headers nav and more responsive design for docs

* update resources page and other styling updates

* linting

* tweaks

* removing windows and align:center

* update resources

* remove links and and card hearder

* lots of styling tweaks

* Tweaks and minor improvements

* lint

* fix CI

* trigger pre-comimt

* rererefix CI

Co-authored-by: Maxime Beauchemin <maximebeauchemin@gmail.com>
Co-authored-by: Eugenia Moreno <eugenia@Eugenias-MBP.fios-router.home>
Co-authored-by: Evan Rusackas <evan@preset.io>
2020-09-11 22:59:12 -07:00
cyw233
7c11c9ce16
update all python version in the Dockerfile to 3.7 (#10841)
* update all python version in the Dockerfile to 3.7

* update ubuntu 18.04 to ubuntu 20.04
2020-09-11 14:33:15 +03:00
Ville Brofeldt
9a6697141d
chore: deprecate python 3.6 support (#10803) 2020-09-09 08:51:55 +03:00
Daniel Vaz Gaspar
f6858256f4
security: disallow uuid package on jinja2 (#10794)
* fix: disallow uuid package on jinja2

* update UPDATING.md

* Update UPDATING.md

Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>

Co-authored-by: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
2020-09-04 16:37:14 +01:00
Will Barrett
ff60e5c62a
Fix precommit hook for docs/installation.rst (#10759)
* Fix precommit hook for docs/installation.rst

* Fix underline too short
2020-09-02 10:06:51 -07:00
Jagadish
b5aecaff5c
docs: Update OAuth configuration in installation.rst (#10748)
Co-authored-by: jagadish <jagadish@nineleaps.com>
2020-09-02 16:10:49 +01:00
kxu
68d5a2bb7f
docs: Updated Docker local install instructions (#10511)
* Updated Docker local install instructions

Updated Docker local install instructions with more detail, structure, and additional info for Linus and Windows users.

* Updated with note on Windows environment
2020-09-01 13:52:22 -07:00
Cory Zue
4ee524736d
improve documentation for country maps (#10621) 2020-08-18 09:36:35 -07:00
John Bodley
8fb304d665
docs: Update engine installation (#10509)
* Update installation.rst

* Update installation.rst

Co-authored-by: John Bodley <john.bodley@airbnb.com>
2020-08-12 09:58:42 -07:00
Hossein Torabi
8190dcb61f
fix drill installation (#10558) 2020-08-10 11:39:46 -07:00
kxu
90c9417b16
docs: Update and refresh homepage of superset.apache.org (#10477)
* Update and refresh Index

Update and refresh index with additional links to community resources, new links to `Databases' section directly to parts of the tutorial that talk about that database,  connect, align Superset topline features with same language as in GitHub

* Added link to Superset users

* Update with relative links

* Add link to docs repo

Add link to docs repo on the homepage to encourage easy access for community contribution.

* Update index.rst
2020-08-07 09:28:14 -07:00
Erik Ritter
2055ecc1ba
feat: refactor error components and add database issue code (#10473)
* feat: refactor error components and add database issue code

* Apply suggestions from code review

Co-authored-by: John Bodley <4567245+john-bodley@users.noreply.github.com>

Co-authored-by: John Bodley <4567245+john-bodley@users.noreply.github.com>
2020-08-06 13:22:24 -07:00
Ville Brofeldt
3983fff084
ci: bump tests to 3.7 and add support for 3.8 (#10110) 2020-08-05 13:29:07 +03:00
Hossein Torabi
514b29f6df
fix db installaion (#10425) 2020-08-04 21:51:32 -07:00
John Bodley
cda764fd4b
chore: Adding pip-compile-multi et al. (#10499)
* chore: Adding pip-compile-multi et al

* Specify requirements.txt path for fossa

* [ci] Fixing CI

Co-authored-by: John Bodley <john.bodley@airbnb.com>
Co-authored-by: Jesse Yang <jesse.yang@airbnb.com>
2020-08-04 19:31:52 -07:00
Hossein Torabi
825f993dcb
authentication type methods docs (#10378) 2020-08-03 12:42:03 -07:00
John Bodley
821916a681
chore: pre-commit run --all-files (#10500)
Co-authored-by: John Bodley <john.bodley@airbnb.com>
2020-08-02 14:32:17 -07:00
Maxime Beauchemin
5e93f00a53
docs: pointers to plugins blog post (#10251)
* docs: pointers to plugins blog post

* fix build
2020-07-27 22:46:37 -07:00
Daniel Vaz Gaspar
562012c586
fix(permissions): alpha role has all full features (#10241)
* fix(permissions): alpha role is inconsistent

* reverse and allow Alpha to access manager menu

* Bump FAB to 3.0.1rc1 to include del permission fix

* add docs, tests and UPDATING

* EOL

* Fix query view for Alpha
2020-07-27 10:32:30 +01:00
Erik Ritter
5fa4680447
feat: update timeout error UX (#10274) 2020-07-20 15:32:17 -07:00
Maxime Beauchemin
a460fdf0f8
docs(fix): /swaggerview/v1 has moved to /swagger/v1 (#10276) 2020-07-09 15:16:52 -07:00
John Bodley
774c23a6f1
chore: Deprecating ENABLE_FLASK_COMPRESS (#10233)
Co-authored-by: John Bodley <john.bodley@airbnb.com>
2020-07-04 12:46:34 -07:00
Maxime Beauchemin
28bb2e18dd
docs: FAQ entry for 'Does Superset have an API' (#10071) 2020-06-17 17:13:28 +01:00
John Bodley
91f6e708eb
docs: Disable sphinx-autodoc-typehints (#9846)
* Update requirements.txt

* Update conf.py

* Update conf.py
2020-05-20 06:59:59 -07:00
John Bodley
c117e222c0
build: Updating the sphinx configuration (#9833)
Co-authored-by: John Bodley <john.bodley@airbnb.com>
2020-05-18 21:27:25 -07:00
Ivan Blinkov
e121e090c7
Update the link to ClickHouse official website (#9834) 2020-05-19 07:02:14 +03:00
Ville Brofeldt
b532c4609f
chore: bump python dependencies (#9786)
* chore: bump pyhton dependencies

* bump flask-testing

* Add note to UPDATING and bump flask-testing in requirements-dev.txt

* fix old sqlparse test case that is fixed with sqlparse==0.3.1

* Fix migration and sqlparse set test

* downgrade alembic

* Downgrade sqlalchemy-utils

* pin sqlalchemy-utils due to regression in 0.36.5

* Refine comment in setup.py

* make cachelib an explicit requirement
2020-05-13 18:49:34 +03:00
ʈᵃᵢ
24db9ab088
[docs] Add SSL config options for postgres (#9767)
* [docs] add postgres SSL documentation

* move caching section to where it makes more sense
2020-05-10 19:37:13 +01:00
ʈᵃᵢ
6237cea952
[docs] add postgres documentation (#9766) 2020-05-07 12:17:37 -07:00
John Bodley
955a4fe792
[fix] Automatically add relevant Jinja methods to cache key if present (#9572)
* [fix] Adding URL params to cache key if present

* [cache] Wrapping Jinja methods

Co-authored-by: John Bodley <john.bodley@airbnb.com>
2020-04-24 08:18:22 -07:00
Ville Brofeldt
c3307fa7aa
fix: move docs image symlink to _static (#9592)
* fix: move docs image symlink to _static

* Remove unneeded copy statements from build script

* Remove copy statement from CI conf
2020-04-22 19:11:20 +03:00
Will Barrett
132d774953
Add documentation build to Github Actions (#9569)
* Add documentation build to Github Actions

* Update requirements for documentation builds

* Minor optimization - only install requirements for documentation in documentation job
2020-04-20 15:48:50 -07:00
Daniel Vaz Gaspar
2295999a91
[docs] fix, elastic.co elasticsearch product location (#9598) 2020-04-20 15:48:03 +01:00
Ville Brofeldt
8476de9640
Bump copyright notice (#9539) 2020-04-15 08:59:29 -07:00
Daniel Vaz Gaspar
d81f720502
[thumbnails] API and celery task for dashboards and charts (#8947) 2020-04-15 09:40:14 +01:00
dandanhub
72f051f3ce
[sqllab] Add CUSTOM_TEMPLATE_PROCESSOR config (#9376)
Co-authored-by: Dandan Shi <dshi@dropbox.com>
2020-04-07 21:00:42 +01:00
Naren
b487834d12
[Doc] Update installation doc for Dremio (#9464)
* update installation doc for Dremio

Customers fail to install pyodbc properly which on linux systems requires you to install unixodbc-devel package. Update the instructions to make it clear.

* fix new line
2020-04-07 12:01:30 +03:00
Ville Brofeldt
499f9c8fca
feat: add SSL certificate validation for Druid (#9396)
* feat: add SSL certificate feature

* Address comments

* don't mutate extras

* Address comments and add polish

* Add further polish
2020-03-27 19:07:07 +02:00
Ville Brofeldt
3682702e91
fix: add connection testing params for snowflake (#9272)
* fix: add connection testingt params for snowflake

* Linting
2020-03-11 06:51:57 +02:00
Will Barrett
99242225d6
Adds default username and password created at installation to documentation (#9263) 2020-03-10 07:30:43 +02:00
Maxime Beauchemin
7b06bb7549
docs: remove focus on Druid in README.md (#9184)
The text in the README seemed overly Druid-centric at this time. While
originally (3-4 years ago) Superset was heavily focussed on druid, it's
just not accurate anymore. Druid is just one of the databases that we
support and docs should reflect that.
2020-02-24 10:30:25 +00:00
altef
dee16de03e
[SIP-29] Add support for row-level security (#8699)
* Support and apply filters.

* Added the UI for row level security, and moved it all under SQLA in order to access the Table model more easily.

* Added a row level security filter documentation entry.

* Accidentally added two new lines to this file.

* Blacked and iSorted, hopefully.  Also, sometimes g.user may not be set.

* Another isort, and handling g not having a user attribute another way.

* Let's try this again #CI tests.

* Adjusted import order for isort; I was sure I'd already done this..

* Row level filters should be wrapped in parentheses in case one contains an OR.

* Oops, did not think that would change Black's formatting.

* Changes as per @mistercrunch.

* RLS filters are now many-to-many with Roles.

* Updated documentation to reflect RLS filters supporting multiple rows.

* Let's see what happens when I set it to the previous revision ID

* Updated from upstream.

* There was a pylint error.

* Added RLS ids to the cache keys; modified documentation; added template processing to RLS filters.

* A new migration was merged in.

* Removed RLS cache key from query_object.

* RLS added to the cache_key from query_context.

* Changes as per @etr2460.

* Updating entry for RLS pull request.

* Another migration to skip.

* Changes as per @serenajiang.

* Blacked.

* Blacked and added some attributes to check for.

* Changed to a manual query as per @mistercrunch.

* Blacked.

* Another migration in the meantime.

* Black wanted some whitespace changes.

* AttributeError: 'AnonymousUserMixin' object has no attribute 'id'.

* Oops, did hasattr backwards.

* Changes as per @mistercrunch.

* Doesn't look like text us required here anymore.

* Changes as per @dpgaspar

* Two RLS tests.

* Row level security is now disabled by default via the feature flag ENABLE_ROW_LEVEL_SECURITY.

* New head to revise.

* Changed the comment.
2020-02-22 11:21:31 +02:00
David Aaron Suddjian
2913063924 SIP-32: Moving frontend code to the base of the repo (#9098)
* move assets out, get webpack dev working

* update docs to reference superset-frontend

* draw the rest of the owl

* fix docs

* fix webpack script

* rats

* correct docs

* fix tox dox
2020-02-09 17:53:56 -08:00
Arian Treffer
0cf354cc88
Add support for Cockroach DB (#9043)
* Add support for Cockroach DB

* Add documentation, fix installation and style for CockroachDB

* Fix formatting for black
2020-02-08 12:07:02 +02:00
Maxime Beauchemin
1a2ba56f46
[docs] add a link to versioned docs in the docs (#9069) 2020-02-04 17:18:23 +00:00
Grace Guo
2b0c7a1b73 [docs] Fix CORS section in installation (#8958) 2020-01-16 00:49:33 -05:00
Maxime Beauchemin
cd7cb147b9 docs: fix bad extras_require reference (#8969) 2020-01-15 08:50:30 +00:00
Naren
3bedee75d3 Add support for Dremio as a new source (#8939)
* Added spec for Dremio

* Installation instructions for Dremio

* added dependency for dremio

* Update dremio.py

* ASF header, dttm, set min version in setup.py

* Update installation.rst

* Update installation.rst

* fix tox 'Title underline too short.'

* change URI example

Co-authored-by: Naren <41924335+naren-dremio@users.noreply.github.com>
2020-01-10 17:37:40 +02:00
Maxime Beauchemin
6ff086df3a
docs: add copyright notice to conform to ASF requirements (#8761)
This should make things green
here: https://whimsy.apache.org/pods/project/superset
2019-12-07 17:52:30 -08:00
Hossein Torabi
d3f7fda778 fix create-admin (#8787) 2019-12-07 16:09:14 -08:00
Craig Rueda
a0b48f0f47 Fixing up Docker installation docs (#8735)
* Fixing up Docker installation docs

* Typo
2019-12-03 15:56:33 -08:00
Daniel Vaz Gaspar
0ed0031412
[jinja_context] Fix, allow for app factory pattern (#8693)
Better app factory pattern on jinja context and introduces tests for building docs
2019-12-03 09:42:57 +00:00
Beto Dealmeida
ac0e353a54
Update docs on gunicorn (#8710) 2019-12-02 10:57:05 -08:00
Daniel Vaz Gaspar
b2633a51d4
[docs] Fix, database deps table (#8692) 2019-11-29 13:48:39 +00:00
Caahlo
07058c5a12 add Liechtenstein to country selection (#8605)
add Liechtenstein to country selection and document its municipalities as regions
2019-11-19 07:06:17 -08:00
Caahlo
c87a140734 add Switzerland to country selection (#8592)
add Switzerland to country selection and document Swiss cantons as regions
2019-11-18 10:13:53 -08:00
axuew
763f59fc58 Add support for database engine SAP Hana (#8411)
* Add support for database engine SAP Hana

* Support hana services

Increase time, minute, and second

* Fix hana return string

* Fix formatting errors
2019-11-12 08:42:44 +02:00
francishemingway
5ed2190ebd [docs] User tutorial (#8459)
* added user tutorial and rearranged docs hierarchy

* added license header, renamed admin tutorial file

* fixed image url issue

* Fix spelling

* Tweaks to text based on feedback

* guilabel and menu test

* added guilabel and upload csv section

* tidy up of rst formatting
2019-11-08 15:45:06 -08:00
Beto Dealmeida
7e7f55386d
Remove tabs (#8508) 2019-11-05 10:55:35 -08:00
John Bodley
5dba2f4b56
[SIP-15] Adding grace period (#8490) 2019-11-04 12:00:41 -08:00
Beto Dealmeida
338a2b1a51
Allow user to customize query cost estimate (#8470)
* Allow user to customize query estimate

* Add docs; run black

* Update docs with types
2019-11-04 11:08:00 -08:00
Taeshik Hwang
51c22900db feat: add korea(South) info on CountryMap viz and bump legacy-plugin-chart-country-map to v0.11.4 (#8478) 2019-11-04 07:45:43 -08:00
francishemingway
a305b1a2c5 Change Fedora installation instructions + some small formatting changes (#8496) 2019-11-03 18:02:14 -08:00
John Bodley
554a6d82db
[sip-15] Adding database level python-date-format (#8474) 2019-10-31 07:13:41 -07:00
Christoph Lingg
06a4108a7d Enhance docs for email reporting (#8486)
* extend documentation about setting up email reporting

* mention EMAIL_REPORTS_USER
2019-10-30 22:37:13 -07:00
Will Barrett
1adf7426c2 Provide documentation for using a Service Account to connect to BigQuery (#8462)
* Provide documentation for using a Service Account to connect to BigQuery

* Alter line wrapping for shorter lines

* Whitespace commit to trigger another build (flake)

* Another meaningless whitespace change to trigger another build
2019-10-29 12:31:45 -07:00
John Bodley
8b74745f9e
[SIP-15] Adding initial framework (#8398)
* [sip-15] Adding initial framework

* [toast] Addressing etr2460's comments

* [fix] Addressing etr2460's comments
2019-10-28 14:23:12 -07:00