Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8403bd6c7e67bcdfd5c8cc824d5473eaa3ac5b18
      
https://github.com/phpmyadmin/phpmyadmin/commit/8403bd6c7e67bcdfd5c8cc824d5473eaa3ac5b18
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ChangeLog
    M js/indexes.js
    M js/tbl_structure.js
    M libraries/structure.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_relation.lib.php
    M tbl_addfield.php
    M tbl_relation.php
    M tbl_structure.php

  Log Message:
  -----------
  rfe #1235 Relation view: move to main "Structure" page

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: 42419588e7becbe132c1ae04aff6c27f5bd8fcfd
      
https://github.com/phpmyadmin/phpmyadmin/commit/42419588e7becbe132c1ae04aff6c27f5bd8fcfd
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ChangeLog
    M js/console.js
    M libraries/Util.class.php
    M libraries/config/messages.inc.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/plugins/transformations/output/Text_Plain_Json.class.php
    M libraries/relation.lib.php
    M libraries/tbl_gis_visualization.lib.php
    M navigation.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/b...@latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/eo.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/fy.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/s...@latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/u...@latin.po
    M po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M prefs_manage.php
    M test/classes/PMA_Util_test.php

  Log Message:
  -----------
  Merge branch 'master' into rfe1235

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: 8222af3cac575467f81b5666bde375a15a56876c
      
https://github.com/phpmyadmin/phpmyadmin/commit/8222af3cac575467f81b5666bde375a15a56876c
  Author: Madhura Jayaratne <madhura...@gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M test/libraries/PMA_tbl_relation_test.php

  Log Message:
  -----------
  Update tests

Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>


  Commit: 9270d0826387fbdd78d9afe82e3f1cdc7ec2021e
      
https://github.com/phpmyadmin/phpmyadmin/commit/9270d0826387fbdd78d9afe82e3f1cdc7ec2021e
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M ChangeLog
    M js/indexes.js
    M js/tbl_structure.js
    M libraries/structure.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_relation.lib.php
    M tbl_addfield.php
    M tbl_relation.php
    M tbl_structure.php
    M test/libraries/PMA_tbl_relation_test.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle <m...@infomarc.info>


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/ddf7c7b009d4...9270d0826387
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to