upstream: integrar 0.9.5 en lo que no diverge (57 ficheros) + dependencias nuevas
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:
parent
b3986b12a0
commit
f964e61a1c
67 changed files with 5740 additions and 10907 deletions
|
|
@ -1,3 +1,3 @@
|
|||
{
|
||||
"discardedItems": []
|
||||
}
|
||||
}
|
||||
|
|
|
|||
27
src/configs/content_favorites.json
Normal file
27
src/configs/content_favorites.json
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{
|
||||
"audios": [],
|
||||
"blogs": [],
|
||||
"bookmarks": [],
|
||||
"calendars": [],
|
||||
"chats": [],
|
||||
"documents": [],
|
||||
"events": [],
|
||||
"forum": [],
|
||||
"housing": [],
|
||||
"images": [],
|
||||
"jobs": [],
|
||||
"logs": [],
|
||||
"maps": [],
|
||||
"market": [],
|
||||
"pads": [],
|
||||
"polls": [],
|
||||
"projects": [],
|
||||
"reports": [],
|
||||
"shopProducts": [],
|
||||
"shops": [],
|
||||
"tasks": [],
|
||||
"torrents": [],
|
||||
"transfers": [],
|
||||
"videos": [],
|
||||
"votes": []
|
||||
}
|
||||
|
|
@ -9,6 +9,9 @@ let _ecoValue = null;
|
|||
let _lastActivity = null;
|
||||
let _maxBlockBytes = 0;
|
||||
let _inhabitantCount = 0;
|
||||
let _mentionsCount = 0;
|
||||
let _bestMatch = null;
|
||||
let _dismissedSuggestion = null;
|
||||
module.exports = {
|
||||
getInboxCount: () => _inboxCount,
|
||||
setInboxCount: (n) => { _inboxCount = n; },
|
||||
|
|
@ -30,6 +33,12 @@ module.exports = {
|
|||
setLastActivity: (a) => { _lastActivity = a; },
|
||||
getMaxBlockBytes: () => _maxBlockBytes,
|
||||
setMaxBlockBytes: (n) => { if (Number(n) > _maxBlockBytes) _maxBlockBytes = Number(n); },
|
||||
getMentionsCount: () => _mentionsCount,
|
||||
setMentionsCount: (n) => { _mentionsCount = Math.max(0, Number(n) || 0); },
|
||||
getInhabitantCount: () => _inhabitantCount,
|
||||
setInhabitantCount: (n) => { _inhabitantCount = Math.max(0, Number(n) || 0); }
|
||||
setInhabitantCount: (n) => { _inhabitantCount = Math.max(0, Number(n) || 0); },
|
||||
getBestMatch: () => _bestMatch,
|
||||
setBestMatch: (m) => { _bestMatch = m || null; },
|
||||
getDismissedSuggestion: () => _dismissedSuggestion,
|
||||
setDismissedSuggestion: (href) => { _dismissedSuggestion = href || null; }
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue