Skip to content

Commit

Permalink
Merge branch 'release/1.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Apr 27, 2021
2 parents 841bc39 + 8b84187 commit d90e51d
Show file tree
Hide file tree
Showing 1,024 changed files with 322,152 additions and 365,491 deletions.
2 changes: 2 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github: llaske
liberapay: llaske
55 changes: 55 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,61 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [1.5.0] - 2021-04-27
### Added
- DollarStreet activity
- Xmas Lights activity
- Add Photo mode in Journal popup
- Add a noLoginMode to hide login button on first screen
- Add more fun at end of Calligra #894
- Add an option to remove seconds hand in Clock activity #885
- Check if login exist before asking password #893
- Add presence simulator
- Add option for clock to show or hide minutes, AM hours, PM hours #903
- Add option in Paint to export the current drawing to the journal as an image #911
- Add country flag in Color My World activity #920
- Add a feature to change background in Shared Notes activity #799
- Add a full 24h mode in Clock activity #921
- Add an option to change default server at login
- Add a popup when image is exported in Planets Activity #927

### Changed
- Improved Spanish localization
- Update noServerMode: add a Quit button in the buddy menu
- Use HTTPS for default Sugarizer Server
- Use HTTPS for default library in Ebook Reader activity
- Use HTTPS for default videos libraries in Video Viewer activity
- Change color of Calligra icon - was too white
- Optimize drawing in neighborhood view
- Update to Cordova 10
- Update to Electron 9
- Consider unsecured server accessed via HTTPS like secured server

### Fixed
- Wrong poll is displayed in Vote activity #854
- Font is too small in Tangram activity on Safari or iOS #852
- Leaving Sugarizer app without leaving current activity cause some activities to become empty #850
- Improve frog control using touch/click in FoodChain activity #858
- Allow frog to move with arrow keys in FoodChain activity #857
- Add a popup when image is exported in Moon activity #867
- Add a popup when image is exported in Shared Notes activity #868
- Add a popup when image is exported in Labyrinth activity #869
- Stop playing a video change to fullscreen in VideoViewer activity #859
- Fix JournalChooser icons in Memorize activity
- Color My World Error between the two Korea #898
- Password characters flash from color to black&white #897
- Issues on West Bank, Somalia and Cyprus in Color My World #901
- Add a popup when image/sound is exported in Abecedarium activity #870
- Improve responsiveness of TankOp activity #566
- Improved Responsiveness in Game of life Activity #793
- Wrong values for inverse trigonometric function in Calculate Activity #895
- Palettes not responsive in Dollar Street Activity #929
- Video not responsive in Video Viewer Activity #933
- Sound and Video recording in Record activity don't work on Android/iOS #932
- The way to launch Sugarizer locally with Chrome has changed #937
- Dollar Street Activity no longer work #940


## [1.4.0] - 2020-09-23
### Added
- Fraction activity #205
Expand Down
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Sugarizer is available as:

# Sugarizer Application

Sugarizer Application is a cross-platform application for installing on any GNU+Linux, Windows, Mac OS X, Android or iOS device.
Sugarizer Application is a cross-platform application for installing on any GNU+Linux, Windows, Mac OS, Android or iOS device.

