[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e5ff7f: Restore SQL query after session expire

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e5ff7f34fe944975ce5c2d770d8a97b8d5534b7e
  
https://github.com/phpmyadmin/phpmyadmin/commit/e5ff7f34fe944975ce5c2d770d8a97b8d5534b7e
  Author: Saksham Gupta 
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
M js/sql.js

  Log Message:
  ---
  Restore SQL query after session expire

Partially Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/13654

Signed-off-by: Saksham Gupta 


  Commit: 8537d0125a9afcbb34ad1854927a280f227cdc93
  
https://github.com/phpmyadmin/phpmyadmin/commit/8537d0125a9afcbb34ad1854927a280f227cdc93
  Author: Saksham Gupta 
  Date:   2018-03-01 (Thu, 01 Mar 2018)

  Changed paths:
M js/sql.js

  Log Message:
  ---
  Fix whitespaces

Signed-off-by: Saksham Gupta 


  Commit: 0eaf1b108c40fa1d061e29fa5244ff0835c64ec8
  
https://github.com/phpmyadmin/phpmyadmin/commit/0eaf1b108c40fa1d061e29fa5244ff0835c64ec8
  Author: Saksham Gupta 
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
M js/sql.js

  Log Message:
  ---
  Add cookie restore and empty save error

Signed-off-by: Saksham Gupta 


  Commit: 5a1ceef67d62ba36da970cb33ab8c8095d1327e9
  
https://github.com/phpmyadmin/phpmyadmin/commit/5a1ceef67d62ba36da970cb33ab8c8095d1327e9
  Author: Michal Čihař 
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
M js/sql.js

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

Restore SQL query after session expire


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/063f3806395c...5a1ceef67d62___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] e7018f: Translated using Weblate (Hebrew)

[Weblate via Git]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: e7018fca9ee6b7bc1265f35274c69e3a507b22d8
  
https://github.com/phpmyadmin/phpmyadmin/commit/e7018fca9ee6b7bc1265f35274c69e3a507b22d8
  Author: Yaron Shahrabani 
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
M po/he.po

  Log Message:
  ---
  Translated using Weblate (Hebrew)

Currently translated at 19.3% (637 of 3288 strings)

[CI skip]


  Commit: 063f3806395cdfc884626f9872f85bde8b06561e
  
https://github.com/phpmyadmin/phpmyadmin/commit/063f3806395cdfc884626f9872f85bde8b06561e
  Author: Weblate 
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
M composer.json

  Log Message:
  ---
  Merge remote-tracking branch 'origin/master'


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/adf30f161c79...063f3806395c___
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] adf30f: Update to pragmarx/google2fa 3.0.1

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: adf30f161c79acdd8924a3b90ae6cbc76bf8053f
  
https://github.com/phpmyadmin/phpmyadmin/commit/adf30f161c79acdd8924a3b90ae6cbc76bf8053f
  Author: Michal Čihař 
  Date:   2018-03-16 (Fri, 16 Mar 2018)

  Changed paths:
M composer.json

  Log Message:
  ---
  Update to pragmarx/google2fa 3.0.1

This has changed license to MIT making it compatible with our GPL2.

Fixes #14074

Signed-off-by: Michal Čihař 


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