webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-31 10:54:46 +03:00
Code Activity
84,299 Commits 12 Branches 481 Tags
768f736bcbe5370a2bc40a45e784c3db28f21838
Commit Graph

75 Commits

Author SHA1 Message Date
Marc Delisle
d31ba0cb02 Merge branch 'QA_4_0' 2013-06-16 07:42:07 -04:00
Marc Delisle
178f83f915 bug #3984 Cannot insert in this table (PHP < 5.4) 2013-06-16 07:37:34 -04:00
Michal Čihař
9e1a59b7d7 NDB supports relations since 7.3 
RFE #1433
 2013-06-11 11:03:48 +02:00
Michal Čihař
7365676ce0 AJAX request might not be set at this point 2013-06-10 15:20:21 +02:00
Marc Delisle
5fffdca3aa Parser: remove the color (html) mode 2013-05-30 07:54:05 -04:00
Marc Delisle
a215809922 Merge branch 'QA_4_0' 2013-05-29 17:25:38 -04:00
Marc Delisle
d448add28e bug #3579 NOW() function incorrectly selected (partial regression) 2013-05-29 17:23:35 -04:00
Marc Delisle
3e10572805 Fix typo 2013-05-29 09:57:34 -04:00
Michal Čihař
15a40a07bf Fix typo introduced in 2baf473a 2013-05-29 15:04:52 +02:00
Madhura Jayaratne
2baf473ad7 Merge branch 'master' into OOP_DBI 
Conflicts:
	libraries/database_interface.lib.php
 2013-05-26 21:43:33 +05:30
Madhura Jayaratne
3dd99512f0 These constants are better as a part of DatabaseInterface class 2013-05-26 21:15:24 +05:30
Marc Delisle
b8e4f346a5 Clarify function name 2013-05-26 11:34:43 -04:00
Madhura Jayaratne
650a8cdda3 Convert database interface to a class 2013-05-24 17:30:59 +05:30
Spun Nakandala
22ba2d8147 Bug #3919 PropertiesIconic not honored fixed 
(cherry picked from commit 01c57f71ca)
 2013-05-14 11:51:29 +02:00
Michal Čihař
a1e711b919 Merge pull request #361 from scnakandala/Bug_3919 
Bug #3919 PropertiesIconic not honored fixed
 2013-05-13 14:58:22 -07:00
Kasun Chathuranga
03fc9b9256 PMA_is_system_schema --> PMA_isSystemSchema 2013-05-12 08:51:54 +05:30
Spun Nakandala
01c57f71ca Bug #3919 PropertiesIconic not honored fixed 2013-05-10 12:09:51 +05:30
Michal Čihař
8f663d55b1 Merge remote-tracking branch 'origin/QA_4_0' 2013-05-10 08:20:08 +02:00
Spun Nakandala
5b82f4359a Bug #3918 Greyed out tabs when there are no rows fixed 2013-05-10 02:09:14 +05:30
Kasun Chathuranga
413123bd74 PMA_DBI_field_flags --> PMA_DBI_fieldFlags 2013-05-04 08:46:53 +05:30
Kasun Chathuranga
1c884f0cca PMA_DBI_free_result --> PMA_DBI_freeResult 2013-05-04 08:33:49 +05:30
Kasun Chathuranga
a242ed1ae5 PMA_DBI_fetch_row --> PMA_DBI_fetchRow 2013-05-04 08:31:22 +05:30
Kasun Chathuranga
6b1f6ae046 Merge branch 'master' into DBI_naming_cleanUp 
Conflicts:
	libraries/database_interface.lib.php
	libraries/db_table_exists.lib.php
	libraries/relation.lib.php
	libraries/rte/rte_triggers.lib.php
	libraries/schema/Dia_Relation_Schema.class.php
	libraries/schema/Visio_Relation_Schema.class.php
	tbl_addfield.php
 2013-05-01 00:51:15 +05:30
