Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.124.2

This commit is contained in:
Antonio Cañas Vargas 2016-01-23 21:34:06 +01:00
parent 9446e663c9
commit b25b9a73c7
4 changed files with 108 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icon/soc64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

150
sql/cambios.sql
View File

@ -11267,102 +11267,78 @@ CALL get_note_cods();
9 ---> new 9 ---> new
... ...
12 ---> new 13 ---> new
13 ---> 18 14 ---> unchanged
12 ---> 17
9 ---> 16 Ntf_EVENT_FORUM_POST_COURSE = 15, // Old 10 // New post in forums of my courses
11 ---> 15 Ntf_EVENT_FORUM_REPLY = 16, // Old 11 // New reply to one of my posts in any forum
14 ---> 13
10 ---> 14 /* Messages tab */
Ntf_EVENT_NOTICE = 17, // Old 9
Ntf_EVENT_MESSAGE = 18, // Old 12
/* Statistics tab */
Ntf_EVENT_SURVEY = 19, // Old 13
9 ---> 17
10 ---> 15
11 ---> 16
12 ---> 18
13 ---> 19
UPDATE notif SET NotifyEvent=18 WHERE NotifyEvent=13; UPDATE notif SET NotifyEvent=17 WHERE NotifyEvent=9;
UPDATE notif SET NotifyEvent=17 WHERE NotifyEvent=12; UPDATE notif SET NotifyEvent=15 WHERE NotifyEvent=10;
UPDATE notif SET NotifyEvent=16 WHERE NotifyEvent=9; UPDATE notif SET NotifyEvent=16 WHERE NotifyEvent=11;
UPDATE notif SET NotifyEvent=15 WHERE NotifyEvent=11; UPDATE notif SET NotifyEvent=18 WHERE NotifyEvent=12;
UPDATE notif SET NotifyEvent=13 WHERE NotifyEvent=14; UPDATE notif SET NotifyEvent=19 WHERE NotifyEvent=13;
UPDATE notif SET NotifyEvent=14 WHERE NotifyEvent=10;
UPDATE sta_notif SET NotifyEvent=18 WHERE NotifyEvent=13; UPDATE sta_notif SET NotifyEvent=17 WHERE NotifyEvent=9;
UPDATE sta_notif SET NotifyEvent=17 WHERE NotifyEvent=12; UPDATE sta_notif SET NotifyEvent=15 WHERE NotifyEvent=10;
UPDATE sta_notif SET NotifyEvent=16 WHERE NotifyEvent=9; UPDATE sta_notif SET NotifyEvent=16 WHERE NotifyEvent=11;
UPDATE sta_notif SET NotifyEvent=15 WHERE NotifyEvent=11; UPDATE sta_notif SET NotifyEvent=18 WHERE NotifyEvent=12;
UPDATE sta_notif SET NotifyEvent=13 WHERE NotifyEvent=14; UPDATE sta_notif SET NotifyEvent=19 WHERE NotifyEvent=13;
UPDATE sta_notif SET NotifyEvent=14 WHERE NotifyEvent=10;
13 ---> 18 9 ---> 17
12 ---> 17
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0 19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 0 0 0 | 0 x a b | x x x x | x x x x | x x x x x x x x | x x x x | x x a x | x x x x | x x x x
0 0 2 0 0
|
__________ << 8 _________|
|
v
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
x x a x | x x x x | x x 1/0 x | x x x x | x x x x
10 ---> 15
11 ---> 16
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
x x a x | x x x x | c b * x | x x x x | x x x x
0 0 C 0 0
| |
________________| |
| ____ << 5 _____|
| |
v v
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
x x a c | b x x x | * * * x | x x x x | x x x x
12 ---> 18
13 ---> 19
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
x x a c | b x e d | * * * x | x x x x | x x x x
0 3 0 0 0 0 3 0 0 0
| | | |
_______________| | __________________| |
| _______________| | _______ << 6 _____|
| | | |
v v v v
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0 19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b 0 | 0 x 0 0 | x x x x | x x x x | x x x x e d a c | b x * * | * * * x | x x x x | x x x x
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x3000) << 5));
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x3000);
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x3000) << 5));
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x3000);
9 ---> 16
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b 0 | 0 x 0 0 | x x c x | x x x x | x x x x
0 0 2 0 0
______________________|
|
v
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b c | 0 x 0 0 | x x 0 x | x x x x | x x x x
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x200) << 7));
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x200);
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x200) << 7));
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x200);
11 ---> 15
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b c | 0 x 0 0 | d x 0 x | x x x x | x x x x
0 0 8 0 0
____________|
|
v
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b c | d x 0 0 | 0 x 0 x | x x x x | x x x x
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x800) << 4));
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x800);
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x800) << 4));
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x800);
14 ---> 13
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b c | d e 0 0 | 0 x 0 x | x x x x | x x x x
0 4 0 0 0
|__
|
v
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b c | d 0 e 0 | 0 x 0 x | x x x x | x x x x
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x4000) << 4));
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x4000);
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x4000) << 4));
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x4000);
10 ---> 14
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b c | d 0 e 0 | 0 f 0 x | x x x x | x x x x
0 0 4 0 0
____________|
|
v
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
0 a b c | d f e 0 | 0 0 0 x | x x x x | x x x x
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x400) << 4));
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x400);
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x400) << 4));
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x400);
UPDATE usr_data SET NotifNtfEvents = ((NotifNtfEvents & ~0xF8000) | ((NotifNtfEvents & 0x0200) << 8) | ((NotifNtfEvents & 0x0C00) << 5) | ((NotifNtfEvents & 0x3000) << 6));
UPDATE usr_data SET EmailNtfEvents = ((EmailNtfEvents & ~0xF8000) | ((EmailNtfEvents & 0x0200) << 8) | ((EmailNtfEvents & 0x0C00) << 5) | ((EmailNtfEvents & 0x3000) << 6));
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x3E00);
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x3E00);

