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

History #847

Draft
wants to merge 70 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f8c42ca
Download and unzip artifact from https://github.com/solid/solidprojec…
michielbdejong May 24, 2024
e3abac2
a draft version -> historical content
michielbdejong May 24, 2024
55a7745
Remove files that will be overwritten by the redesign, but keep the rest
michielbdejong May 24, 2024
27f308d
First version of work delivered by Rajnish, see #823
michielbdejong Dec 20, 2023
15b7b84
No more use for DependaBot in this repo
michielbdejong Dec 20, 2023
d2e6b4f
Rajnish work rounds 2 and 3
michielbdejong Dec 21, 2023
f8521ab
linebreaks in readme
michielbdejong Dec 21, 2023
335d4b1
Update README.md
michielbdejong Dec 21, 2023
e43b949
We don't have a newsletter
michielbdejong Dec 20, 2023
5848fe5
Convert all html and css file line endings to LF instead of CRLF, as …
michielbdejong Jan 9, 2024
2840b16
Keep old tagline
michielbdejong Jan 9, 2024
a944419
Improvement by @TallTed
michielbdejong Jan 9, 2024
2c6ac5d
Small corrections
michielbdejong Jan 9, 2024
b2014a5
improvements by @TallTed
michielbdejong Jan 9, 2024
27de56f
improvements by @TallTed
michielbdejong Jan 9, 2024
00deed4
improvements by @TallTed
michielbdejong Jan 9, 2024
964d951
improvements by @TallTed
michielbdejong Jan 9, 2024
c637bda
improvements by @TallTed
michielbdejong Jan 9, 2024
5544d39
improvements by @TallTed
michielbdejong Jan 9, 2024
d8781d7
improvements by @TallTed
michielbdejong Jan 9, 2024
cc59acb
improvements by @TallTed
michielbdejong Jan 9, 2024
c939e4f
Explain use of file URLs
michielbdejong Jan 11, 2024
447dcc7
reword
michielbdejong Jan 16, 2024
d35433a
Refactor Redesign Code (#836)
VirginiaBalseiro Feb 8, 2024
483c2c5
Add button-purple class
KyraAssaad Feb 23, 2024
171e53d
Revert "Add button-purple class"
KyraAssaad Feb 23, 2024
4976e7e
Fix some broken links, ref #845
michielbdejong Feb 14, 2024
16b1755
Broken link about_solid.html
michielbdejong Feb 14, 2024
8abfb29
Fix license link
michielbdejong Feb 14, 2024
acfa0b6
Fix two buttons that point nowhere
michielbdejong Feb 14, 2024
5d63314
Point to Discourse and Matrix, fix https://github.com/solid/team/issu…
michielbdejong Feb 14, 2024
92874e0
Adding and changing some URLs
megoth Feb 26, 2024
3aab62c
Add Solid World Feb 2024
michielbdejong Mar 13, 2024
9807d90
Import https://raw.githubusercontent.com/solid/solidproject.org/db163…
michielbdejong Mar 13, 2024
5e91b3a
markdown to javascript
michielbdejong Mar 13, 2024
79bffb1
Script to generate community.html
michielbdejong Mar 13, 2024
e36d4d8
events migration script
michielbdejong Mar 13, 2024
0c1888b
Write community.html with script
michielbdejong Mar 13, 2024
fc5e31b
Fix details
michielbdejong Mar 13, 2024
46f5379
hand-fix 2024 events
michielbdejong Mar 13, 2024
556d204
remove hyphens after dates
michielbdejong Mar 13, 2024
a23ee0b
Convert remaining markdown links
michielbdejong Mar 13, 2024
5cf35cc
Fix hyphen in script
michielbdejong Mar 13, 2024
adc19f8
</time>–</dd>
michielbdejong Mar 13, 2024
51c4478
A few more manual fixes
michielbdejong Mar 13, 2024
62d647b
remove bogus event in 2021
michielbdejong Mar 13, 2024
9b59f5e
remove migration folder
michielbdejong Mar 13, 2024
99dd100
Added stubs to ensure old URIs for old website
megoth Mar 15, 2024
5200e9a
Add for-users page
csarven Mar 27, 2024
84d68cd
Add missing for-users page
csarven Mar 27, 2024
1bb04c3
Fix misalignment on homepage and border-bottom none for arbitrary items
csarven Apr 4, 2024
dca635a
Align home page li text indentation, ref #866
michielbdejong Apr 9, 2024
1b3feec
Fix invalid HTML
csarven Apr 5, 2024
79a9829
Fix events grid layout
csarven Apr 5, 2024
5e97693
Minor
csarven Apr 5, 2024
0527cbb
Fix lorem ipsum text for BBC
michielbdejong Apr 29, 2024
cda2ff5
Add Athumi, Inrupt, TrinPod, Digita, O-Team, Ponder Source
michielbdejong Apr 29, 2024
d0f2941
Fix logos
michielbdejong Apr 29, 2024
588c4a9
Update tutorials list, fix #850
michielbdejong Apr 9, 2024
e1cf25a
Stab at https://github.com/solid/solidproject.org/issues/894#issuecom…
michielbdejong Jun 3, 2024
8636c27
Add empty Gemfile to satisfy Netlify
michielbdejong Jun 3, 2024
0b071a5
Gemfile from main branch
michielbdejong Jun 3, 2024
75c08b0
Remove bundler version check
michielbdejong Jun 3, 2024
84f37c6
update reference ... link and link text ... from example.org to curre…
ewingson Jun 3, 2024
1ab6e06
update solidweb.me signup link to current v7 URL
ewingson Jun 3, 2024
5eafd21
Merge pull request #895 from ewingson/patch-1
michielbdejong Jun 3, 2024
34aa377
Add history.html
michielbdejong Jun 11, 2024
b0247f1
Updates markup, stylesheet, links/references, RDFa, editorial and con…
csarven Jun 11, 2024
cfad4eb
Add markup for time
csarven Jun 11, 2024
078c072
Minor. Link to TR/protocol
csarven Jun 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 0 additions & 17 deletions .github/dependabot.yml

This file was deleted.

24 changes: 15 additions & 9 deletions 404.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
---
layout: base
---
<div class="container section content">
<h1><code>404</code></h1>

<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found.</p>
</div>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>404 Page</title>
</head>
<body>
<div>
<h1>404</h1>
<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found.</p>
</div>
</body>
</html>
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ source "https://rubygems.org"

#ruby ">=3.2"

if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("2.3.4")
abort "Update your Bundler version to '>=2.3.4' to be future proof."
end
# if Gem::Version.new(Bundler::VERSION) < Gem::Version.new("2.3.4")
# abort "Update your Bundler version to '>=2.3.4' to be future proof."
# end

# Hello! This is where you manage which Jekyll version is used to run.
# When you want to use a different version, change it below, save the
Expand Down
295 changes: 0 additions & 295 deletions Gemfile.lock

This file was deleted.

32 changes: 16 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@

Official website of the Solid Project

## Important note about 2023-redesign
## How to contribute

If you want to make improvements to this website, please (also) add them in [the 2023-redesign branch](https://github.com/solid/solidproject.org/tree/2023-redesign?tab=readme-ov-file#how-to-contribute )
which we hope to merge soon.
To see your changes, you can run `npx serve` in your local checkout of this
repository, or even just browse to:

## Local Environment Setup (before 2023-redesign)
```
file:///your/local/path/to/gh/solid/solidproject.org/index.html
```

This website is built using [Jekyll](https://jekyllrb.com/), a static
site generator.
NOTE: please make sure to check out the `2023-redesign` branch!

If you have [Docker Compose](https://docs.docker.com/compose/) installed, view `docker-compose up` to start a local server to view the website.
If you just want to propose small textual changes you can also create a PR through GitHub's
online editor.

Alternatively, you can install and run the required tooling manually as follows:
1. [Install](https://jekyllrb.com/docs/installation/) Ruby and Jekyll
1. `$ git clone https://github.com/solid/solidproject.org.git`
1. `$ cd solidproject.org`
1. `$ bundle install`
1. `$ bundle exec jekyll serve --livereload`
The filenames should be intuitive enough for you to search for the HTML text that corresponds to the section
you want to edit.

If you state in your PR description that you had trouble setting up your local environment,
and then a Solid Team member will check and fix the layout for you if necessary, before merging your PR.

This way anyone who understands HTML and who has a GitHub account can suggest improvements for our website.

To afford a good cross-platform developer experience,
this repository employs the following tooling versions:
`ruby >=3.2` with `bundler >=2.3.4`.
Loading