John Hess
|
d797ef56e8
|
Merge branch 'i18n' into 'master'
I18n via jekyll-multiple-languages-plugin
See merge request guardianproject/wind/butter-app-site!18
|
2022-04-22 22:58:05 +00:00 |
|
John Hess
|
a602a48ea0
|
merge in weblate spanish updates
|
2022-04-07 17:05:12 -05:00 |
|
John Hess
|
8aa3cbf40d
|
undo local changes to i18n that conflict with weblate
|
2022-04-07 16:37:48 -05:00 |
|
John Hess
|
2b41a5d969
|
merge in weblate changes to en/es yamls
|
2022-04-07 16:20:33 -05:00 |
|
John Hess
|
5f25d8b702
|
remove duplicate style
|
2022-04-07 13:18:40 -05:00 |
|
John Hess
|
6804a880ba
|
jekyll-multiple-languages-plugin compatible language selector for header
|
2022-04-07 13:13:00 -05:00 |
|
John Hess
|
082abe5777
|
commit merge resolution
|
2022-04-07 12:50:32 -05:00 |
|
John Hess
|
9549af515d
|
commit merge resolution
|
2022-04-07 12:48:34 -05:00 |
|
John Hess
|
acf11a2aef
|
whitespace
|
2022-04-07 12:40:30 -05:00 |
|
John Hess
|
f98d6812e2
|
remove webrick
|
2022-04-07 12:36:34 -05:00 |
|
John Hess
|
b01210b758
|
merge master into i18n
|
2022-04-07 12:31:19 -05:00 |
|
John Hess
|
571daf2491
|
remove line breaks
|
2022-04-07 12:11:12 -05:00 |
|
John Hess
|
ac2e2be4e2
|
remove line breaks
|
2022-04-07 12:00:58 -05:00 |
|
John Hess
|
8d0cbce55b
|
remove full stop
|
2022-04-07 11:38:57 -05:00 |
|
John Hess
|
c0d7811487
|
Merge branch 'per-deployment-copy' into 'master'
Per environment configuration
See merge request guardianproject/wind/butter-app-site!14
|
2022-04-05 15:20:11 +00:00 |
|
John Hess
|
72f3bbbe1b
|
merge
|
2022-04-05 10:15:42 -05:00 |
|
|
|
25e949d875
|
Merge branch 'resolve-404-collision' into 'master'
remove permalink from /404 to news.html so that actual 404 page would get displayed
See merge request guardianproject/wind/butter-app-site!13
|
2022-04-05 13:11:41 +00:00 |
|
|
|
980d6523e3
|
Merge branch 'vendorize-slick' into 'master'
fetch slick locally instead of via CDN so offline butterboxes are slick, too
See merge request guardianproject/wind/butter-app-site!12
|
2022-04-05 13:11:25 +00:00 |
|
|
|
5cc3045e04
|
Merge branch 'styles' into 'master'
fix captive page styling per...
See merge request guardianproject/wind/butter-app-site!15
|
2022-04-04 14:24:00 +00:00 |
|
|
|
e104dd939f
|
Merge branch 'ruby_version' into 'master'
add .ruby_version
See merge request guardianproject/wind/butter-app-site!16
|
2022-04-04 14:21:20 +00:00 |
|
John Hess
|
5bac311f84
|
add .ruby_version
|
2022-04-01 14:36:28 -05:00 |
|
John Hess
|
a474bc61ed
|
Add jekyll-multiple-language-plugin and refactor strings into /_i18n
|
2022-03-30 16:40:50 -05:00 |
|
John Hess
|
8887613e81
|
resove mc
|
2022-03-23 09:50:37 -05:00 |
|
John Hess
|
1d8b700bcc
|
fix captive page styling per https://gitlab.com/guardianproject/wind/wind-offline-fdroid-repo-on-rpi/-/issues/9
|
2022-03-21 15:45:30 -05:00 |
|
John Hess
|
3c781f6e72
|
serve analytics and copy based on deployment environment
|
2022-03-14 17:47:54 -05:00 |
|
John Hess
|
fa03d6fb00
|
revert footer changes
|
2022-03-14 17:44:18 -05:00 |
|
John Hess
|
4f0300548f
|
remove unintentionally included changes
|
2022-03-14 17:41:24 -05:00 |
|
John Hess
|
8d20bb37e6
|
per-environment copy, analytics
|
2022-03-14 17:35:46 -05:00 |
|
John Hess
|
ebcfabfa83
|
force https on matomo.js; update footer link
|
2022-03-14 15:51:55 -05:00 |
|
John Hess
|
b6c4b3d2b1
|
add chat copy, button in EN
|
2022-03-14 14:26:03 -05:00 |
|
John Hess
|
8348348300
|
Merge branch 'resolve-404-collision' into butter
|
2022-03-14 12:36:48 -05:00 |
|
John Hess
|
b46e40b7ca
|
remove permalink from /404 to news.html so that actual 404 page would get displayed
|
2022-03-14 12:33:51 -05:00 |
|
John Hess
|
493c3fbabd
|
en-only omnipresent link to /chat; to be replaced with configurable, l10nable one
|
2022-03-14 12:17:21 -05:00 |
|
John Hess
|
cc073ac2f0
|
turn matomo back on
|
2022-03-14 12:10:45 -05:00 |
|
John Hess
|
c9bd3a0bea
|
use vendorized slick
|
2022-03-14 12:09:57 -05:00 |
|
John Hess
|
95006b06a5
|
fetch slick locally instead of via CDN so offline butterboxes are slick, too
|
2022-03-14 12:07:46 -05:00 |
|
John Hess
|
f54f460f05
|
remove web-hosted resources (matomo)
|
2022-03-01 11:51:24 -06:00 |
|
John Hess
|
03af393571
|
remove web-hosted resources
|
2022-03-01 11:12:06 -06:00 |
|
n8fr8
|
932c39987f
|
update includes
|
2022-02-03 08:19:34 -05:00 |
|
n8fr8
|
cd244cad59
|
add view all apps link to site
|
2022-01-12 09:20:01 -05:00 |
|
n8fr8
|
45edb4c36c
|
update app viewer
|
2022-01-12 09:00:22 -05:00 |
|
n8fr8
|
22cec2a5b8
|
update apps
|
2022-01-11 17:36:55 -05:00 |
|
n8fr8
|
11c090fcb9
|
add app listing
|
2022-01-11 17:30:40 -05:00 |
|
|
|
8f7d6ababa
|
Merge branch 'lan-repo-configured-apk' into 'master'
Update butter.apk
See merge request guardianproject/butter-app-site!11
|
2022-01-11 17:04:01 +00:00 |
|
John Hess
|
522fcef038
|
update apk to https://guardianproject.info/releases/Butter-app-1.14-alpha4.apk
|
2022-01-07 15:34:25 -06:00 |
|
John Hess
|
6be7920046
|
Merge branch 'master' into lan-repo-configured-apk
|
2022-01-06 11:19:35 -06:00 |
|
|
|
5e36e8b2d8
|
Merge branch 'captive' into 'master'
update copy on captive portal
See merge request guardianproject/butter-app-site!10
|
2022-01-04 01:44:22 +00:00 |
|
John Hess
|
47cfc7b78b
|
clearly describe what the network does and does not do
|
2021-12-22 12:44:12 -06:00 |
|
John Hess
|
a3c5032ec1
|
Merge branch 'captive' into lan-repo-configured-apk
|
2021-12-22 11:49:03 -06:00 |
|
John Hess
|
3ed5722d07
|
add self-signed butter.apk for this development branch until properly signed one can be merged to main branch
|
2021-12-22 11:44:14 -06:00 |
|