19
swad_changelog.h
View File

@ -125,13 +125,30 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.124.1 (2016-01-23)" #define Log_PLATFORM_VERSION "SWAD 15.124.2 (2016-01-23)"
#define CSS_FILE "swad15.121.7.css" #define CSS_FILE "swad15.121.7.css"
#define JS_FILE "swad15.121.7.js" #define JS_FILE "swad15.121.7.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.124.2: Jan 23, 2016 Changed numeration of notifications in database. (194546 lines)
14 changes necessary in database:
UPDATE notif SET NotifyEvent=17 WHERE NotifyEvent=9;
UPDATE notif SET NotifyEvent=15 WHERE NotifyEvent=10;
UPDATE notif SET NotifyEvent=16 WHERE NotifyEvent=11;
UPDATE notif SET NotifyEvent=18 WHERE NotifyEvent=12;
UPDATE notif SET NotifyEvent=19 WHERE NotifyEvent=13;
UPDATE sta_notif SET NotifyEvent=17 WHERE NotifyEvent=9;
UPDATE sta_notif SET NotifyEvent=15 WHERE NotifyEvent=10;
UPDATE sta_notif SET NotifyEvent=16 WHERE NotifyEvent=11;
UPDATE sta_notif SET NotifyEvent=18 WHERE NotifyEvent=12;
UPDATE sta_notif SET NotifyEvent=19 WHERE NotifyEvent=13;
UPDATE usr_data SET NotifNtfEvents = ((NotifNtfEvents & ~0xF8000) | ((NotifNtfEvents & 0x0200) << 8) | ((NotifNtfEvents & 0x0C00) << 5) | ((NotifNtfEvents & 0x3000) << 6));
UPDATE usr_data SET EmailNtfEvents = ((EmailNtfEvents & ~0xF8000) | ((EmailNtfEvents & 0x0200) << 8) | ((EmailNtfEvents & 0x0C00) << 5) | ((EmailNtfEvents & 0x3000) << 6));
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x3E00);
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x3E00);
Version 15.124.1: Jan 23, 2016 New social notifications. Not finished. (194530 lines) Version 15.124.1: Jan 23, 2016 New social notifications. Not finished. (194530 lines)
Version 15.124: Jan 23, 2016 New social notifications. Not finished. (194466 lines) Version 15.124: Jan 23, 2016 New social notifications. Not finished. (194466 lines)
Version 15.123.7: Jan 22, 2016 New social notifications. Not finished. (194347 lines) Version 15.123.7: Jan 22, 2016 New social notifications. Not finished. (194347 lines)

54
swad_text.c
View File

