Commit graph

59 commits

Author SHA1 Message Date
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
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
John Hess
9ff913ae40 update copy on captive portal 2021-12-21 15:52:08 -06:00
e009e32691 Merge branch 'captive' into 'master'
Add captive portal page to build.  Build each language version into an explicit directory so default/root can be chosen per-deployment.

See merge request guardianproject/butter-app-site!9
2021-12-06 20:10:39 +00:00
John Hess
e6df62d2bb whitespace 2021-11-30 16:28:31 -06:00
John Hess
da03bd27af build each language plus a default; update header to explicitly specify language when clicking english 2021-11-30 16:24:19 -06:00
John Hess
c9fe5cdc58 render a simple captive portal in each language reusing butter styles 2021-11-30 16:16:17 -06:00
John Hess
06bced877f ignore Gemfile.lock 2021-11-30 16:15:27 -06:00
7a520d11cb
add cleaninsights web measurement 2021-10-06 11:26:26 -04:00
f641769c3e
fix line break 2021-09-29 13:51:14 -04:00
ee2412b88b Merge branch '_lol-master-patch-70962' into 'master'
Update home.yml

See merge request guardianproject/butter-app-site!8
2021-09-29 16:57:21 +00:00
8aef3b00f7 Merge branch '_lol-master-patch-84969' into 'master'
Replace slide-img-4.png

See merge request guardianproject/butter-app-site!6
2021-09-29 16:56:59 +00:00
bb0ede9eb0 Merge branch '_lol-master-patch-49877' into 'master'
Replace slide-img-3.png

See merge request guardianproject/butter-app-site!5
2021-09-29 16:56:44 +00:00
22afe07c87 Merge branch '_lol-master-patch-39503' into 'master'
Replace slide-img-1.png

See merge request guardianproject/butter-app-site!3
2021-09-29 16:56:32 +00:00
5704448929 Merge branch '_lol-master-patch-24873' into 'master'
Replace slide-img-5.png

See merge request guardianproject/butter-app-site!7
2021-09-29 16:56:22 +00:00
d4d55c4384 Merge branch '_lol-master-patch-47317' into 'master'
Replace slide-img-2.png

See merge request guardianproject/butter-app-site!4
2021-09-29 16:55:26 +00:00
Carrie Winfrey
161cbc6d59 Update home.yml 2021-09-29 16:28:02 +00:00
Carrie Winfrey
ab73e38633 Replace slide-img-5.png 2021-09-29 16:24:06 +00:00
Carrie Winfrey
18f9fafd3c Replace slide-img-4.png 2021-09-29 16:06:41 +00:00
Carrie Winfrey
1407158f7a Replace slide-img-3.png 2021-09-29 16:06:04 +00:00
Carrie Winfrey
da9db50a21 Replace slide-img-2.png 2021-09-29 16:04:36 +00:00
Carrie Winfrey
1db659fa01 Replace slide-img-1.png 2021-09-29 16:03:24 +00:00
1a67fb2510 Merge branch '_lol-master-patch-15839' into 'master'
Update home.yml - Removed 2 uses of the word 'app' to reduce redundancy.

See merge request guardianproject/butter-app-site!2
2021-09-29 14:59:47 +00:00
Carrie Winfrey
c0607af621 Update home.yml - Removed 2 uses of the word 'app' to reduce redundancy. 2021-09-29 04:14:49 +00:00
90b7ffe998
add news links 2021-09-17 16:55:40 -04:00
ff3641e5fa
update butter apk 2021-09-17 16:48:45 -04:00
18828ee32d
ensure site name is localized 2021-09-17 16:47:58 -04:00
56408abb4a
update links 2021-09-17 16:18:12 -04:00
69aa12c0df
update download link 2021-09-17 16:10:01 -04:00
1f52ef3bce
make sure to copy the en resource first 2021-09-17 16:04:14 -04:00
2cde638e97
remove copyright 2021-09-17 15:56:00 -04:00
9f8bddfa1f
move download to assets 2021-09-17 15:53:53 -04:00
a6861e9875
add links to english and spanish version 2021-09-17 15:53:31 -04:00
414cf988d8
try to add es lang build to ci 2021-09-17 15:45:35 -04:00
80c5b4b2d6
add butter apk 2021-09-17 15:44:18 -04:00
88ff7ee04a
update data and add spanish 2021-09-17 15:43:34 -04:00
ccc96d94b5
update english description 2021-09-17 15:34:14 -04:00
f4fad83bc8
update ruby to 2.4 2021-09-17 12:40:51 -04:00
feac403025
remove gem lock file from git 2021-09-17 12:36:53 -04:00