[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ece9fe: Revert "Remove redundant else"

2018-04-06 Thread Maurício Meneghini Fauth
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ece9fe84c917780020a0354d0824db9e1d74abda
  
https://github.com/phpmyadmin/phpmyadmin/commit/ece9fe84c917780020a0354d0824db9e1d74abda
  Author: Maurício Meneghini Fauth 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M js/functions.js

  Log Message:
  ---
  Revert "Remove redundant else"

This reverts commit 8b04a2b2a7c9ff1117b1f28fa2e014f12c272c53.

Signed-off-by: Maurício Meneghini Fauth 


  Commit: 7a6b3cbba871d2a429b235c0d0bffb20c1f16823
  
https://github.com/phpmyadmin/phpmyadmin/commit/7a6b3cbba871d2a429b235c0d0bffb20c1f16823
  Author: Maurício Meneghini Fauth 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M js/functions.js
M js/sql.js

  Log Message:
  ---
  Revert "Cannot read property sql_query of undefined: #14104 issue fix 
(#14105)"

This reverts commit ad86eab9748176ede865e6b3b80c4fd93523d508.

Signed-off-by: Maurício Meneghini Fauth 


  Commit: bece7c394082756f1a163e8cdb29d5d62181
  
https://github.com/phpmyadmin/phpmyadmin/commit/bece7c394082756f1a163e8cdb29d5d62181
  Author: Maurício Meneghini Fauth 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M js/sql.js

  Log Message:
  ---
  Revert "Merge pull request #14046 from shucon/login"

This reverts commit 5a1ceef67d62ba36da970cb33ab8c8095d1327e9, reversing
changes made to 063f3806395cdfc884626f9872f85bde8b06561e.

Signed-off-by: Maurício Meneghini Fauth 


  Commit: b3795da2c68c142b9f4a74b529d86226b039bb11
  
https://github.com/phpmyadmin/phpmyadmin/commit/b3795da2c68c142b9f4a74b529d86226b039bb11
  Author: Maurício Meneghini Fauth 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Log Message:
  ---
  Merge branch 'QA_4_8'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ba00b51ad8ab...b3795da2c68c___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/phpmyadmin] ece9fe: Revert "Remove redundant else"

2018-04-06 Thread Maurício Meneghini Fauth
  Branch: refs/heads/QA_4_8
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: ece9fe84c917780020a0354d0824db9e1d74abda
  
https://github.com/phpmyadmin/phpmyadmin/commit/ece9fe84c917780020a0354d0824db9e1d74abda
  Author: Maurício Meneghini Fauth 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M js/functions.js

  Log Message:
  ---
  Revert "Remove redundant else"

This reverts commit 8b04a2b2a7c9ff1117b1f28fa2e014f12c272c53.

Signed-off-by: Maurício Meneghini Fauth 


  Commit: 7a6b3cbba871d2a429b235c0d0bffb20c1f16823
  
https://github.com/phpmyadmin/phpmyadmin/commit/7a6b3cbba871d2a429b235c0d0bffb20c1f16823
  Author: Maurício Meneghini Fauth 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M js/functions.js
M js/sql.js

  Log Message:
  ---
  Revert "Cannot read property sql_query of undefined: #14104 issue fix 
(#14105)"

This reverts commit ad86eab9748176ede865e6b3b80c4fd93523d508.

Signed-off-by: Maurício Meneghini Fauth 


  Commit: bece7c394082756f1a163e8cdb29d5d62181
  
https://github.com/phpmyadmin/phpmyadmin/commit/bece7c394082756f1a163e8cdb29d5d62181
  Author: Maurício Meneghini Fauth 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M js/sql.js

  Log Message:
  ---
  Revert "Merge pull request #14046 from shucon/login"

This reverts commit 5a1ceef67d62ba36da970cb33ab8c8095d1327e9, reversing
changes made to 063f3806395cdfc884626f9872f85bde8b06561e.

Signed-off-by: Maurício Meneghini Fauth 


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/c5f21dadc93c...bece7c39___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] 0501cd: Add new sponsor

2018-04-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 0501cd1dd92a1254ad53946cd4a0765190948c8d
  
https://github.com/phpmyadmin/website/commit/0501cd1dd92a1254ad53946cd4a0765190948c8d
  Author: Michal Čihař 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M pmaweb/templates/sponsors.html

  Log Message:
  ---
  Add new sponsor

Signed-off-by: Michal Čihař 


___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git


[phpMyAdmin Git] [phpmyadmin/website] 73316f: Clarify that there are no discounts

2018-04-06 Thread Michal Čihař
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/website
  Commit: 73316ff4ae527692c8d243f3dcbe3d324eeb45f6
  
https://github.com/phpmyadmin/website/commit/73316ff4ae527692c8d243f3dcbe3d324eeb45f6
  Author: Michal Čihař 
  Date:   2018-03-09 (Fri, 09 Mar 2018)

  Changed paths:
M pmaweb/templates/_sponsorship_conditions.html

  Log Message:
  ---
  Clarify that there are no discounts

Signed-off-by: Michal Čihař 


  Commit: 279fa8422b113685e4983fd66ecf829011dd5cc1
  
https://github.com/phpmyadmin/website/commit/279fa8422b113685e4983fd66ecf829011dd5cc1
  Author: Michal Čihař 
  Date:   2018-04-06 (Fri, 06 Apr 2018)

  Changed paths:
M pmaweb/templates/sponsors.html

  Log Message:
  ---
  Add sponsor

Signed-off-by: Michal Čihař 


Compare: 
https://github.com/phpmyadmin/website/compare/e92228b863a8...279fa8422b11___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git