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

12746 Commits

Author SHA1 Message Date
Marc Delisle
6e9eee5cc6 Merge pull request #1414 from Tithugues/b4593_master 
Fix #4593 Manual SELECT doesn't change active table
 2014-12-06 18:28:11 -05:00
Hugues Peccatte
f9eb088bfa Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 12:42:23 +01:00
Hugues Peccatte
eda24da12e Fix #4593 Manual SELECT doesn't change active table 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 00:57:38 +01:00
Marc Delisle
20f7402cc5 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-05 12:56:42 -05:00
Madhura Jayaratne
d208ea0ed5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-05 20:05:39 +05:30
Madhura Jayaratne
692e0ae6ae Make pma_quick_warp a class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 17:31:04 +05:30
Madhura Jayaratne
806178eca2 Upgrade GIS visualization page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 17:26:54 +05:30
Atul Pratap Singh
04248a22e2 Merge pull request #1411 from madhuracj/update 
jQuery upgrade
 2014-12-05 17:04:05 +05:30
Chirayu Chiripal
00c45a2346 merge branch origin/QA_4_3 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:47:24 +05:30
Chirayu Chiripal
b900a521de use function_exists for checking function existence 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:36:42 +05:30
Chirayu Chiripal
573f85f1bf Fix bug-4613 HHVM: method ob_gzhandler not found 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-05 16:05:48 +05:30
Michal Čihař
e92155b675 Check if set before using 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:49:38 +01:00
Michal Čihař
61fcf215e5 Detect failure of curl_init 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:20:13 +01:00
Michal Čihař
974295ac85 Silent warning from is_readable 
They emit warning in open_basedir mode.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-05 10:09:05 +01:00
Madhura Jayaratne
982a5bce73 Update jquery-ui to version 1.11.2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 13:12:54 +05:30
Madhura Jayaratne
bb32f04183 Merge branch 'master' into update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 08:19:43 +05:30
Madhura Jayaratne
80f4bb9782 Update jquery to version 1.11.1 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-05 08:09:02 +05:30
Marc Delisle
3062152abf Merge branch 'QA_4_3' 2014-12-04 14:02:48 -05:00
Marc Delisle
00db138a47 bug #4620 Undefined index while adding to the central columns list 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 14:01:52 -05:00
Marc Delisle
7134242839 Merge branch 'QA_4_3' 2014-12-04 10:36:24 -05:00
Marc Delisle
3aa884ee36 Fix undefined index notice (fields) in PMA_getParamsForUpdateOrInsert() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 10:35:58 -05:00
Marc Delisle
a5d9c59bae Merge branch 'QA_4_3' 2014-12-04 09:16:02 -05:00
Marc Delisle
bd2a8b501c Fix other undefined index notices in PMA_getDiagMessageForFeature() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-04 09:15:18 -05: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
Madhura Jayaratne
478e781f1b Replace more instances of .live() and .die() with .on() and .off() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 18:33:37 +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
2e72c46ce1 Make message translatable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 12:37:18 -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
Marc Delisle
9591205e2c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:06:49 -05:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Madhura Jayaratne
a4e8d008f4 bug #4611 [security] DOS attack with long passwords 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:50:14 -05:00
Ann + J.M
9d13de4ead Fix coding style 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-12-02 20:10:55 +01:00
Marc Delisle
36f2f91c1a Merge branch 'QA_4_3' 2014-12-02 10:28:34 -05:00
Marc Delisle
85c866fb8f Bug Undefined index navwork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-02 10:28:03 -05:00
Hugues Peccatte
c2d516cac4 Remove unused variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-01 21:19:13 +01:00
Marc Delisle
e61dc35ba3 Merge branch 'QA_4_3' 2014-12-01 10:31:32 -05:00
Nisarg Jhaveri
c43d60d1a4 Bug 4614 Missing separator 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-01 10:30:06 -05:00
Madhura Jayaratne
3d8a6c3bb4 Use placeholder to save horizontal space 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 18:34:50 +05:30
Madhura Jayaratne
5fd35f82e0 Make Structure tab active for table relations page as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 18:31:10 +05:30
Madhura Jayaratne
f9e430e0d3 Merge branch 'master' into multiquery 2014-12-01 16:51:48 +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
8c215b4a84 Do no use ID attributes for bookmark fields 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 15:54:08 +05:30
Madhura Jayaratne
f2782eb957 Remove table_results ID field 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 15:25:22 +05:30
Michal Čihař
2ce7aa70c4 Move storing password/username after checking password 
The cookie encryption is quite expensive, so let's move it after we
check password validity.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 09:50:16 +01:00
Madhura Jayaratne
a362667e3c Use class attribute instead of id for sqlqueryresults 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 10:44:36 +05:30
Madhura Jayaratne
65794575a0 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 10:07:28 +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
84618096a2 Distinguish between show all checkbox of multiple result sets 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 08:58:29 +05:30
Madhura Jayaratne
d8afbb7602 Merge branch 'master' into multiquery 2014-12-01 08:47:53 +05:30