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

Commit 53feec01 authored by Vincent Bourgmayer's avatar Vincent Bourgmayer
Browse files

Merge branch 'master' into 360-issue-v2

parents f191a78b e7446da1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ RUN unsquashfs -d /snap/core18/current core18.snap

# Grab the snapcraft snap from the stable channel and unpack it in the proper
# place.
RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap
RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=5.x/stable' | jq '.download_url' -r) --output snapcraft.snap
RUN mkdir -p /snap/snapcraft
RUN unsquashfs -d /snap/snapcraft/current snapcraft.snap

+22 −20
Original line number Diff line number Diff line
# Easy Installer
**Current Version:** v0.13.3-beta
**Current released Version:** v0.13.2-beta
**Current released Version:** v0.13.3-beta

Members:
- Gaël
@@ -29,24 +29,31 @@ Community:
- Piero
- GunChleoc

Tester
Reviewer
- Alexandre
- Sooraj
- Romain
- Kumar

developer: [Vincent Bourgmayer](vincent.bourgmayer@e.email)

developer: 
-[Vincent Bourgmayer](vincent.bourgmayer@e.email)
-Israel Yago pereira

## Changelogs
### v0.13.3-beta (current - unreleased)
- Update Russian translations - by Nikolay Sinyov
- Update German translations - by F. Wildermuth
### v0.13.4-beta (current - unreleased)

### v0.13.3-beta (latest release)
- Refactor user interface related to flashing device
- Refactor Configuration file
- Handle "Too many devices detected"
- Update config file for arch-linux build - by steadfasterX
- Update version number to v0.13.3-beta
- Fixed e-mail registration API Url - by Israel Yago pereira
- Update Russian translations - by Nikolay Sinyov & Israel Yago pereira
- Update German translations - by F. Wildermuth
- Update Dutch translations - by Edoardo Regni
- Update config file for arch-linux build - by steadfasterX

### v0.13.2-beta (latest release)
### v0.13.2-beta
- Small refactoring of FlashSceneController.java & FlashScene.fxml
- Revert support of Volla phone
- Update translations
@@ -55,16 +62,6 @@ developer: [Vincent Bourgmayer](vincent.bourgmayer@e.email)
- Update russian translations - by Nikolay Sinyov
- Update Italian translations - by Paolo Pantaleo

### v0.13.1-beta 
- Remove useless/unused code from FlashThread.java
- Refactor Device.java into Phone.java
- Easy-installer now detect Volla phone as a GS290
- Add gaelic translations - by GunChleoc
- Add catalan translations - by Arnau Vàzquez
- Update Italian translations - by Paolo Pantaleo
- Update French translations - by Piero & Vincent Bourgmayer
- Update German translations - by F. Wildermuth

## Documentation
To run directly from source:
`./gradlew run -Dorg.gradle.java.home=buildSrc/linux/jdk-11.0.2/`
@@ -76,6 +73,11 @@ from root of the project.

- [Weblate](https://i18n.e.foundation/projects/e/easy-installer/)


## Where to get log at runtime
- Windows: `C:\Users\<your username>\AppData\Local\easy-installer`
- linux : ``

## Techno dependancy
- Java
- JavaFX
+13 −0
Original line number Diff line number Diff line
@@ -283,3 +283,16 @@ detect_lbl_tooManyDevicesDetected=Mehr als ein Android-Gerät wurde gefunden.\nE
#install
##FP3
install_title_lockBootloader=Den Bootloader sperren
script_error_cantrebootFromFasboot=Fehler beim Neustart vom Fastboot
script_error_cantFlashVendor=Fehler beim Flashen der Vendor-Partition
script_error_cantFlashproduct=Fehler beim Flashen der Produkt-Partition 
script_error_cantFlashSystem=Fehler beim Flashen der Systempartitionen
script_error_cantRebootToFastboot=Fehler beim Neustarten in den Fastboot-Modus
script_error_cantFlashVBmeta_vendor=Fehler beim Flashen der vb meta vendor-Partition
script_error_cantFlashVbmeta_system=Fehler beim Flashen der vb meta System-Partition
script_error_cantFlashVbmeta=Fehler beim Flashen der vb meta-Partition
script_error_cantFlashRecovery=Fehler beim Flashen des Wiederherstellungssystems (Recovery)
script_error_cantFlashBoot=Fehler beim Flashen der Boot-Partition
script_error_cantWipeData=Fehler beim Löschen der Daten
script_error_cantUnpackSources=Fehler beim Entpacker der /e/-Quellen
script_error_cantRebootBootloader=Fehler beim Starten (booten) in den Bootloader
+5 −0
Original line number Diff line number Diff line
@@ -280,3 +280,8 @@ install_instr_validRecovery_pressVolDown=Нажмите "Volume down" , чтоб
install_instr_selectRecovery_pressVolUp=Нажмите "Volume up" , чтобы выбрать Recovery
install_instr_startRec_holdPowerVolUp=Удерживайте кнопки "Power" и "Volume Up" нажатыми до тех пор, пока небольшое меню не появится на экране вашего телефона (~2 секунды)
install_instr_leaveBootloader_holdPower=Удерживайте кнопку "Power" нажатой до тех пор, пока телефон не выключится (~12 секунд)

#install
##FP3
install_title_lockBootloader=Блокировка загрузчика
detect_lbl_tooManyDevicesDetected=Было обнаружено больше одного Android-устройства.\nОтсоединение лишние устройства, которые не хотите прошивать.