From b25b9a73c7ca16e3508cc62cd3a16fac6961233d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 23 Jan 2016 21:34:06 +0100 Subject: [PATCH] Version 15.124.2 --- icon/soc64x64.png | Bin 0 -> 1401 bytes sql/cambios.sql | 150 +++++++++++++++++++--------------------------- swad_changelog.h | 19 +++++- swad_text.c | 54 ++++++++--------- 4 files changed, 108 insertions(+), 115 deletions(-) create mode 100644 icon/soc64x64.png diff --git a/icon/soc64x64.png b/icon/soc64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..66f5d780501fd0229f6aa77493762d0887425618 GIT binary patch literal 1401 zcmV-<1%~>GP)eSad^g zZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00iYpL_t(&-tCxcY?Eaa$A8b;uHEEj zgbx}ShRX)TkQqRYqVR6(F1Rt~L?bb%V4{ct6O1Or5D3a5qJp1wt|>o5O5-_m-T)8uv^==@7BHRnizLJ{(JhI^PcBC|8s#M8ImFS@5x(+ zzbrO!nut$L#RD8=tzFte*3lzwPRDM2BsdHSVDkrm#y|4ZU$;}*l|X_29UvQbVjL*o zV22C$iwtFo_PEHB56d)z!+hdAr<9*U=eX#;29S$uU=9>f3l!w~%Xo|oM#UM|RxWZv zsi}8C3A@cY&=K~c!aM7jMyiSH_0c%8e0L2vaQ4@M9O}up__I>Bw$B_`%BD1h7Rg`S zp^ndq%K??~Y$s=mT+T9?kar`t$j?1Zb7_m=gwBDN*aW4WQiPq*xU2+0JvUaXg;VM*Y?i=&fphQWnx@>GIKKH&bA&&=Xcr#_{71@eK|s^dO^JUkpi1%{P(;prRu zhewJwN=HPhK?-=Hc(F^bzqrx4N?)x}Sq41Y*`z?>*l>J)X9)|(OEbgqg0X$|K|MLp z99#9)$M8K4RO$i$=5Blg>>{VLaqGcbKMKbKn+?9}H(fEBI74Q|RGl<&L`z*WULd<% zF7EzE#>C+*&KA6Yx}GI{;*k;9@2!r0h6`n-5fNCfYgJMz^R)+K;w4&Cpe@(58i_Jb zOE)^v`l_=c!huH_HKP3w(vn1kAu+aNZs^W|B?NtJOBN9;JFPbz`s7!iWEW$SP>b3` zS^a?+<=Asv*_D(4?Cmih=D-3VZLPR4=;p7ARZtkKEzjo=jv4L8qPoV!hCfKIyCHmX z))AmOonxjZ!MMb-z*QZUkh+2Nl$gh@L9rg>byu~cx4{IwfVX*klbFeUiN1Two9-QY z#<%E4Q!m~NnRTI&WF^r20kNds1ut^8@7Zt@+h|0!^9o-?Uy-TA3y2l+8~2?e?!+@4 zhwTWSlT`z3Qzdt;wZ3IXZy2jsjedAuxiMj2=0%fq4&S=>Y}c-(pAOu%iziH*zAO*1 z$JThT8J=NZFXjy$$iru2mcf4l*bKUyYob9OvAO)eY2n zqaHd5TrHQSG0Mmrp^aBixnywI4`zA;JrP090&Tgzi5QmUu4<5KuPJ3BVWWY0{Ns?{ zMG&!%#*~$HNBZ7+Cd7g4MWRCML`8`6@{DD>s}Az08=L~IyMkNX3*t}tt2nNlur?lS z>2F>S)Pc#COzY`Ds|;Fvu25%*PTJl8wQKNVNQPuc{x|Y3YY)D&nnS)e00000NkvXX Hu0mjfM&*}G literal 0 HcmV?d00001 diff --git a/sql/cambios.sql b/sql/cambios.sql index 3d5f1d449..510421237 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -11267,102 +11267,78 @@ CALL get_note_cods(); 9 ---> new ... -12 ---> new +13 ---> new -13 ---> 18 -12 ---> 17 - 9 ---> 16 -11 ---> 15 -14 ---> 13 -10 ---> 14 +14 ---> unchanged + + Ntf_EVENT_FORUM_POST_COURSE = 15, // Old 10 // New post in forums of my courses + Ntf_EVENT_FORUM_REPLY = 16, // Old 11 // New reply to one of my posts in any forum + + /* 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=12; -UPDATE notif SET NotifyEvent=16 WHERE NotifyEvent=9; -UPDATE notif SET NotifyEvent=15 WHERE NotifyEvent=11; -UPDATE notif SET NotifyEvent=13 WHERE NotifyEvent=14; -UPDATE notif SET NotifyEvent=14 WHERE NotifyEvent=10; +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=18 WHERE NotifyEvent=13; -UPDATE sta_notif SET NotifyEvent=17 WHERE NotifyEvent=12; -UPDATE sta_notif SET NotifyEvent=16 WHERE NotifyEvent=9; -UPDATE sta_notif SET NotifyEvent=15 WHERE NotifyEvent=11; -UPDATE sta_notif SET NotifyEvent=13 WHERE NotifyEvent=14; -UPDATE sta_notif SET NotifyEvent=14 WHERE NotifyEvent=10; +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; -13 ---> 18 -12 ---> 17 + 9 ---> 17 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 | | - _______________| | - | _______________| - | | - v v + __________________| | + | _______ << 6 _____| + | | + v v 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 -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); + e d a c | b x * * | * * * x | x x x x | x x x x +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); diff --git a/swad_changelog.h b/swad_changelog.h index 891f4e3b3..a8abf9447 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -125,13 +125,30 @@ /****************************** 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 JS_FILE "swad15.121.7.js" // 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 /* + 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: Jan 23, 2016 New social notifications. Not finished. (194466 lines) Version 15.123.7: Jan 22, 2016 New social notifications. Not finished. (194347 lines) diff --git a/swad_text.c b/swad_text.c index a6f1340c3..5cd81e4f5 100644 --- a/swad_text.c +++ b/swad_text.c @@ -25155,63 +25155,63 @@ const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS] = #endif , #if L==1 // Ntf_EVENT_TIMELINE_COMMENT - "Nous comentaris a missatges socials" + "Nous comentaris als meus missatges socials" #elif L==2 - "Neue Kommentare zu sozialen Beiträge" + "Neue Kommentare zu meinem sozialen Beiträge" #elif L==3 - "New comments to social posts" + "New comments to my social posts" #elif L==4 - "Nuevos comentario a mensajes sociales" + "Nuevos comentarios a mis mensajes sociales" #elif L==5 - "Nouveaux commentaires à messages sociaux" + "Nouveaux commentaires à mes messages sociaux" #elif L==6 - "Nuevos comentario a mensajes sociales" // Okoteve traducción + "Nuevos comentarios a mis mensajes sociales" // Okoteve traducción #elif L==7 - "Nuovi commenti a post sociali" + "Nuovi commenti ai miei post sociali" #elif L==8 - "Nowe komentarze do post społecznej" + "Nowe komentarze do moich post społecznej" #elif L==9 - "Novos comentário a post sociais" + "Novos comentário às minhos post sociais" #endif , #if L==1 // Ntf_EVENT_TIMELINE_FAV - "Nous favorits a missatges socials" + "Nous favorits als meus missatges socials" #elif L==2 - "Neue Favorit zu sozialen Beiträge" + "Neue Favorit zu meinem sozialen Beiträge" #elif L==3 - "New favourite to social posts" + "New favourite to my social posts" #elif L==4 - "Nuevos favoritos a mensajes sociales" + "Nuevos favoritos a mis mensajes sociales" #elif L==5 - "Nouveaux favori à messages sociaux" + "Nouveaux favori à mes messages sociaux" #elif L==6 - "Nuevos favoritos a mensajes sociales" // Okoteve traducción + "Nuevos favoritos a mis mensajes sociales" // Okoteve traducción #elif L==7 - "Nuovi preferito a post sociali" + "Nuovi preferito ai miei post sociali" #elif L==8 - "Nowe ulubiony do post społecznej" + "Nowe ulubiony do moich post społecznej" #elif L==9 - "Novos favoritos a post sociais" + "Novos favoritos às minhos post sociais" #endif , #if L==1 // Ntf_EVENT_TIMELINE_SHARE - "Noves comparticions de missatges socials" + "Noves comparticions dels meus missatges socials" #elif L==2 - "Neue gemeinsame Nutzung zu sozialen Beiträge" + "Neue gemeinsame Nutzung zu meinem sozialen Beiträge" #elif L==3 - "New sharings of social posts" + "New sharings of my social posts" #elif L==4 - "Nuevas comparticiones de mensajes sociales" + "Nuevas comparticiones de mis mensajes sociales" #elif L==5 - "Nouveaux partages à messages sociaux" + "Nouveaux partages de mes messages sociaux" #elif L==6 - "Nuevas comparticiones de mensajes sociales" // Okoteve traducción + "Nuevas comparticiones de mis mensajes sociales" // Okoteve traducción #elif L==7 - "Nuove condivisioni a post sociali" + "Nuove condivisioni dei miei post sociali" #elif L==8 - "Nowe podzial post społecznej" + "Nowe podzial moich post społecznej" #elif L==9 - "Novas partilhas de post sociais" + "Novas partilhas de minhos post sociais" #endif , #if L==1 // Ntf_EVENT_TIMELINE_MENTION