@ -25155,63 +25155,63 @@ const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS] =
#endif #endif
, ,
#if L==1 // Ntf_EVENT_TIMELINE_COMMENT #if L==1 // Ntf_EVENT_TIMELINE_COMMENT
"Nous comentaris a missatges socials" "Nous comentaris als meus missatges socials"
#elif L==2 #elif L==2
"Neue Kommentare zu sozialen Beitr&auml;ge" "Neue Kommentare zu meinem sozialen Beitr&auml;ge"
#elif L==3 #elif L==3
"New comments to social posts" "New comments to my social posts"
#elif L==4 #elif L==4
"Nuevos comentario a mensajes sociales" "Nuevos comentarios a mis mensajes sociales"
#elif L==5 #elif L==5
"Nouveaux commentaires &agrave; messages sociaux" "Nouveaux commentaires &agrave; mes messages sociaux"
#elif L==6 #elif L==6
"Nuevos comentario a mensajes sociales" // Okoteve traducción "Nuevos comentarios a mis mensajes sociales" // Okoteve traducción
#elif L==7 #elif L==7
"Nuovi commenti a post sociali" "Nuovi commenti ai miei post sociali"
#elif L==8 #elif L==8
"Nowe komentarze do post spo&lstrok;ecznej" "Nowe komentarze do moich post spo&lstrok;ecznej"
#elif L==9 #elif L==9
"Novos coment&aacute;rio a post sociais" "Novos coment&aacute;rio &agrave;s minhos post sociais"
#endif #endif
, ,
#if L==1 // Ntf_EVENT_TIMELINE_FAV #if L==1 // Ntf_EVENT_TIMELINE_FAV
"Nous favorits a missatges socials" "Nous favorits als meus missatges socials"
#elif L==2 #elif L==2
"Neue Favorit zu sozialen Beitr&auml;ge" "Neue Favorit zu meinem sozialen Beitr&auml;ge"
#elif L==3 #elif L==3
"New favourite to social posts" "New favourite to my social posts"
#elif L==4 #elif L==4
"Nuevos favoritos a mensajes sociales" "Nuevos favoritos a mis mensajes sociales"
#elif L==5 #elif L==5
"Nouveaux favori &agrave; messages sociaux" "Nouveaux favori &agrave; mes messages sociaux"
#elif L==6 #elif L==6
"Nuevos favoritos a mensajes sociales" // Okoteve traducción "Nuevos favoritos a mis mensajes sociales" // Okoteve traducción
#elif L==7 #elif L==7
"Nuovi preferito a post sociali" "Nuovi preferito ai miei post sociali"
#elif L==8 #elif L==8
"Nowe ulubiony do post spo&lstrok;ecznej" "Nowe ulubiony do moich post spo&lstrok;ecznej"
#elif L==9 #elif L==9
"Novos favoritos a post sociais" "Novos favoritos &agrave;s minhos post sociais"
#endif #endif
, ,
#if L==1 // Ntf_EVENT_TIMELINE_SHARE #if L==1 // Ntf_EVENT_TIMELINE_SHARE
"Noves comparticions de missatges socials" "Noves comparticions dels meus missatges socials"
#elif L==2 #elif L==2
"Neue gemeinsame Nutzung zu sozialen Beitr&auml;ge" "Neue gemeinsame Nutzung zu meinem sozialen Beitr&auml;ge"
#elif L==3 #elif L==3
"New sharings of social posts" "New sharings of my social posts"
#elif L==4 #elif L==4
"Nuevas comparticiones de mensajes sociales" "Nuevas comparticiones de mis mensajes sociales"
#elif L==5 #elif L==5
"Nouveaux partages &agrave; messages sociaux" "Nouveaux partages de mes messages sociaux"
#elif L==6 #elif L==6
"Nuevas comparticiones de mensajes sociales" // Okoteve traducción "Nuevas comparticiones de mis mensajes sociales" // Okoteve traducción
#elif L==7 #elif L==7
"Nuove condivisioni a post sociali" "Nuove condivisioni dei miei post sociali"
#elif L==8 #elif L==8
"Nowe podzial post spo&lstrok;ecznej" "Nowe podzial moich post spo&lstrok;ecznej"
#elif L==9 #elif L==9
"Novas partilhas de post sociais" "Novas partilhas de minhos post sociais"
#endif #endif
, ,
#if L==1 // Ntf_EVENT_TIMELINE_MENTION #if L==1 // Ntf_EVENT_TIMELINE_MENTION