gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,442 Commits 12 Branches 481 Tags 2.4 GiB
c406a0c190
Commit Graph

93 Commits

Author SHA1 Message Date
Madhura Jayaratne
6d2d17e575 Merge branch 'master' into pma_string 2013-07-27 23:08:42 +05:30
Madhura Jayaratne
b31a9cd16f Simplify how inline edit link is added. 2013-07-27 20:10:12 +05:30
Madhura Jayaratne
2a28436bdd #4035 Query "inline" link disappears when turning off "Explain SQL" option 2013-07-27 20:03:26 +05:30
Dieter Adriaenssens
ad8aa19097 remove duplicate code, CURLOPT_RETURNTRANSFER is set twice 2013-07-27 14:25:42 +02:00
Madhura Jayaratne
e5519859fb Make all string function accessible via $GLOBALS['PMA_String'] 2013-07-17 16:36:13 +05:30
Isaac Bennetch
e65826c408 Merge branch 'configurableMenus' of git://github.com/kasunchathuranga/phpmyadmin into kasunchathuranga-configurableMenus 2013-07-14 00:24:16 -04:00
Michal Čihař
df3502e804 Another adding of comma to sentences 2013-07-12 15:54:18 +02:00
Kasun Chathuranga
f56891acec Merge branch 'master' into configurableMenus 
Conflicts:
	libraries/Menu.class.php
	libraries/Util.class.php
 2013-07-12 17:01:03 +05:30
Michal Čihař
eb2f4634b3 wrap some long lines 2013-07-12 11:03:50 +02:00
Michal Čihař
e338e91e9d Improve version parsing to cope with version numbers we use currently 2013-07-12 10:54:59 +02:00
Michal Čihař
fc163bb512 Move version parsing to Util class 2013-07-12 10:54:01 +02:00
Michal Čihař
e4e6e1e46f Set timeout for version check requests 
Ported from setup script code (setup/lib/index.lib.php).
 2013-07-12 10:25:34 +02:00
Michal Čihař
dcd8d12cf6 Move version gathering into function and test it 2013-07-12 10:21:17 +02:00
Kasun Chathuranga
b756916c46 Manage user groups 2013-07-08 15:28:57 +05:30
Michal Čihař
bebba32337 Merge remote-tracking branch 'origin/QA_4_0' 
Conflicts:
	libraries/config.values.php
	libraries/sql_query_form.lib.php
	server_binlog.php
	server_databases.php
	tbl_structure.php
	test/classes/PMA_DisplayResults_test.php
 2013-06-24 10:41:54 +02:00
Marc Delisle
d4d5a03766 Bug #3960 NavigationBarIconic config not honored 2013-06-21 10:00:41 -04:00
Madhura Jayaratne
cd28acd807 Wrap a long line 2013-06-19 14:25:08 +05:30
Madhura Jayaratne
575513dc50 Fix indentation 2013-06-19 12:46:19 +05:30
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