Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub organization/branch cleanup #1

Merged
merged 3 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
branches:
only:
master
main
language: node_js
env:
global:
Expand All @@ -9,9 +9,9 @@ matrix:
include:
- node_js: "node"
- node_js: "12"
if: type = push AND branch = master
if: type = push AND branch = main
- node_js: "14"
if: type = push AND branch = master
if: type = push AND branch = main
services:
- redis-server
install:
Expand Down
3 changes: 0 additions & 3 deletions CODE_OF_CONDUCT.md

This file was deleted.

10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ We follow the [GitHub Flow Workflow](https://guides.github.com/introduction/flow
### TODO: Below is an Example

1. Fork the project
2. Check out the `master` branch
2. Check out the `main` branch
3. Create a feature branch
4. Write code and tests for your change
5. From your branch, make a pull request against `twitter/sqrl/master`
5. From your branch, make a pull request against `sqrl-lang/sqrl/main`
6. Work with repo maintainers to get your change reviewed
7. Wait for your change to be pulled into `twitter/sqrl/master`
7. Wait for your change to be pulled into `sqrl-lang/sqrl/main`
8. Delete your feature branch

## Testing
Expand Down Expand Up @@ -103,12 +103,12 @@ Some important notes regarding the summary line:
## Documentation

We also welcome improvements to the project documentation or to the existing
docs. Please file an [issue](https://github.com/twitter/sqrl/issues).
docs. Please file an [issue](https://github.com/sqrl-lang/sqrl/issues).

# License

By contributing your code, you agree to license your contribution under the
terms of the APLv2: https://github.com/twitter/sqrl/blob/master/LICENSE
terms of the APLv2: https://github.com/sqrl-lang/sqrl/blob/main/LICENSE

# Code of Conduct

Expand Down
21 changes: 5 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [SQRL](https://twitter.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/twitter/sqrl/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/twitter/sqrl.svg?branch=master)](https://travis-ci.org/twitter/sqrl) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/twitter/sqrl/blob/master/CONTRIBUTING.md)
# [SQRL](https://sqrl-lang.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/sqrl-lang/sqrl/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/sqrl-lang/sqrl.svg?branch=main)](https://travis-ci.org/sqrl-lang/sqrl) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/sqrl-lang/sqrl/blob/main/CONTRIBUTING.md)

The Smyte Query and Rules Language (SQRL) is a Safe, Stateful Rules Language for Event Streams

Expand All @@ -14,17 +14,11 @@ If you were looking for the [Secure Quick Reliable Login project, check here](ht

## Documentation

You can find the **SQRL** (Smyte Query & Rules Language) documentation [on the website](https://twitter.github.io/sqrl).
You can find the **SQRL** (Smyte Query & Rules Language) documentation [on the website](https://sqrl-lang.github.io/sqrl).

## Support

Create a [new issue](https://github.com/twitter/sqrl/issues/new) on GitHub.

## Contributing

We feel that a welcoming community is important and we ask that you follow Twitter's
[Open Source Code of Conduct](https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md)
in all interactions with the community.
Create a [new issue](https://github.com/sqrl-lang/sqrl/issues/new) on GitHub.

## Authors

Expand All @@ -43,16 +37,11 @@ It would not have come together without lots of dogfooding and suggestions from:

Special thanks to [Justin Tormey](https://github.com/jtormey) for contributing the NPM package namespace.

A full list of [contributors](https://github.com/twitter/sqrl/graphs/contributors?type=a) can be found on GitHub.

Follow [@TwitterOSS](https://twitter.com/twitteross) on Twitter for updates.
A full list of [contributors](https://github.com/sqrl-lang/sqrl/graphs/contributors?type=a) can be found on GitHub.

## License

Copyright 2018 Twitter, Inc.
Copyright 2022 Josh Yudaken

Licensed under the Apache License, Version 2.0: https://www.apache.org/licenses/LICENSE-2.0

## Security Issues?

Please report sensitive security issues via Twitter's bug-bounty program (https://hackerone.com/twitter) rather than GitHub.
12 changes: 3 additions & 9 deletions examples/sqrl-example-functions/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [SQRL](https://twitter.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/twitter/sqrl/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/twitter/sqrl.svg?branch=master)](https://travis-ci.org/twitter/sqrl.svg?branch=master) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/twitter/sqrl/blob/master/CONTRIBUTING.md)
# [SQRL](https://sqrl-lang.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/sqrl-lang/sqrl/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/sqrl-lang/sqrl.svg?branch=main)](https://travis-ci.org/twitter/sqrl.svg?branch=main) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/sqrl-lang/sqrl/blob/main/CONTRIBUTING.md)

# `sqrl-example-functions` package

Expand All @@ -10,17 +10,11 @@ This returns a string that says hello to the given name.

# SQRL documentation

Please see [the website](https://twitter.github.io/sqrl) for full **SQRL** documentation
Please see [the website](https://sqrl-lang.github.io/sqrl) for full **SQRL** documentation

## Support

Create a [new issue](https://github.com/twitter/sqrl/issues/new) on GitHub.

## Contributing

We feel that a welcoming community is important and we ask that you follow Twitter's
[Open Source Code of Conduct](https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md)
in all interactions with the community.
Create a [new issue](https://github.com/sqrl-lang/sqrl/issues/new) on GitHub.

## License

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "sqrl-monorepo",
"private": true,
"homepage": "https://twitter.github.io/sqrl",
"homepage": "https://sqrl-lang.github.io/sqrl",
"license": "Apache-2.0",
"repository": "https://github.com/twitter/sqrl",
"repository": "https://github.com/sqrl-lang/sqrl",
"publishConfig": {
"registry": "https://registry.npmjs.org"
},
Expand Down
14 changes: 5 additions & 9 deletions packages/sqrl-cli-functions/README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
# [SQRL](https://twitter.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/twitter/sqrl/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/twitter/sqrl.svg?branch=master)](https://travis-ci.org/twitter/sqrl.svg?branch=master) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/twitter/sqrl/blob/master/CONTRIBUTING.md)
# [SQRL](https://sqrl-lang.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/sqrl-lang/sqrl/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/sqrl-lang/sqrl.svg?branch=main)](https://travis-ci.org/twitter/sqrl.svg?branch=main) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/sqrl-lang/sqrl/blob/main/CONTRIBUTING.md)

# `sqrl-cli-functions` package

This package includes functions that are primarily used by the sqrl-cli.

## Function documentation

See [sqrl-cli-functions documentation](https://twitter.github.io/sqrl/packages/sqrl-cli-functions.html) on the website
See [sqrl-cli-functions documentation](https://sqrl-lang.github.io/sqrl/packages/sqrl-cli-functions.html) on the website

# SQRL documentation

Please see [the website](https://twitter.github.io/sqrl) for full **SQRL** documentation
Please see [the website](https://sqrl-lang.github.io/sqrl) for full **SQRL** documentation

## Support

Create a [new issue](https://github.com/twitter/sqrl/issues/new) on GitHub.
Create a [new issue](https://github.com/sqrl-lang/sqrl/issues/new) on GitHub.

## Contributing

We feel that a welcoming community is important and we ask that you follow Twitter's
[Open Source Code of Conduct](https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md)
[Open Source Code of Conduct](https://github.com/sqrl-lang/code-of-conduct/blob/main/code-of-conduct.md)
in all interactions with the community.

## License

Copyright 2018 Twitter, Inc.

Licensed under the Apache License, Version 2.0: https://www.apache.org/licenses/LICENSE-2.0

## Security Issues

Please report sensitive security issues via Twitter's bug-bounty program (https://hackerone.com/twitter) rather than GitHub.
4 changes: 2 additions & 2 deletions packages/sqrl-cli-functions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "sqrl-cli-functions",
"version": "0.6.8",
"description": "SQRL (A Safe, Stateful Rules Language for Event Streams) - functions intended for command line tools",
"homepage": "https://twitter.github.io/sqrl",
"homepage": "https://sqrl-lang.github.io/sqrl",
"license": "Apache-2.0",
"repository": "https://github.com/twitter/sqrl/tree/master/packages/sqrl-cli-functions",
"repository": "https://github.com/sqrl-lang/sqrl/tree/main/packages/sqrl-cli-functions",
"directories": {
"lib": "lib",
"test": "__tests__"
Expand Down
12 changes: 4 additions & 8 deletions packages/sqrl-cli/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# [SQRL](https://twitter.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/twitter/sqrl/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/twitter/sqrl.svg?branch=master)](https://travis-ci.org/twitter/sqrl.svg?branch=master) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/twitter/sqrl/blob/master/CONTRIBUTING.md)
# [SQRL](https://sqrl-lang.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/sqrl-lang/sqrl/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/sqrl-lang/sqrl.svg?branch=main)](https://travis-ci.org/twitter/sqrl.svg?branch=main) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/sqrl-lang/sqrl/blob/main/CONTRIBUTING.md)

# `sqrl-cli` package

Expand All @@ -8,24 +8,20 @@ It can be installed globally, or used as a base for extending the standard comma

# SQRL documentation

Please see [the website](https://twitter.github.io/sqrl) for full **SQRL** documentation
Please see [the website](https://sqrl-lang.github.io/sqrl) for full **SQRL** documentation

## Support

Create a [new issue](https://github.com/twitter/sqrl/issues/new) on GitHub.
Create a [new issue](https://github.com/sqrl-lang/sqrl/issues/new) on GitHub.

## Contributing

We feel that a welcoming community is important and we ask that you follow Twitter's
[Open Source Code of Conduct](https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md)
[Open Source Code of Conduct](https://github.com/sqrl-lang/code-of-conduct/blob/main/code-of-conduct.md)
in all interactions with the community.

## License

Copyright 2018 Twitter, Inc.

Licensed under the Apache License, Version 2.0: https://www.apache.org/licenses/LICENSE-2.0

## Security Issues

Please report sensitive security issues via Twitter's bug-bounty program (https://hackerone.com/twitter) rather than GitHub.
4 changes: 2 additions & 2 deletions packages/sqrl-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "sqrl-cli",
"version": "0.6.8",
"description": "SQRL (A Safe, Stateful Rules Language for Event Streams) - command line tools",
"homepage": "https://twitter.github.io/sqrl",
"homepage": "https://sqrl-lang.github.io/sqrl",
"license": "Apache-2.0",
"repository": "https://github.com/twitter/sqrl/tree/master/packages/sqrl-cli",
"repository": "https://github.com/sqrl-lang/sqrl/tree/main/packages/sqrl-cli",
"bin": {
"sqrl": "bin/cli.js"
},
Expand Down
16 changes: 3 additions & 13 deletions packages/sqrl-common/README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,19 @@
# [SQRL](https://twitter.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/twitter/sqrl/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/twitter/sqrl.svg?branch=master)](https://travis-ci.org/twitter/sqrl.svg?branch=master) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/twitter/sqrl/blob/master/CONTRIBUTING.md)
# [SQRL](https://sqrl-lang.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/sqrl-lang/sqrl/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/sqrl-lang/sqrl.svg?branch=main)](https://travis-ci.org/twitter/sqrl.svg?branch=main) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/sqrl-lang/sqrl/blob/main/CONTRIBUTING.md)

# `sqrl-common` package

This package includes some shared code for all SQRL packages. You should not need to install this package yourself.

# SQRL documentation

Please see [the website](https://twitter.github.io/sqrl) for full **SQRL** documentation
Please see [the website](https://sqrl-lang.github.io/sqrl) for full **SQRL** documentation

## Support

Create a [new issue](https://github.com/twitter/sqrl/issues/new) on GitHub.

## Contributing

We feel that a welcoming community is important and we ask that you follow Twitter's
[Open Source Code of Conduct](https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md)
in all interactions with the community.
Create a [new issue](https://github.com/sqrl-lang/sqrl/issues/new) on GitHub.

## License

Copyright 2018 Twitter, Inc.

Licensed under the Apache License, Version 2.0: https://www.apache.org/licenses/LICENSE-2.0

## Security Issues

Please report sensitive security issues via Twitter's bug-bounty program (https://hackerone.com/twitter) rather than GitHub.
4 changes: 2 additions & 2 deletions packages/sqrl-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "sqrl-common",
"version": "0.6.8",
"description": "SQRL (A Safe, Stateful Rules Language for Event Streams) - internal shared code",
"homepage": "https://twitter.github.io/sqrl",
"homepage": "https://sqrl-lang.github.io/sqrl",
"license": "Apache-2.0",
"repository": "https://github.com/twitter/sqrl/tree/master/packages/sqrl-common",
"repository": "https://github.com/sqrl-lang/sqrl/tree/main/packages/sqrl-common",
"directories": {
"lib": "lib",
"test": "__tests__"
Expand Down
18 changes: 4 additions & 14 deletions packages/sqrl-jsonpath/README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,23 @@
# [SQRL](https://twitter.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/twitter/sqrl/blob/master/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/twitter/sqrl.svg?branch=master)](https://travis-ci.org/twitter/sqrl.svg?branch=master) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/twitter/sqrl/blob/master/CONTRIBUTING.md)
# [SQRL](https://sqrl-lang.github.io/sqrl/) · [![GitHub license](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://github.com/sqrl-lang/sqrl/blob/main/LICENSE) [![npm version](https://img.shields.io/npm/v/sqrl.svg?style=flat)](https://www.npmjs.com/package/sqrl) [![Build Status](https://travis-ci.org/sqrl-lang/sqrl.svg?branch=main)](https://travis-ci.org/twitter/sqrl.svg?branch=main) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/sqrl-lang/sqrl/blob/main/CONTRIBUTING.md)

# `sqrl-jsonpath` package

This package includes functions for querying data with JSONPath expressions

## Function documentation

See [sqrl-jsonpath documentation](https://twitter.github.io/sqrl/packages/sqrl-jsonpath.html) on the website
See [sqrl-jsonpath documentation](https://sqrl-lang.github.io/sqrl/packages/sqrl-jsonpath.html) on the website

# SQRL documentation

Please see [the website](https://twitter.github.io/sqrl) for full **SQRL** documentation
Please see [the website](https://sqrl-lang.github.io/sqrl) for full **SQRL** documentation

## Support

Create a [new issue](https://github.com/twitter/sqrl/issues/new) on GitHub.

## Contributing

We feel that a welcoming community is important and we ask that you follow Twitter's
[Open Source Code of Conduct](https://github.com/twitter/code-of-conduct/blob/master/code-of-conduct.md)
in all interactions with the community.
Create a [new issue](https://github.com/sqrl-lang/sqrl/issues/new) on GitHub.

## License

Copyright 2018 Twitter, Inc.

Licensed under the Apache License, Version 2.0: https://www.apache.org/licenses/LICENSE-2.0

## Security Issues

Please report sensitive security issues via Twitter's bug-bounty program (https://hackerone.com/twitter) rather than GitHub.
4 changes: 2 additions & 2 deletions packages/sqrl-jsonpath/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "sqrl-jsonpath",
"version": "0.6.8",
"description": "SQRL (A Safe, Stateful Rules Language for Event Streams) - functions for querying data",
"homepage": "https://twitter.github.io/sqrl",
"homepage": "https://sqrl-lang.github.io/sqrl",
"license": "Apache-2.0",
"repository": "https://github.com/twitter/sqrl/tree/master/packages/sqrl-jsonpath",
"repository": "https://github.com/sqrl-lang/sqrl/tree/main/packages/sqrl-jsonpath",
"directories": {
"lib": "lib",
"test": "__tests__"
Expand Down
Loading