Kasun Chathuranga
bc4bfaa6d5 PMA_DBI_fetch_value --> PMA_DBI_fetchValue 2013-05-01 00:02:00 +05:30
Kasun Chathuranga
32e6c06324 PMA_DBI_get_columns --> PMA_DBI_getColumns 2013-04-30 23:36:47 +05:30
Kasun Chathuranga
bee0134b1f PMA_DBI_get_tables_full --> PMA_DBI_geTablesFull 2013-04-30 23:27:27 +05:30
Kasun Chathuranga
d933575811 PMA_DBI_try_query --> PMA_DBI_tryQuery 2013-04-30 23:05:18 +05:30
Michal Čihař
2fbb4cee0d Consistently include colon in strings to translate 
In some languages this makes difference in translating, so it's better
to give translators full context.
 2013-04-25 14:22:31 +02:00
Michal Čihař
5b73bf9788 Fix generating links to docs 
This makes correct links to docs when run from setup.
See bug #3886 and gh issue #279.
 2013-04-22 14:05:40 +02:00
Kasun Chathuranga
1a459f3575 Fix incorrect listing of records from to count 2013-04-13 23:19:49 +05:30
Madhura Jayaratne
b4d8e07a37 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	libraries/Util.class.php
 2013-03-28 17:41:41 +05:30
Madhura Jayaratne
b3db1f0d6f Change mysqlDie() to return the error message when $exit parameter is false 2013-03-28 17:34:40 +05:30
Marc Delisle
a0e85f3cdc Incorrect comment 2013-03-28 07:47:12 -04:00
Marc Delisle
6bbe53de25 Fix "Invalid argument supplied for foreach()" in case a DROP TABLE x statement was typed 2013-03-21 12:58:37 -04:00
Dieter Adriaenssens
525fe373ee fix coding style : add space before argument 2013-03-14 13:37:16 +01:00
Marc Delisle
88aa108672 Merge pull request #197 from shamika050/fix-grid_editing 
Contest-1 / Solve the problematic scenario
 2013-03-03 10:28:36 -08:00
shamika
26021f05f8 Bug Fix:#3813 grid editing utf8 set/enum value 2013-02-24 13:02:14 +05:30
Samith Dassanayake
1ebace0afd Fixed coding style issue 2013-02-21 19:35:59 +05:30
Samith Dassanayake
c4d14774c3 Fixed #3833 Undefined variable: sql_limit_to_append. 
Initialized the varible sql_limit_to_append,
Since isset($x) returns true when $x=''(which is not the expected behaviour of the usage), used the function empty()
 2013-02-20 23:38:53 +05:30
Marc Delisle
d26b112f40 Fix merge conflict 2013-02-15 12:36:10 -05:00
Atul Pratap Singh
cf200355a7 Fixing bug: 3798, correcting CHAR_LENGTH use, for blob in where clause 2013-02-12 11:14:42 +05:30
Herman van Rink
af37acd845 Use plain http for docs.phpmyadmin.net as the SSL certificate is only for *.readthedocs.org 2013-02-08 12:03:39 +01:00
Michal Čihař
57a97a7057 Use up to date links to bugs and feature requests 2013-02-04 11:52:47 +01:00
Rouslan Placella
58998ed7a3 Merge branch 'QA_3_5' 
Conflicts:
	libraries/common.lib.php
	po/uk.po
	tbl_change.php
	test/libraries/common/PMA_extractColumnSpec_test.php
 2013-01-21 13:34:31 +00:00
Dieter Adriaenssens
be2c09f36c improve coding style 2013-01-15 20:15:50 +01:00
Marc Delisle
22e79ee918 The ShowHint directive was not obeyed for some hints 2013-01-08 17:05:42 -05:00
Marc Delisle
2723495a4f Removed the AjaxEnable directive 2012-12-21 16:04:57 -05:00
Marc Delisle
4547c9a7c8 Handle the multiple columns Change input (for IE < 9) 2012-12-18 08:19:13 -05:00
Marc Delisle
b0a6275f87 Remove redundant PMA_ prefix 2012-12-10 14:25:54 -05:00
Marc Delisle
7ff92fd6a7 Bug #3591442 Fatal error when dropping table 2012-12-10 13:01:54 -05:00