hacklab/OASIS_MOBILE
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

upstream: integrar 0.9.5 en lo que no diverge (57 ficheros) + dependencias nuevas

Browse source 
Primera tanda de la integracion 0.9.1 -> 0.9.5. Se actualizan los 57 ficheros que
upstream cambio y la rama no tocaba, entre ellos los 11 de traduccion: eso ya solo
es posible gracias al overlay de i18n, antes eran 11 conflictos garantizados.

Se portan ademas las dependencias que 0.9.5 introduce y de las que dependen los
ficheros actualizados: pdfDocument, content_favorites, recurrence, media_gallery,
comments_view, gallery_view y polls (modelo, limites y vista).

Quedan 48 ficheros con divergencia real por resolver a mano (backend.js,
main_views.js, OasisMobile.css y 45 vistas y modelos).

Verificado: 0 errores de sintaxis en src/, 0 requires relativos rotos, la app
arranca declarando 0.9.5 y las 47 rutas principales responden 200/302.
This commit is contained in:
SITO 2026-08-18 21:42:59 +02:00
parent b3986b12a0
commit f964e61a1c
67 changed files with 5740 additions and 10907 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/models/onboarding_model.js
View file

@ -2,7 +2,7 @@ const fs = require('fs');
const path = require('path');
const pull = require('../server/node_modules/pull-stream');
const STEPS = ['language', 'profile', 'federation', 'larp', 'greeting', 'backup'];
const STEPS = ['language', 'ux', 'profile', 'federation', 'larp', 'greeting', 'backup'];
const FLAG = 'oasis-first-contact';
const PENDING = 'welcome=pending';
const DISMISSED = 'welcome=dismissed';
@ -122,7 +122,7 @@ module.exports = ({ cooler, ssbPath } = {}) => {
markStep(step) {
if (!STEPS.includes(step)) return false;
if (step !== 'language' && step !== 'backup') return true;
if (step !== 'language' && step !== 'backup' && step !== 'ux') return true;
if (!isPending(dir())) return true;
return appendMarker(dir(), `step=${step}`);
},
@ -147,6 +147,7 @@ module.exports = ({ cooler, ssbPath } = {}) => {
profile: hasProfile(mine, messages),
federation: hasFederated(mine, messages),
larp: hasJoinedLarp(messages),
ux: flag.markers.has('step=ux'),
backup: flag.markers.has('step=backup'),
greeting: hasGreeted(messages)
};