Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01b77563 authored by Manoj Nair's avatar Manoj Nair
Browse files

Merge branch 'master' into '651-update-content-on-easyinstaller-guide' 

# Conflicts:
#   htdocs/_i18n/en/pages/easy-installer-contribute.md
#   htdocs/_i18n/en/pages/easy-installer.md
parents 4f31cd0f 3ab277cd

Dockerfile.nginx

+1 −1
Original line number Diff line number Diff line 
FROM nginx:1.20

LABEL maintainer="dev@e.email"

LABEL maintainer="dev@murena.io"

RUN apt-get -y update

RUN apt-get -y install rsync

htdocs/Gemfile

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ gem "jekyll", "~> 4.2" 
# If you have any plugins, put them here!

group :jekyll_plugins do

  gem 'jekyll-multiple-languages-plugin'

  gem 'jekyll-redirect-from'

end



# Windows does not include zoneinfo files, so bundle the tzinfo-data gem

htdocs/Gemfile.lock

+4 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ GEM 
      terminal-table (~> 2.0)

    jekyll-multiple-languages-plugin (1.7.0)

      jekyll (>= 2.0, < 5.0)

    jekyll-redirect-from (0.16.0)

      jekyll (>= 3.3, < 5.0)

    jekyll-sass-converter (2.1.0)

      sassc (> 2.0.1, < 3.0)

    jekyll-watch (2.2.1)
@@ -71,9 +73,10 @@ PLATFORMS 
DEPENDENCIES

  jekyll (~> 4.2)

  jekyll-multiple-languages-plugin

  jekyll-redirect-from

  tzinfo (~> 1.2)

  tzinfo-data

  wdm (~> 0.1.0)



BUNDLED WITH

   2.2.2
 
   2.2.24

htdocs/_config.yml

+2 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


# Do not define custom textual information here

# Please use the corresponding file for internationalization

email: contact@e.email

email: helpdesk@murena.io

baseurl: "" # the subpath of your site, e.g. /blog

url: "https://doc.e.foundation" # the base hostname & protocol for your site, e.g. http://example.com
@@ -18,6 +18,7 @@ url: "https://doc.e.foundation" # the base hostname & protocol for your site, e. 
markdown: kramdown

plugins:

  - jekyll-multiple-languages-plugin

  - jekyll-redirect-from



# Exclude from processing.

# The following items will not be processed, by default. Create a custom list

htdocs/_data/devices/2e.yml

+2 −1
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ region: All 
maturity: green

install:

- { mode: Install doc }

- { mode: /e/ smartphones }

- { mode: Murena smartphones }

- { mode: Roll-back, url: "https://community.myteracube.com/t/advanced-installing-factory-android-image-w-sp-flash/1003" }

display_erecovery: false

before_install_file_name: before_install_2e

install_e_file_name: install_e_2e