To run **Sugarizer Application on Android**, download it on [Google Play](https://play.google.com/store/apps/details?id=org.olpc_france.sugarizer), [Amazon Store](http://www.amazon.com/gp/product/B00NKK7PZA) or [F-Droid](https://f-droid.org/repository/browse/?fdid=org.olpc_france.sugarizer).

Expand Down Expand Up @@ -62,19 +62,26 @@ To run locally **Sugarizer Application into the Web Browser** (GNU Linux/Mac OS/

For **Chrome**, close ALL running instances of Chrome and re-launch it using the command line:

chrome --allow-file-access-from-files index.html
chrome --allow-file-access-from-files file:\\\<Directory>\sugarizer\index.html

In the path above, `<Directory>` is where you have stored/cloned your sugarizer repo into.

In Windows, \ is the way path is written and / is the way for Linux/MacOS backward and forward slashes differ here, hence path for Linux/MacOS will be:

chrome --allow-file-access-from-files file:///<Directory>/sugarizer/index.html


On Windows, you should launch:

"C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" --allow-file-access-from-files
"C:\Program Files (x86)\Google\Chrome\Application\chrome.exe" --allow-file-access-from-files <path>

On Mac OS, you should launch:

open -n /Applications/Google\ Chrome.app --args --allow-file-access-from-files
open -n /Applications/Google\ Chrome.app --args --allow-file-access-from-files <path>

On Linux, you should launch:

google-chrome-stable --allow-file-access-from-files index.html
google-chrome-stable --allow-file-access-from-files <path>

> Note: `google-chrome-stable` is the name of Chrome in Ubuntu but it could be different on other distribution, you can get the package-name for Chrome by running `sudo dpkg -l | grep chrome`
Expand Down
2 changes: 2 additions & 0 deletions activities.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
[
{"id": "org.olpcfrance.XmasLights", "name": "Xmas Lights", "version": 1, "directory": "activities/XmasLights.activity", "icon": "activity/activity-icon.svg", "favorite": false, "activityId": null},
{"id": "org.olpcfrance.DollarStreet", "name": "Dollar Street", "version": 1, "directory": "activities/DollarStreet.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.Tangram", "name": "Tangram", "version": 1, "directory": "activities/Tangram.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
{"id": "org.sugarlabs.Vote", "name": "Vote", "version": 1, "directory": "activities/Vote.activity", "icon": "activity/activity-icon.svg", "favorite": false, "activityId": null},
{"id": "org.sugarlabs.MindMath", "name": "MindMath", "version": 1, "directory": "activities/MindMath.activity", "icon": "activity/activity-icon.svg", "favorite": true, "activityId": null},
Expand Down
1 change: 1 addition & 0 deletions activities/Abacus.activity/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<script>if (window.module) module = window.module;</script>
<link href="https://fonts.googleapis.com/css?family=Crimson+Text|Open+Sans|Cutive+Mono" rel="stylesheet">
<script data-main="js/loader" src="lib/require.js"></script>
<script type="text/javascript" src="../../cordova.js"></script>
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<script src="lib/color.js"></script>
<script>if (window.module) module = window.module;</script>
Expand Down
31 changes: 15 additions & 16 deletions activities/Abacus.activity/locale.ini
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,21 @@ TutoCanvasTitle=Abacus
TutoCanvasContent=Here is the abacus. Click or drag the beads toward the central zone to set numbers

[es]
TutoPrev=Prev
TutoNext=Next
TutoEnd=End
TutoExplainTitle=Abacus Activity
TutoExplainContent=Welcome into the Abacus activity. Abacus lets the learner explore different representations of numbers using different mechanical counting systems developed by the ancient Romans and Chinese
TutoAbacusTitle=Abacus Choice
TutoAbacusContent=Click here to select the type of Abacus to use. Some Abacus handle decimals, some handle fractions, some handle number in base 2 and you could even create your own abacus
TutoCustomTitle=Custom
TutoCustomContent=Click here to create a custom abacus. You could define number of rods, lines and base
TutoCopyTitle=Copy
TutoCopyContent=Click here to copy the current value into the clipboard
TutoClearTitle=Clear
TutoClearContent=Click here to reinit the value of abacus to 0
TutoCanvasTitle=Abacus
TutoCanvasContent=Here is the abacus. Click or drag the beads toward the central zone to set numbers

TutoPrev=Ant
TutoNext=Sig
TutoEnd=Fin
TutoExplainTitle=Actividad "Ábaco"
TutoExplainContent=Bienvenido a la actividad "Ábaco". Con "Ábaco", el alumno aprenderá diferentes formas de representar números, usando mecanismos para contar desarrollados por las antiguas civilizaciones romana y china
TutoAbacusTitle=Tipo de ábaco
TutoAbacusContent=Haz clic aquí para elegir un tipo de ábaco. Algunos de ellos te permitirán usar números con decimales, con otros manejarás fracciones y con algunos incluso podrás expresar números en base 2. Por último, también podrás crear tu propio ábaco
TutoCustomTitle=Personalizar
TutoCustomContent=Haz clic aquí para crear un ábaco personalizado. Elige tu propio número de cuentas, líneas y base numérica
TutoCopyTitle=Copiar
TutoCopyContent=Haz clic aquí para copiar el valor actual en el portapapeles
TutoClearTitle=Reiniciar
TutoClearContent=Haz clic aquí para devolver el valor del ábaco a 0
TutoCanvasTitle=Ábaco
TutoCanvasContent=Este es tu ábaco. Haz clic o arrastra las cuentas al centro para escribir números

[fr]
TutoPrev=Préc
Expand Down
2 changes: 1 addition & 1 deletion activities/Abacus.activity/po/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: Tue Feb 18 2020 22:28:53 GMT+0100 (GMT+01:00)\n"
"POT-Creation-Date: Sun Apr 11 2021 11:04:41 GMT+0200 (heure d’été d’Europe centrale)\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
32 changes: 16 additions & 16 deletions activities/Abacus.activity/po/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: Tue Feb 18 2020 22:28:53 GMT+0100 (GMT+01:00)\n"
"POT-Creation-Date: Sun Apr 11 2021 11:04:41 GMT+0200 (heure d’été d’Europe centrale)\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -16,75 +16,75 @@ msgstr ""
#: TutoPrev
msgctxt "TutoPrev"
msgid "Prev"
msgstr "Prev"
msgstr "Ant"

#: TutoNext
msgctxt "TutoNext"
msgid "Next"
msgstr "Next"
msgstr "Sig"

#: TutoEnd
msgctxt "TutoEnd"
msgid "End"
msgstr "End"
msgstr "Fin"

#: TutoExplainTitle
msgctxt "TutoExplainTitle"
msgid "Abacus Activity"
msgstr "Abacus Activity"
msgstr "Actividad \"Ábaco\""

#: TutoExplainContent
msgctxt "TutoExplainContent"
msgid "Welcome into the Abacus activity. Abacus lets the learner explore different representations of numbers using different mechanical counting systems developed by the ancient Romans and Chinese"
msgstr "Welcome into the Abacus activity. Abacus lets the learner explore different representations of numbers using different mechanical counting systems developed by the ancient Romans and Chinese"
msgstr "Bienvenido a la actividad \"Ábaco\". Con \"Ábaco\", el alumno aprenderá diferentes formas de representar números, usando mecanismos para contar desarrollados por las antiguas civilizaciones romana y china"

#: TutoAbacusTitle
msgctxt "TutoAbacusTitle"
msgid "Abacus Choice"
msgstr "Abacus Choice"
msgstr "Tipo de ábaco"

#: TutoAbacusContent
msgctxt "TutoAbacusContent"
msgid "Click here to select the type of Abacus to use. Some Abacus handle decimals, some handle fractions, some handle number in base 2 and you could even create your own abacus"
msgstr "Click here to select the type of Abacus to use. Some Abacus handle decimals, some handle fractions, some handle number in base 2 and you could even create your own abacus"
msgstr "Haz clic aquí para elegir un tipo de ábaco. Algunos de ellos te permitirán usar números con decimales, con otros manejarás fracciones y con algunos incluso podrás expresar números en base 2. Por último, también podrás crear tu propio ábaco"

#: TutoCustomTitle
msgctxt "TutoCustomTitle"
msgid "Custom"
msgstr "Custom"
msgstr "Personalizar"

#: TutoCustomContent
msgctxt "TutoCustomContent"
msgid "Click here to create a custom abacus. You could define number of rods, lines and base"
msgstr "Click here to create a custom abacus. You could define number of rods, lines and base"
msgstr "Haz clic aquí para crear un ábaco personalizado. Elige tu propio número de cuentas, líneas y base numérica"

#: TutoCopyTitle
msgctxt "TutoCopyTitle"
msgid "Copy"
msgstr "Copy"
msgstr "Copiar"

#: TutoCopyContent
msgctxt "TutoCopyContent"
msgid "Click here to copy the current value into the clipboard"
msgstr "Click here to copy the current value into the clipboard"
msgstr "Haz clic aquí para copiar el valor actual en el portapapeles"

#: TutoClearTitle
msgctxt "TutoClearTitle"
msgid "Clear"
msgstr "Clear"
msgstr "Reiniciar"

#: TutoClearContent
msgctxt "TutoClearContent"
msgid "Click here to reinit the value of abacus to 0"
msgstr "Click here to reinit the value of abacus to 0"
msgstr "Haz clic aquí para devolver el valor del ábaco a 0"

#: TutoCanvasTitle
msgctxt "TutoCanvasTitle"
msgid "Abacus"
msgstr "Abacus"
msgstr "Ábaco"

#: TutoCanvasContent
msgctxt "TutoCanvasContent"
msgid "Here is the abacus. Click or drag the beads toward the central zone to set numbers"
msgstr "Here is the abacus. Click or drag the beads toward the central zone to set numbers"
msgstr "Este es tu ábaco. Haz clic o arrastra las cuentas al centro para escribir números"

2 changes: 1 addition & 1 deletion activities/Abacus.activity/po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: Tue Feb 18 2020 22:28:53 GMT+0100 (GMT+01:00)\n"
"POT-Creation-Date: Sun Apr 11 2021 11:04:41 GMT+0200 (heure d’été d’Europe centrale)\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion activities/Abacus.activity/po/pl.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: Tue Feb 18 2020 22:28:53 GMT+0100 (GMT+01:00)\n"
"POT-Creation-Date: Sun Apr 11 2021 11:04:41 GMT+0200 (heure d’été d’Europe centrale)\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion activities/Abacus.activity/po/template.pot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: Tue Feb 18 2020 22:28:53 GMT+0100 (GMT+01:00)\n"
"POT-Creation-Date: Sun Apr 11 2021 11:04:41 GMT+0200 (heure d’été d’Europe centrale)\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
104 changes: 104 additions & 0 deletions activities/Abecedarium.activity/css/libnotify.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
html,
body {
min-height: 100%;
}
.humane,
.humane-libnotify {
position: fixed;
-moz-transition: all 0.3s ease-out;
-webkit-transition: all 0.3s ease-out;
-ms-transition: all 0.3s ease-out;
-o-transition: all 0.3s ease-out;
transition: all 0.3s ease-out;
z-index: 100000;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=100);
}
.humane,
.humane-libnotify {
font-family: Ubuntu, Arial, sans-serif;
text-align: center;
font-size: 15px;
bottom: 10px;
right: 10px;
opacity: 0;
width: 150px;
color: #fff;
padding: 10px;
background: #000;
-moz-transform: translateY(-40px);
-webkit-transform: translateY(-40px);
-ms-transform: translateY(-40px);
-o-transform: translateY(-40px);
transform: translateY(-40px);
}
.humane p,
.humane-libnotify p,
.humane ul,
.humane-libnotify ul {
margin: 0;
padding: 0;
}
.humane ul,
.humane-libnotify ul {
list-style: none;
}
.humane.humane-libnotify-info,
.humane-libnotify.humane-libnotify-info {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABQCAYAAADYxx/bAAAABmJLR0QA/wD/AP+gvaeTAAAAMUlEQVQYlWNgYDB6ysTAwMDAxMDACCcYUFkMDEwMDEwMBNVhkxg65jGhmke6M6hgHgBSdgHnpZwADwAAAABJRU5ErkJggg==');
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(0,0,50,0.9)), color-stop(1, rgba(0,0,100,0.9))) no-repeat;
background: -moz-linear-gradient(top, rgba(0,0,50,0.9) 0%, rgba(0,0,100,0.9) 100%) no-repeat;
background: -webkit-linear-gradient(top, rgba(0,0,50,0.9) 0%, rgba(0,0,100,0.9) 100%) no-repeat;
background: -ms-linear-gradient(top, rgba(0,0,50,0.9) 0%, rgba(0,0,100,0.9) 100%) no-repeat;
background: -o-linear-gradient(top, rgba(0,0,50,0.9) 0%, rgba(0,0,100,0.9) 100%) no-repeat;
background: linear-gradient(top, rgba(0,0,50,0.9) 0%, rgba(0,0,100,0.9) 100%) no-repeat;
*background-color: #030;
}
.humane.humane-libnotify-success,
.humane-libnotify.humane-libnotify-success {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABQCAYAAADYxx/bAAAABmJLR0QA/wD/AP+gvaeTAAAAMUlEQVQYlWNgMGJ4ysTAwMDAxMAIJxhQWQwMDEwMTKgS2NRhkxg65jGhmke6M6hhHgBS2QHn2LzhygAAAABJRU5ErkJggg==');
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(0,50,0,0.9)), color-stop(1, rgba(0,100,0,0.9))) no-repeat;
background: -moz-linear-gradient(top, rgba(0,50,0,0.9) 0%, rgba(0,100,0,0.9) 100%) no-repeat;
background: -webkit-linear-gradient(top, rgba(0,50,0,0.9) 0%, rgba(0,100,0,0.9) 100%) no-repeat;
background: -ms-linear-gradient(top, rgba(0,50,0,0.9) 0%, rgba(0,100,0,0.9) 100%) no-repeat;
background: -o-linear-gradient(top, rgba(0,50,0,0.9) 0%, rgba(0,100,0,0.9) 100%) no-repeat;
background: linear-gradient(top, rgba(0,50,0,0.9) 0%, rgba(0,100,0,0.9) 100%) no-repeat;
*background-color: #030;
}
.humane.humane-libnotify-error,
.humane-libnotify.humane-libnotify-error {
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAADICAYAAAAp8ov1AAAABmJLR0QA/wD/AP+gvaeTAAAAPklEQVQokWMwYmB4ysTAwMCATjASFsOmBBvBRJ7x+O0g0wCS7CDTH/RwH7X9MVDuwyaG032D2M2UeIYO7gMAqt8C19Bn7+YAAAAASUVORK5CYII=');
background: -webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(50,0,0,0.9)), color-stop(1, rgba(100,0,0,0.9))) no-repeat;
background: -moz-linear-gradient(top, rgba(50,0,0,0.9) 0%, rgba(100,0,0,0.9) 100%) no-repeat;
background: -webkit-linear-gradient(top, rgba(50,0,0,0.9) 0%, rgba(100,0,0,0.9) 100%) no-repeat;
background: -ms-linear-gradient(top, rgba(50,0,0,0.9) 0%, rgba(100,0,0,0.9) 100%) no-repeat;
background: -o-linear-gradient(top, rgba(50,0,0,0.9) 0%, rgba(100,0,0,0.9) 100%) no-repeat;
background: linear-gradient(top, rgba(50,0,0,0.9) 0%, rgba(100,0,0,0.9) 100%) no-repeat;
*background-color: #300;
}
.humane.humane-animate,
.humane-libnotify.humane-libnotify-animate {
opacity: 1;
-moz-transform: translateY(0);
-webkit-transform: translateY(0);
-ms-transform: translateY(0);
-o-transform: translateY(0);
transform: translateY(0);
}
.humane.humane-animate:hover,
.humane-libnotify.humane-libnotify-animate:hover {
opacity: 0.2;
}
.humane.humane-animate,
.humane-libnotify.humane-libnotify-js-animate {
opacity: 1;
-moz-transform: translateY(0);
-webkit-transform: translateY(0);
-ms-transform: translateY(0);
-o-transform: translateY(0);
transform: translateY(0);
}
.humane.humane-animate:hover,
.humane-libnotify.humane-libnotify-js-animate:hover {
opacity: 0.2;
filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=20);
}
Loading

0 comments on commit d90e51d

Please sign in to comment.