1
0
Fork 0
mirror of https://github.com/zrgn/zrgn.github.io synced 2024-11-15 21:28:40 +00:00
Commit graph

74 commits

Author SHA1 Message Date
dependabot[bot]
5c9c75b565
Merge e400a2c17e into af5831a4a5 2022-09-21 19:15:09 +00:00
dependabot[bot]
e400a2c17e
build(deps): bump commonmarker from 0.17.13 to 0.23.6
Bumps [commonmarker](https://github.com/gjtorikian/commonmarker) from 0.17.13 to 0.23.6.
- [Release notes](https://github.com/gjtorikian/commonmarker/releases)
- [Changelog](https://github.com/gjtorikian/commonmarker/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gjtorikian/commonmarker/compare/v0.17.13...v0.23.6)

---
updated-dependencies:
- dependency-name: commonmarker
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-21 19:15:07 +00:00
af5831a4a5
Merge pull request #31 from tbielawa/2021-05-30-typotown
Fxi ttyops
2021-05-30 16:24:18 -04:00
Tim Bielawa
0651520d67 Fxi ttyops 2021-05-30 07:37:45 -05:00
3e15de97a1
Merge pull request #30 from tbielawa/2021-05-29-misc-additions
Add a discord page
2021-05-29 22:01:27 -04:00
Tim Bielawa
cc6ccef4a6 Add a discord page 2021-05-29 10:51:55 -05:00
7f64f87bb9
Merge pull request #25 from zrgn/vbatts/gem-update
gem: update all the things
2021-03-29 22:03:05 -04:00
611f4b4940
Merge pull request #24 from zrgn/vbatts/npm-update
npm: update all the things
2021-03-29 22:00:22 -04:00
2f04e7abf0
gem: update all the things
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2021-03-09 12:33:10 -05:00
212d031cbe
npm: update all the things
I'm sure something will break with this...

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2021-03-09 12:20:57 -05:00
c523e11980
Merge pull request #23 from zrgn/dependabot/bundler/kramdown-2.3.0
build(deps): bump kramdown from 1.17.0 to 2.3.0
2020-11-10 11:49:56 -05:00
37925a3d3f
Merge pull request #17 from zrgn/dependabot/npm_and_yarn/lodash-4.17.19
build(deps): bump lodash from 4.17.11 to 4.17.19
2020-11-10 11:48:33 -05:00
89602367cc
Merge pull request #15 from zrgn/dependabot/npm_and_yarn/acorn-6.4.1
build(deps): bump acorn from 6.1.1 to 6.4.1
2020-11-10 11:47:43 -05:00
dependabot[bot]
ce2159aaab
build(deps): bump kramdown from 1.17.0 to 2.3.0
Bumps [kramdown](https://github.com/gettalong/kramdown) from 1.17.0 to 2.3.0.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-08 01:18:47 +00:00
Samuel Munilla
8905bba327
Merge pull request #22 from yithian/code_of_conduct_at_top
move the code of conduct toward the top
2020-07-29 09:33:45 -04:00
Alex Chvatal
85cae93879 move the code of conduct toward the top
this makes it more visible to newcomers and help people feel more
welcome
2020-07-29 08:30:12 -04:00
Samuel Munilla
d1f750eed9
Merge pull request #21 from awood/conflict
Add section on conflict resolution procedure.
2020-07-28 09:49:16 -04:00
Alex Wood
94e683c74e Add section on conflict resolution procedure. 2020-07-27 16:40:12 -04:00
Samuel Munilla
e69548b12e
Merge pull request #20 from yithian/anchor_links
add anchor links to header sections
2020-07-24 10:48:56 -04:00
Alex Chvatal
6f262d3102 add anchor links to header sections
NB that markdown header tags (eg: `###`) automatically generate IDs for
the headers. This commit simply makes the headers' texts into links to
the automatically generated IDs.
2020-07-24 10:37:23 -04:00
Samuel Munilla
f3f67b248c
Merge pull request #19 from smunilla/revised-membership-rules
Proposed changes to membership policies
2020-07-23 10:44:16 -04:00
Samuel Munilla
dc50eff5f4 Proposed changes to membership policies
These are a revision of the membership policies as discussed.
2020-07-22 07:50:47 -04:00
Alex Wood
ef976c376f
Merge pull request #18 from komidore64/bylaw-improvements
Bylaw improvements
2020-07-16 16:04:22 -04:00
Adam Price
a3943eff9a
Update index.md
Co-authored-by: Alex Chvatal <yith@yuggoth.space>
2020-07-16 15:41:29 -04:00
Adam Price
8ed543ba82 bylaw updates
- no single leader statement
- unification of language
2020-07-16 14:30:33 -04:00
Adam Price
7f5be484d3 zargcon 2019 has passed 2020-07-16 14:30:33 -04:00
Adam Price
3062cdfb8f update gem and ruby deps to be inline with github-pages 2020-07-16 14:30:28 -04:00
dependabot[bot]
29b4d60e0a
build(deps): bump lodash from 4.17.11 to 4.17.19
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
2020-07-16 18:21:00 +00:00
Alex Wood
80850677e1 Add framework for creating reveal.js presentations. 2020-07-16 14:20:23 -04:00
dependabot[bot]
f0827ad1c0
build(deps): bump acorn from 6.1.1 to 6.4.1
Bumps [acorn](https://github.com/acornjs/acorn) from 6.1.1 to 6.4.1.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.1.1...6.4.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-03-15 00:49:06 +00:00
08053c05d8
Merge pull request #14 from zrgn/dependabot/bundler/nokogiri-1.10.8
build(deps): bump nokogiri from 1.10.3 to 1.10.8
2020-03-04 11:04:58 -05:00
dfb1f89885
Merge pull request #9 from zrgn/dependabot/bundler/rubyzip-2.0.0
build(deps): bump rubyzip from 1.2.2 to 2.0.0
2020-03-04 11:04:27 -05:00
dependabot[bot]
15cbed3955
build(deps): bump nokogiri from 1.10.3 to 1.10.8
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.3 to 1.10.8.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.3...v1.10.8)

Signed-off-by: dependabot[bot] <support@github.com>
2020-02-25 23:01:57 +00:00
Alex Wood
502477ab68
Merge pull request #13 from kenganong/master
Add google calendar link
2019-11-21 10:37:08 -05:00
Ken Ganong
cbf08fb6ea
Add google calendar link
With times, location, and link to website.
2019-11-20 16:30:01 -05:00
Samuel Munilla
4d6cdd85f2
Merge pull request #12 from awood/master
Add Zargcon times and a map link.
2019-11-20 15:38:40 -05:00
Alex Wood
c703ae61d1 Add Zargcon times and a map link. 2019-11-20 15:36:32 -05:00
Samuel Munilla
af927c8085
Merge pull request #11 from smunilla/zargcon
Update payment link
2019-11-20 15:32:53 -05:00
Samuel Munilla
8355db5634 Update payment link 2019-11-20 15:31:58 -05:00
Alex Wood
16dd4793d4
Merge pull request #8 from smunilla/zargcon
Add ZargCon Information Page
2019-11-20 15:13:38 -05:00
Samuel Munilla
21e3a2300b Add ZargCon Information Page 2019-11-20 15:11:29 -05:00
dependabot[bot]
f920526822
build(deps): bump rubyzip from 1.2.2 to 2.0.0
Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.2 to 2.0.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.2...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-20 20:10:00 +00:00
32b8030a4a
Merge pull request #7 from zrgn/dependabot/npm_and_yarn/eslint-utils-1.4.3
build(deps): bump eslint-utils from 1.3.1 to 1.4.3
2019-11-20 12:09:23 -08:00
dependabot[bot]
f8476a9e7b
build(deps): bump eslint-utils from 1.3.1 to 1.4.3
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.3.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.3)

Signed-off-by: dependabot[bot] <support@github.com>
2019-10-31 14:36:20 +00:00
Alex Wood
5fe6399394
Merge pull request #6 from pcreech/bylaw-suggestion
Infraction line item
2019-06-17 14:32:23 -04:00
Patrick Creech
8bc9b87bdf Infraction line item
Explicitly codify the acknowleging of infractions
2019-06-17 14:00:27 -04:00
Samuel Munilla
8c1cd8882e
Merge pull request #5 from awood/awood/more-rules
Awood/more rules
2019-06-12 16:19:18 -04:00
Alex Wood
716d530d70 Edit rules
* Added rules about cheating and sportsmanship
* Altered language around rules understanding and whining
2019-06-12 15:34:27 -04:00
Alex Wood
2ede8fd1e1 Wrap at 80 characters. 2019-06-12 15:01:19 -04:00
d2a16a5bc2
Merge pull request #4 from awood/standard-jekyll-layout
Standard jekyll layout
2019-05-30 10:57:35 -04:00