[Phpmyadmin-git] [phpmyadmin/phpmyadmin] dbe87e: Form function for generating SELECT clause
Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: dbe87e52a4f6c957f807893bb2188aac0f17f5da https://github.com/phpmyadmin/phpmyadmin/commit/dbe87e52a4f6c957f807893bb218... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Form function for generating SELECT clause
Commit: 46b7fe003978a896f5d8b6108c35818915d0bddf https://github.com/phpmyadmin/phpmyadmin/commit/46b7fe003978a896f5d8b6108c35... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Form function for generating where clause
Commit: 33171f2f41493063655d06a0b7ed68fbb395a028 https://github.com/phpmyadmin/phpmyadmin/commit/33171f2f41493063655d06a0b7ed... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths: M libraries/DisplayResults.class.php M po/cs.po M po/es.po M po/nb.po M po/pt_BR.po M sql.php M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Theme_test.php M test/libraries/PMA_bookmark_test.php A test/libraries/PMA_mime_test.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 664e2d46a62360f85f71bb7994c72e33f075cde1 https://github.com/phpmyadmin/phpmyadmin/commit/664e2d46a62360f85f71bb7994c7... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Add missing return statement
Commit: 398588a16de39ce39c8d6112167e41c245d32095 https://github.com/phpmyadmin/phpmyadmin/commit/398588a16de39ce39c8d6112167e... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Form function to generate order by clause
Commit: 7024c4df9b5cd97ebe1c37bfb7045280a9bb3312 https://github.com/phpmyadmin/phpmyadmin/commit/7024c4df9b5cd97ebe1c37bfb704... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Fix doc comment
Commit: 9fe3a570f097267367dbd2f9dc2935d2a0e548c2 https://github.com/phpmyadmin/phpmyadmin/commit/9fe3a570f097267367dbd2f9dc29... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Logical improvement in PMA_dbQbeGetOrderByClause
Commit: fc7bfa8cc332d88a3ec95babf54769e869dcbc0d https://github.com/phpmyadmin/phpmyadmin/commit/fc7bfa8cc332d88a3ec95babf547... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Use implode in place of last_select and last_orderby
Commit: 34e06e133d1108155c9b8c0ff08c23ba6056dcbe https://github.com/phpmyadmin/phpmyadmin/commit/34e06e133d1108155c9b8c0ff08c... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths: M libraries/DbSearch.class.php M libraries/DisplayResults.class.php M libraries/Menu.class.php M libraries/Table.class.php M libraries/TableSearch.class.php M libraries/schema/Pdf_Relation_Schema.class.php M libraries/schema/User_Schema.class.php M main.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 48ae6db4cfc2e8f89a7e0920c5e866dd054b6ce8 https://github.com/phpmyadmin/phpmyadmin/commit/48ae6db4cfc2e8f89a7e0920c5e8... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Some variable name improvements
Commit: e5f051bc9433d876efac946d2cffc1e75e36cc8f https://github.com/phpmyadmin/phpmyadmin/commit/e5f051bc9433d876efac946d2cff... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths: M libraries/insert_edit.lib.php M po/pt_BR.po
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: cc3fbae9407dd75fa85179d9473b4503291a55a3 https://github.com/phpmyadmin/phpmyadmin/commit/cc3fbae9407dd75fa85179d9473b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Form function to get Ins/Del and AND/OR row cell
Commit: 5faa4cf876a26892fa0526ad4f54cd0881ad1279 https://github.com/phpmyadmin/phpmyadmin/commit/5faa4cf876a26892fa0526ad4f54... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths: M libraries/insert_edit.lib.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 4115b6684e921b6e7e2169b852c374b3096087da https://github.com/phpmyadmin/phpmyadmin/commit/4115b6684e921b6e7e2169b852c3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Form function to get more criteria inputboxes
Commit: 91f04e5660a69d4ed39e279947bd23cbbb11b1b2 https://github.com/phpmyadmin/phpmyadmin/commit/91f04e5660a69d4ed39e279947bd... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Form function for generating AND/OR, INS/DEL criteria inbutbox rows
Commit: 87ce6e7a16a67725e31d1b6dda8fb42cc4773e60 https://github.com/phpmyadmin/phpmyadmin/commit/87ce6e7a16a67725e31d1b6dda8f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Some more variable name improvements
Commit: a83c4c943020dc8117e821c50b07134d98bd9f29 https://github.com/phpmyadmin/phpmyadmin/commit/a83c4c943020dc8117e821c50b07... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Add missing doc block
Commit: 6eabf4a2d070cb39f1818793296192e9bb5e1dfa https://github.com/phpmyadmin/phpmyadmin/commit/6eabf4a2d070cb39f18187932961... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths: M libraries/DisplayResults.class.php M po/ko.po M po/pl.po M sql.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 5f61e9cc461870b3ff8d1daef2740c9f512c7e51 https://github.com/phpmyadmin/phpmyadmin/commit/5f61e9cc461870b3ff8d1daef274... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths: M db_qbe.php A libraries/db_qbe.lib.php
Log Message: ----------- New library file for db_qbe.php
Commit: 96eaac67dbece884784be8eab922e7021a1ccb2e https://github.com/phpmyadmin/phpmyadmin/commit/96eaac67dbece884784be8eab922... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-14 (Sat, 14 Jul 2012)
Changed paths: M po/da.po M po/de.po
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: dc1728f99a50340856b32a6ac1ba2974df2ba715 https://github.com/phpmyadmin/phpmyadmin/commit/dc1728f99a50340856b32a6ac1ba... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-14 (Sat, 14 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Fix typo introduced before variable name changes
Commit: de318fce3b0578d58399097db8c3e596b641db7b https://github.com/phpmyadmin/phpmyadmin/commit/de318fce3b0578d58399097db8c3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-14 (Sat, 14 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Form functions to get LEFT JOIN column candidates
Commit: db9dbc405285d231a234ba2d8b98cf7dcb4f8158 https://github.com/phpmyadmin/phpmyadmin/commit/db9dbc405285d231a234ba2d8b98... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-14 (Sat, 14 Jul 2012)
Changed paths: M Documentation.html
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 5668e7f90808318f48b1cc305cebafcd79945850 https://github.com/phpmyadmin/phpmyadmin/commit/5668e7f90808318f48b1cc305ceb... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-15 (Sun, 15 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Form function to get the master table
Commit: 26c77f3a90cfe066ff4af932420a79b66fe17a45 https://github.com/phpmyadmin/phpmyadmin/commit/26c77f3a90cfe066ff4af932420a... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-15 (Sun, 15 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Form function to get valid where clauses
Commit: 8a901c4e73246dd63ce0d873ea931c2b80fb0ffa https://github.com/phpmyadmin/phpmyadmin/commit/8a901c4e73246dd63ce0d873ea93... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-15 (Sun, 15 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Some variable name improvements
Commit: aea70f57439a3e8b987103ebdfd1635f665e140d https://github.com/phpmyadmin/phpmyadmin/commit/aea70f57439a3e8b987103ebdfd1... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-15 (Sun, 15 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Remove some unuseful variables
Commit: 1623e5581d73c34430d40666d6070ea8f41ea0c8 https://github.com/phpmyadmin/phpmyadmin/commit/1623e5581d73c34430d40666d607... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-15 (Sun, 15 Jul 2012)
Changed paths: M db_qbe.php M libraries/relation.lib.php
Log Message: ----------- Remove some global variables
Commit: fd2e73e989bed088e4fda56c73d37520932062dd https://github.com/phpmyadmin/phpmyadmin/commit/fd2e73e989bed088e4fda56c73d3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-15 (Sun, 15 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Form function to get FROM clause
Commit: 77cfa19b6c3e83342f0359ebc64bbf9716af1ffb https://github.com/phpmyadmin/phpmyadmin/commit/77cfa19b6c3e83342f0359ebc64b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths: M ChangeLog M libraries/rte/rte_events.lib.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 867356b0723ced2d316645042353435f0468d702 https://github.com/phpmyadmin/phpmyadmin/commit/867356b0723ced2d316645042353... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths: M libraries/db_qbe.lib.php
Log Message: ----------- Fix typo
Commit: ec6ac79775f3930afd99536ff40e43df07ecdae9 https://github.com/phpmyadmin/phpmyadmin/commit/ec6ac79775f3930afd99536ff40e... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths: M libraries/db_qbe.lib.php M libraries/relation.lib.php
Log Message: ----------- Some more variable name improvements
Commit: 6f63f54ca94bc2b05063cf34c4b4c951509379c6 https://github.com/phpmyadmin/phpmyadmin/commit/6f63f54ca94bc2b05063cf34c4b4... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Remove post_params
Commit: 9812f2fb5f8637fa38712fed37d0c2a8af41fe08 https://github.com/phpmyadmin/phpmyadmin/commit/9812f2fb5f8637fa38712fed37d0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths: M ChangeLog M libraries/rte/rte_events.lib.php
Log Message: ----------- Merge branch 'master' of github.com:zixtor/phpmyadmin
Commit: fdd851c19caac185ebd6df06b507a3a4c0a06f6b https://github.com/phpmyadmin/phpmyadmin/commit/fdd851c19caac185ebd6df06b507... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Form funcion to get SQL query
Commit: 748d2e9144610c40a30c67aa466bc9eaa81f2325 https://github.com/phpmyadmin/phpmyadmin/commit/748d2e9144610c40a30c67aa466b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Form function to generate QBE form
Commit: 5aac152d687668a4a0e379ca58ad9190d8b891b6 https://github.com/phpmyadmin/phpmyadmin/commit/5aac152d687668a4a0e379ca58ad... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths: M libraries/Advisor.class.php M libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/bookmark.lib.php M po/pt_BR.po M po/sk.po M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Error_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_Message_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_StorageEngine_test.php M test/classes/PMA_Theme_Manager_test.php M test/classes/PMA_Types_MySQL_test.php M test/libraries/PMA_SQL_parser_test.php M test/libraries/PMA_STR_sub_test.php M test/libraries/PMA_bookmark_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/core/PMA_warnMissingExtension_test.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 0bf05d6b72c5f832e4d30b1dbef5b4244aa65a67 https://github.com/phpmyadmin/phpmyadmin/commit/0bf05d6b72c5f832e4d30b1dbef5... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths: M db_qbe.php M libraries/db_qbe.lib.php
Log Message: ----------- Some remaining variable name improvements
Commit: 5f0e341182b7e04c9206f90dda62c694bb1b94d6 https://github.com/phpmyadmin/phpmyadmin/commit/5f0e341182b7e04c9206f90dda62... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths: M build.xml A phpunit.xml.nocoverage M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@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/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.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/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.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/nl.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/sr@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/uz@latin.po M po/zh_CN.po M po/zh_TW.po M test/classes/PMA_DisplayResults_test.php M test/classes/PMA_Error_test.php M test/classes/PMA_PDF_test.php M test/classes/gis/PMA_GIS_Geometrycollection_test.php M test/libraries/common/PMA_expandUserString_test.php A test/libraries/core/PMA_headerLocation_test.php R test/libraries/core/PMA_headerLocation_test_disabled.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: d4c9646430e4be9b30e92169d634748a470c8f5b https://github.com/phpmyadmin/phpmyadmin/commit/d4c9646430e4be9b30e92169d634... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths: A libraries/DBQbe.class.php
Log Message: ----------- Initiate db_qbe's conversion to OOP
Commit: f1933b05c76f72b2b2ee0258fb524da50e163d7c https://github.com/phpmyadmin/phpmyadmin/commit/f1933b05c76f72b2b2ee0258fb52... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths: M libraries/DBQbe.class.php
Log Message: ----------- Add existing functions to PMA_DBQbe with required modifications
Commit: 08b51a1e3baa8ddbbf81a2a753a30899ddf0623e https://github.com/phpmyadmin/phpmyadmin/commit/08b51a1e3baa8ddbbf81a2a753a3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths: M libraries/DBQbe.class.php
Log Message: ----------- Add some more variables to PMA_DBQbe
Commit: f2a58002d767086c03fca53c007b021a6e497900 https://github.com/phpmyadmin/phpmyadmin/commit/f2a58002d767086c03fca53c007b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths: M libraries/Advisor.class.php M libraries/advisory_rules.txt M po/gl.po M po/hi.po M po/hu.po M po/ko.po M test/libraries/core/PMA_warnMissingExtension_test.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: a62c91c804b4437d6badf2d8a483716488629591 https://github.com/phpmyadmin/phpmyadmin/commit/a62c91c804b4437d6badf2d8a483... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths: M libraries/DBQbe.class.php
Log Message: ----------- Use local function to get PMA_CommonFunctions instance
Commit: 0eb619227e3b1d8a062dfeb14f39c3da51313723 https://github.com/phpmyadmin/phpmyadmin/commit/0eb619227e3b1d8a062dfeb14f39... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths: M libraries/DBQbe.class.php
Log Message: ----------- Fix typo in a62c91c804b4437d6bad
Commit: 1b66c0f78597dfe88aa89f73f9e544d563d04e90 https://github.com/phpmyadmin/phpmyadmin/commit/1b66c0f78597dfe88aa89f73f9e5... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths: M po/fa.po M po/gl.po M po/ur.po
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 389c6a17a3aadab083a505817acadf7b2302c401 https://github.com/phpmyadmin/phpmyadmin/commit/389c6a17a3aadab083a505817aca... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths: M libraries/DBQbe.class.php
Log Message: ----------- Fix another typo in a62c91c804b4437d6bad
Commit: 6fcbbb72d78d16196cd834fdfd407394d0e41bf7 https://github.com/phpmyadmin/phpmyadmin/commit/6fcbbb72d78d16196cd834fdfd40... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths: M db_qbe.php M libraries/DBQbe.class.php
Log Message: ----------- Use PMA_DBQbe in db_qbe.php
Commit: 05ac5ff365cf839cdba8e5afc4b343095c0f57ee https://github.com/phpmyadmin/phpmyadmin/commit/05ac5ff365cf839cdba8e5afc4b3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-21 (Sat, 21 Jul 2012)
Changed paths: A libraries/server_privileges.lib.php M server_privileges.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: a89a02e0b267797fa027ba8469aa856bb874a0b2 https://github.com/phpmyadmin/phpmyadmin/commit/a89a02e0b267797fa027ba8469aa... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-21 (Sat, 21 Jul 2012)
Changed paths: M libraries/DBQbe.class.php
Log Message: ----------- Fix some warnings
Commit: 6132bb129945cc330173c77a62a2fb3ef65344c4 https://github.com/phpmyadmin/phpmyadmin/commit/6132bb129945cc330173c77a62a2... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-21 (Sat, 21 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Fix wrong require_once
Commit: c97ee5fd4b39c0d48c4777e9c018e9c7656003d8 https://github.com/phpmyadmin/phpmyadmin/commit/c97ee5fd4b39c0d48c4777e9c018... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-21 (Sat, 21 Jul 2012)
Changed paths: M db_qbe.php M libraries/DBQbe.class.php
Log Message: ----------- Remove some more global variables
Commit: fadeff76e31d77984bea7aab2f91ec35d850bc78 https://github.com/phpmyadmin/phpmyadmin/commit/fadeff76e31d77984bea7aab2f91... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-21 (Sat, 21 Jul 2012)
Changed paths: R libraries/db_qbe.lib.php
Log Message: ----------- Deleted libraries/db_qbe.lib.php
Commit: 4b47c6d2cb75f581dc4c1f26160560f8a56b4833 https://github.com/phpmyadmin/phpmyadmin/commit/4b47c6d2cb75f581dc4c1f261605... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-21 (Sat, 21 Jul 2012)
Changed paths: M libraries/schema/User_Schema.class.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 80e13b0aca9119aead05aca83926bdc718b6b7be https://github.com/phpmyadmin/phpmyadmin/commit/80e13b0aca9119aead05aca83926... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Add missing cfgRelation declaration
Commit: 9ac38c49de981621458f9c6cfaf221d3d358a599 https://github.com/phpmyadmin/phpmyadmin/commit/9ac38c49de981621458f9c6cfaf2... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Fix visual buider link for now
Commit: 916143e27fd7338c945fc4e5b0cb9ec4982e807a https://github.com/phpmyadmin/phpmyadmin/commit/916143e27fd7338c945fc4e5b0cb... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/DBQbe.class.php M libraries/relation.lib.php
Log Message: ----------- Fix multiple LEFT JOIN generation problem
Commit: 9dece4fbef60c31bde2ab21aeb445e6d3c569b96 https://github.com/phpmyadmin/phpmyadmin/commit/9dece4fbef60c31bde2ab21aeb44... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M db_qbe.php
Log Message: ----------- Add wrongly removed query execution part
Commit: 6c0e9e5391ba8f74ec7e3152ba08a1f429c18742 https://github.com/phpmyadmin/phpmyadmin/commit/6c0e9e5391ba8f74ec7e3152ba08... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-22 (Sun, 22 Jul 2012)
Changed paths: M libraries/relation.lib.php
Log Message: ----------- Fix typo in 916143e27f
Commit: 9649f510dc9639f2cf70f21f0ccda14a954d0b98 https://github.com/phpmyadmin/phpmyadmin/commit/9649f510dc9639f2cf70f21f0ccd... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths: M libraries/PDF.class.php M libraries/schema/Dia_Relation_Schema.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M libraries/schema/User_Schema.class.php M libraries/schema/Visio_Relation_Schema.class.php M po/da.po M po/fa.po M po/zh_CN.po M test/classes/PMA_Error_Handler_test.php M test/classes/PMA_List_Database_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_StorageEngine_test.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: 81456ec05d54f3ab8518e6af3d660b78f7b31334 https://github.com/phpmyadmin/phpmyadmin/commit/81456ec05d54f3ab8518e6af3d66... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths: M export.php M import.php M libraries/CommonFunctions.class.php M libraries/DisplayResults.class.php M libraries/database_interface.lib.php M libraries/dbi/mysql.dbi.lib.php M libraries/dbi/mysqli.dbi.lib.php M libraries/import.lib.php M libraries/plugin_interface.lib.php M libraries/plugins/export/ExportCodegen.class.php M libraries/plugins/export/ExportCsv.class.php M libraries/plugins/export/ExportExcel.class.php M libraries/plugins/export/ExportHtmlword.class.php M libraries/plugins/export/ExportJson.class.php M libraries/plugins/export/ExportLatex.class.php R libraries/plugins/export/ExportMediawiki.class.php M libraries/plugins/export/ExportOds.class.php M libraries/plugins/export/ExportOdt.class.php M libraries/plugins/export/ExportPdf.class.php M libraries/plugins/export/ExportPhparray.class.php R libraries/plugins/export/ExportSql.class.php M libraries/plugins/export/ExportTexytext.class.php M libraries/plugins/export/ExportXml.class.php M libraries/plugins/export/ExportYaml.class.php A libraries/plugins/export/todo_change_properties/ExportMediawiki.class.php A libraries/plugins/export/todo_change_properties/ExportSql.class.php M libraries/plugins/import/ImportSql.class.php A libraries/properties/PropertyItem.class.php A libraries/properties/options/OptionsPropertyGroup.class.php A libraries/properties/options/OptionsPropertyItem.class.php A libraries/properties/options/OptionsPropertyOneItem.class.php A libraries/properties/options/groups/OptionsPropertyMainGroup.class.php A libraries/properties/options/groups/OptionsPropertyRootGroup.class.php A libraries/properties/options/groups/OptionsPropertySubgroup.class.php A libraries/properties/options/items/BoolPropertyItem.class.php A libraries/properties/options/items/DocPropertyItem.class.php A libraries/properties/options/items/HiddenPropertyItem.class.php A libraries/properties/options/items/MessageOnlyPropertyItem.class.php A libraries/properties/options/items/RadioPropertyItem.class.php A libraries/properties/options/items/SelectPropertyItem.class.php A libraries/properties/options/items/TextPropertyItem.class.php A libraries/properties/plugins/ExportPluginProperties.class.php A libraries/properties/plugins/ImportPluginProperties.class.php A libraries/properties/plugins/PluginPropertyItem.class.php A libraries/properties/plugins/TransformationsPluginProperties.class.php M libraries/rte/rte_routines.lib.php M po/ca.po M po/gl.po M po/zh_CN.po M sql.php M test/AllSeleniumTests.php M test/classes/PMA_Types_MySQL_test.php M test/libraries/PMA_bookmark_test.php A test/selenium/PmaSeleniumCreateDropDatabaseTest.php
Log Message: ----------- Merge remote-tracking branch 'upstream/master'
Commit: c59aeba53d6b71a9c99233e196e36e1657702ace https://github.com/phpmyadmin/phpmyadmin/commit/c59aeba53d6b71a9c99233e196e3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths: M libraries/DBQbe.class.php
Log Message: ----------- Fix typo
Commit: d07e580dd76b90e424c4033460ff8ed3203571a7 https://github.com/phpmyadmin/phpmyadmin/commit/d07e580dd76b90e424c4033460ff... Author: Marc Delisle marc@infomarc.info Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths: M db_qbe.php A libraries/DBQbe.class.php M libraries/relation.lib.php
Log Message: ----------- Merge branch 'atul'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b9caf581274f...d07e580dd76b
-
Marc Delisle