Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 060fe233c2acaca3d045c012c2bb466645f1d21e https://github.com/phpmyadmin/phpmyadmin/commit/060fe233c2acaca3d045c012c2bb... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-03 (Tue, 03 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Remove some HTML-PHP mix and form function for column names row

Commit: 38b10f042cda97435a3d90b697202c943eda448e https://github.com/phpmyadmin/phpmyadmin/commit/38b10f042cda97435a3d90b69720... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Use global REQUEST variable at some places, fixes previously filled criteria display

Commit: 9ccd70651f86d6233f63ff4cc33f7b8b6fdd10ad https://github.com/phpmyadmin/phpmyadmin/commit/9ccd70651f86d6233f63ff4cc33f... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Form functions for displaying sorting options list

Commit: 408baf94019d9caf0657b3f90754007c6961aff0 https://github.com/phpmyadmin/phpmyadmin/commit/408baf94019d9caf0657b3f90754... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Fix some doc comments

Commit: 18afed10a8c941b9a2ccac5e0ca3b5dd8afaaf16 https://github.com/phpmyadmin/phpmyadmin/commit/18afed10a8c941b9a2ccac5e0ca3... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Fix selected criteria display while inserting/deleting new column

Commit: a5d1887ee243514266d275724f26ba7d5ebf301d https://github.com/phpmyadmin/phpmyadmin/commit/a5d1887ee243514266d275724f26... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M po/da.po M po/fa.po M po/nb.po M test/classes/PMA_DisplayResults_test.php

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

Commit: 9eed63a622d58560fd6372b1d3cc150495381539 https://github.com/phpmyadmin/phpmyadmin/commit/9eed63a622d58560fd6372b1d3cc... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php M po/fa.po M po/nb.po M po/pt_BR.po

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

Commit: 75a644c1e956965d8b19ecf2168b8b5ca7a328cc https://github.com/phpmyadmin/phpmyadmin/commit/75a644c1e956965d8b19ecf2168b... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Form function to display show checkboxes

Commit: 270ab5e2254b0ca03954ffe3949efc1ef419a3dc https://github.com/phpmyadmin/phpmyadmin/commit/270ab5e2254b0ca03954ffe3949e... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Form function for displaying criteria inputboxes

Commit: 4ce4dee2da0ad39906664d1721b19460c7853302 https://github.com/phpmyadmin/phpmyadmin/commit/4ce4dee2da0ad39906664d1721b1... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-04 (Wed, 04 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Form function to display search table footer elements

Commit: f5d15946f3d02156d86f50a63fd521de746d0bea https://github.com/phpmyadmin/phpmyadmin/commit/f5d15946f3d02156d86f50a63fd5... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-05 (Thu, 05 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Form function to display tables select list

Commit: 2b9fbc4b84882f26d68ac7eb5bc57da49667eb23 https://github.com/phpmyadmin/phpmyadmin/commit/2b9fbc4b84882f26d68ac7eb5bc5... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-05 (Thu, 05 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Use globals to build SQL query for now

Commit: 74f5144389c97b3b90cc2c2289d0949860b70b18 https://github.com/phpmyadmin/phpmyadmin/commit/74f5144389c97b3b90cc2c2289d0... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-06 (Fri, 06 Jul 2012)

Changed paths: M db_qbe.php

Log Message: ----------- Form functions for column modification options, fixes already set criteria display too

Commit: 344d00782ac863a087835b612c04d60bdc3ae9b0 https://github.com/phpmyadmin/phpmyadmin/commit/344d00782ac863a087835b612c04... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: M libraries/TableSearch.class.php

Log Message: ----------- Fix wrong function call

Commit: 65a3dbbeda1bde2b7ff1b04a462cbd7e6202d45e https://github.com/phpmyadmin/phpmyadmin/commit/65a3dbbeda1bde2b7ff1b04a462c... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: M libraries/TableSearch.class.php

Log Message: ----------- Fix doc comments

Commit: df0658b169dcdf5e61f4e030562767e355a65f67 https://github.com/phpmyadmin/phpmyadmin/commit/df0658b169dcdf5e61f4e0305627... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: A libraries/DbSearch.class.php

Log Message: ----------- Make libraries/DbSearch.class.php for handling Database search

Commit: 9315294d8f5d915c08ce6ab80d63e57ad4a76ea6 https://github.com/phpmyadmin/phpmyadmin/commit/9315294d8f5d915c08ce6ab80d63... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: M libraries/DbSearch.class.php

Log Message: ----------- Add existing functions to PMA_DbSearch with required modifications

Commit: d52321a90ccfce426893423053e77e6f74760d72 https://github.com/phpmyadmin/phpmyadmin/commit/d52321a90ccfce426893423053e7... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: M libraries/DbSearch.class.php

Log Message: ----------- Use current object reference to point to PMA_CommonFunctions object

Commit: 01bcab27822e981e9f4c516d0a456774bb6dfad3 https://github.com/phpmyadmin/phpmyadmin/commit/01bcab27822e981e9f4c516d0a45... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: M db_search.php M libraries/DbSearch.class.php

Log Message: ----------- Use PMA_DbSearch in db_search.php

Commit: c453d2b47ea18f8c78ca892e228c96a2ffceb101 https://github.com/phpmyadmin/phpmyadmin/commit/c453d2b47ea18f8c78ca892e228c... Author: Atul Pratap Singh atulpratapsingh05@gmail.com Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: R libraries/db_search.lib.php

Log Message: ----------- Deleted libraries/db_search.lib.php

Commit: 60c657e9ec383966f85b2056b1a570d7322ffc9a https://github.com/phpmyadmin/phpmyadmin/commit/60c657e9ec383966f85b2056b1a5... Author: Marc Delisle marc@infomarc.info Date: 2012-07-07 (Sat, 07 Jul 2012)

Changed paths: M db_qbe.php M db_search.php A libraries/DbSearch.class.php M libraries/TableSearch.class.php R libraries/db_search.lib.php

Log Message: ----------- Merge branch 'atul'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/676715b7f2a7...60c657e9ec38