[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 796e6a: 4.5.0 release

2015-09-25 Thread Marc Delisle 
  Branch: refs/heads/QA_4_5
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 796e6ae09301a7ea8aae74fdb3bb44538c0f5151
  
https://github.com/phpmyadmin/phpmyadmin/commit/796e6ae09301a7ea8aae74fdb3bb44538c0f5151
  Author: Marc Delisle 
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php

  Log Message:
  ---
  4.5.0 release

Signed-off-by: Marc Delisle 


  Commit: b5c731ab62e4f85b5f6beeca064796b0c946ed20
  
https://github.com/phpmyadmin/phpmyadmin/commit/b5c731ab62e4f85b5f6beeca064796b0c946ed20
  Author: Nisarg Jhaveri 
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
M ChangeLog
M libraries/plugins/export/ExportSql.class.php

  Log Message:
  ---
  Backport 053edda33f5bd957726b8bc82167ec8d30e705bc

Signed-off-by: Marc Delisle 


  Commit: 9e08133f49f0b99868fec434762366d08a45b6f8
  
https://github.com/phpmyadmin/phpmyadmin/commit/9e08133f49f0b99868fec434762366d08a45b6f8
  Author: Marc Delisle 
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
M README
M doc/conf.py
M libraries/Config.class.php

  Log Message:
  ---
  4.5.0.1 release

Signed-off-by: Marc Delisle 


  Commit: 8d202a3dc13a4296ef5809831889f0b86256a31d
  
https://github.com/phpmyadmin/phpmyadmin/commit/8d202a3dc13a4296ef5809831889f0b86256a31d
  Author: Dan Ungureanu 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M libraries/plugins/export/ExportSql.class.php
M libraries/sql-parser/src/Components/Key.php
M libraries/sql-parser/src/Utils/Table.php

  Log Message:
  ---
  Fixes #11497.
Cherry-picked udan11/sql-parser@1415469.

Signed-off-by: Dan Ungureanu 
Signed-off-by: Marc Delisle 


  Commit: 440caeac658f3149253f1a6834ef2f229586
  
https://github.com/phpmyadmin/phpmyadmin/commit/440caeac658f3149253f1a6834ef2f229586
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry

Signed-off-by: Marc Delisle 


  Commit: 8afe5940da4d04863022977d31200c4635d47d37
  
https://github.com/phpmyadmin/phpmyadmin/commit/8afe5940da4d04863022977d31200c4635d47d37
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Log Message:
  ---
  Merge commit '9e08133' into QA_4_5


  Commit: ac33a96ba8a7911dc977da8c891d8d1518f0b285
  
https://github.com/phpmyadmin/phpmyadmin/commit/ac33a96ba8a7911dc977da8c891d8d1518f0b285
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M ChangeLog
M libraries/plugins/export/ExportSql.class.php
M libraries/sql-parser/src/Components/Key.php
M libraries/sql-parser/src/Utils/Table.php

  Log Message:
  ---
  Fix merge conflict

Signed-off-by: Marc Delisle 


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

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 796e6a: 4.5.0 release

2015-09-25 Thread Marc Delisle 
  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 796e6ae09301a7ea8aae74fdb3bb44538c0f5151
  
https://github.com/phpmyadmin/phpmyadmin/commit/796e6ae09301a7ea8aae74fdb3bb44538c0f5151
  Author: Marc Delisle 
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php

  Log Message:
  ---
  4.5.0 release

Signed-off-by: Marc Delisle 


  Commit: b5c731ab62e4f85b5f6beeca064796b0c946ed20
  
https://github.com/phpmyadmin/phpmyadmin/commit/b5c731ab62e4f85b5f6beeca064796b0c946ed20
  Author: Nisarg Jhaveri 
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
M ChangeLog
M libraries/plugins/export/ExportSql.class.php

  Log Message:
  ---
  Backport 053edda33f5bd957726b8bc82167ec8d30e705bc

Signed-off-by: Marc Delisle 


  Commit: 9e08133f49f0b99868fec434762366d08a45b6f8
  
https://github.com/phpmyadmin/phpmyadmin/commit/9e08133f49f0b99868fec434762366d08a45b6f8
  Author: Marc Delisle 
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
M README
M doc/conf.py
M libraries/Config.class.php

  Log Message:
  ---
  4.5.0.1 release

Signed-off-by: Marc Delisle 


  Commit: a2fc766269e7c77e8380bc882a505824564937b2
  
https://github.com/phpmyadmin/phpmyadmin/commit/a2fc766269e7c77e8380bc882a505824564937b2
  Author: Xavier Navarro 
  Date:   2015-09-24 (Thu, 24 Sep 2015)

  Changed paths:
M po/ca.po

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

Currently translated at 100.0% (3209 of 3209 strings)

[CI skip]


  Commit: 8d202a3dc13a4296ef5809831889f0b86256a31d
  
https://github.com/phpmyadmin/phpmyadmin/commit/8d202a3dc13a4296ef5809831889f0b86256a31d
  Author: Dan Ungureanu 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M libraries/plugins/export/ExportSql.class.php
M libraries/sql-parser/src/Components/Key.php
M libraries/sql-parser/src/Utils/Table.php

  Log Message:
  ---
  Fixes #11497.
Cherry-picked udan11/sql-parser@1415469.

Signed-off-by: Dan Ungureanu 
Signed-off-by: Marc Delisle 


  Commit: 440caeac658f3149253f1a6834ef2f229586
  
https://github.com/phpmyadmin/phpmyadmin/commit/440caeac658f3149253f1a6834ef2f229586
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  ChangeLog entry

Signed-off-by: Marc Delisle 


  Commit: 8afe5940da4d04863022977d31200c4635d47d37
  
https://github.com/phpmyadmin/phpmyadmin/commit/8afe5940da4d04863022977d31200c4635d47d37
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Log Message:
  ---
  Merge commit '9e08133' into QA_4_5


  Commit: ac33a96ba8a7911dc977da8c891d8d1518f0b285
  
https://github.com/phpmyadmin/phpmyadmin/commit/ac33a96ba8a7911dc977da8c891d8d1518f0b285
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M ChangeLog
M libraries/plugins/export/ExportSql.class.php
M libraries/sql-parser/src/Components/Key.php
M libraries/sql-parser/src/Utils/Table.php

  Log Message:
  ---
  Fix merge conflict

Signed-off-by: Marc Delisle 


  Commit: 1bf72d6bcbfc692f43c11a178f407c8ae9d850c3
  
https://github.com/phpmyadmin/phpmyadmin/commit/1bf72d6bcbfc692f43c11a178f407c8ae9d850c3
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Log Message:
  ---
  Merge commit 'a2fc766'


  Commit: 36cacef722ffca45532143f1079e005a83ee8d19
  
https://github.com/phpmyadmin/phpmyadmin/commit/36cacef722ffca45532143f1079e005a83ee8d19
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Log Message:
  ---
  Merge commit '9e08133'


  Commit: 2f41ca05f7ee0f0f2b32c2b33f04692acc6c2e3b
  
https://github.com/phpmyadmin/phpmyadmin/commit/2f41ca05f7ee0f0f2b32c2b33f04692acc6c2e3b
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M libraries/plugins/export/ExportSql.class.php
M libraries/sql-parser/src/Components/Key.php
M libraries/sql-parser/src/Utils/Table.php

  Log Message:
  ---
  Merge commit '8d202a3'


  Commit: 0c361f5ca597b5c9edfa0c3a2fee9e2c2b7793a3
  
https://github.com/phpmyadmin/phpmyadmin/commit/0c361f5ca597b5c9edfa0c3a2fee9e2c2b7793a3
  Author: Marc Delisle 
  Date:   2015-09-25 (Fri, 25 Sep 2015)

  Changed paths:
M ChangeLog

  Log Message:
  ---
  Fix merge conflict

Signed-off-by: Marc Delisle 


  Commit: 429e39e6e635ac6c7fd30aee9a603b45236a058f

[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 796e6a: 4.5.0 release

2015-09-23 Thread Marc Delisle 
  Branch: refs/heads/MAINT_4_5_0
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 796e6ae09301a7ea8aae74fdb3bb44538c0f5151
  
https://github.com/phpmyadmin/phpmyadmin/commit/796e6ae09301a7ea8aae74fdb3bb44538c0f5151
  Author: Marc Delisle 
  Date:   2015-09-23 (Wed, 23 Sep 2015)

  Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.class.php

  Log Message:
  ---
  4.5.0 release

Signed-off-by: Marc Delisle 


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