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

293 Commits

Author SHA1 Message Date
Madhura Jayaratne
5b8b8bc8dc Merge branch 'QA_4_4' 2015-04-14 22:57:35 +05:30
Madhura Jayaratne
0f3840138f bug #4207 json_encode error due to strftime returning non utf8 chars in Windows 8.1 Chinese version 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-14 22:56:00 +05:30
Madhura Jayaratne
8af521f550 Merge branch 'QA_4_4' 2015-04-07 10:28:38 +05:30
Madhura Jayaratne
63570bc30f bug #4841 Status page: Mislukte pogingen per uur value is incorrect 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-07 10:20:12 +05:30
Marc Delisle
04b17cddd2 Merge branch 'QA_4_4' 2015-03-28 14:54:50 -04:00
Marc Delisle
53e26b5656 Merge branch 'QA_4_3' into QA_4_4 2015-03-28 14:53:09 -04:00
Deven Bansod
b52a17608c Tries to fix bug-#4820 
Removed the str_replace on $anchor as it seemed to break the anchor links.

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-29 03:55:01 +05:30
Madhura Jayaratne
b6f79a9202 Limit pos based on the number of rows in the table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 11:39:46 +05:30
Madhura Jayaratne
5a0ffa30fd rfe Pagination for GIS visualization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-06 11:27:50 +05:30
Madhura Jayaratne
cb64587631 Improve coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-05 10:04:14 +05:30
Madhura Jayaratne
6f3001e69e Merge branch 'QA_4_3' into QA_4_4 2015-03-05 08:07:52 +05:30
Madhura Jayaratne
8f28b8fa27 bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-05 07:59:54 +05:30
Michal Čihař
a940279dff Optimize stripping b' prefix and ' suffix 
Use ltrim/rtrim is better than strtr with array.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-02-27 14:25:54 +01:00
Madhura Jayaratne
bb21148393 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 11:02:40 +05:30
Madhura Jayaratne
04665a72c9 bug #4780 Notice when timestamp column does not have default value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-26 10:59:36 +05:30
Madhura Jayaratne
07c8211f73 Update return types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:43:55 +05:30
Madhura Jayaratne
dbf53d7dba This is global variable 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:41:00 +05:30
Madhura Jayaratne
8a2b870b04 Empty string makes more sense as the default value for table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-13 15:05:31 +05:30
Hugues Peccatte
7356b58b43 Add missing returns and update unit tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-02-08 14:31:17 +01:00
Nisarg Jhaveri
ad84a3fe28 Clarify the "Inline" link, rfe_1600 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-02-04 21:43:41 +05:30
Madhura Jayaratne
8ed47444db Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-23 16:44:00 +05:30
Madhura Jayaratne
43e5a71e2c Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-21 10:08:39 +05:30
Madhura Jayaratne
6ff3e42d53 Check whether version and date is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-20 23:31:46 +05:30
Hugues Peccatte
7053381719 Merge branch 'f1591_master' 2015-01-13 22:43:19 +01:00
Madhura Jayaratne
bc0910cc9b Merge branch 'QA_4_3' 2015-01-12 10:36:52 +05:30
Madhura Jayaratne
00c7e891e1 Properly implement 'TableNavigationLinksMode' configuration 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-12 10:34:37 +05:30
Hugues Peccatte
d7d260f5fd Manage empty target. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-11 16:52:08 +01:00
Hugues Peccatte
44b4f7f7eb Update setup and documentation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-11 16:19:42 +01:00
Marc Delisle
e3d11adb74 Fix comments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:59:29 -05:00
Madhura Jayaratne
f6b7f98322 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:43:54 -05:00
Madhura Jayaratne
0430ac6337 #4663 Export missing back ticks for order table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 12:53:12 +05:30
Marc Delisle
780ff0217f Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-12 07:30:38 -05:00
Madhura Jayaratne
eb69c015ac #4644 Error when browsing tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-12 15:26:00 +05:30
Marc Delisle
60b87410fd Fix typo in variable name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-10 09:04:42 -05:00
Madhura Jayaratne
efdda87f28 Merge branch 'QA_4_3' 2014-12-10 12:45:58 +05:30
Madhura Jayaratne
ce2474f108 bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query. 
Url may not necessarily have a query part

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 12:39:37 +05:30
Michal Čihař
61fcf215e5 Detect failure of curl_init 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:20:13 +01:00
Nisarg Jhaveri
9bfb7dd35b Better implementation of placeholder in dropdowns 
If something else is selected, show placeholder as disabled option.
Previously it was ignoring `$active_choice` if placeholder is given.

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2014-12-04 18:42:46 +05:30
Marc Delisle
f69c48b686 Improve HTML 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 12:47:44 -05:00
Marc Delisle
eb66742475 Merge pull request #1412 from nisargjhaveri/show_all_dropdown 
Show placeholder in number of rows dropdown when showing all
 2014-12-03 12:32:18 -05:00
Nisarg Jhaveri
79a3d04ed5 Show placeholder in number of rows dropdown when showing all 
- Implemented placeholder in dropdown in getDropdown in PMA_Util
- Show 'All' as placeholder when Show all is checked, in "Number of
rows:" dropdown

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-12-03 19:48:54 +05:30
Madhura Jayaratne
8d9054f732 Use class attribute to select result_query div 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 16:49:17 +05:30
Madhura Jayaratne
b1fd49ee6b Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 09:04:32 +05:30
Madhura Jayaratne
b8e13f5b7a Distinguish between options of each result set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 08:44:07 +05:30
Madhura Jayaratne
f5a943e8a1 Use class attribute to identify correct sql query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 13:43:30 +05:30
Madhura Jayaratne
201b744650 Remove id from display options slider 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 17:19:53 +05:30
Madhura Jayaratne
aff4046fdd Update getCheckbox to add id field. Remove id field from profiling checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-27 16:58:20 +05:30
Madhura Jayaratne
469d6311c5 Remove duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-26 18:23:08 +05:30
Madhura Jayaratne
f8d68e6272 Eliminate duplicate code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-11 20:49:11 +05:30
Madhura Jayaratne
63861210d8 Partial fix for bug #4581 Some links in query_result doesn't work 2014-11-10 07:00:59 +05:30