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

96280 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
e61dc35ba3 Merge branch 'QA_4_3' 2014-12-01 10:31:32 -05:00
Marc Delisle
a117cb2552 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-01 10:31:02 -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
580cd73da4 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-01 18:20:23 +05:30
Madhura Jayaratne
5a2d5b26a8 login-link is no longer used since automatic redirection is used 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 18:13:54 +05:30
Weblate
f6846bf750 Merge remote-tracking branch 'origin/master' 2014-12-01 13:40:02 +01:00
Michal Čihař
3c457a3e80 Translated using Weblate (Czech) 
Currently translated at 94.3% (2822 of 2991 strings)

[CI skip]
 2014-12-01 13:39:59 +01:00
Madhura Jayaratne
d12158eb83 Merge pull request #1409 from madhuracj/multiquery 
Multiquery
 2014-12-01 18:09:54 +05:30
Madhura Jayaratne
395c718075 Move more JS code to tbl_operations.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 18:03:01 +05:30
Madhura Jayaratne
c099f04bc6 Move drop database handling code to db_operations.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 17:55:51 +05:30
Madhura Jayaratne
f6c98b70cb Move JavaScript related to table operations page to a js file of its own 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 17:43:19 +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
Michal Čihař
b7e17814c1 Fix variable name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:59:07 +01:00
Michal Čihař
2502375982 Add missing call to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:56:19 +01:00
Michal Čihař
a6764bab9b Always restore mocked instance after test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 11:38:40 +01:00
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ř
baa922e902 Define missing variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 10:43:03 +01:00
Michal Čihař
94baaba666 Adjust testcase to new split methods 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-01 10:42:11 +01:00
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
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
4cf4e41dec Table filtering for multiquery 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-01 08:27:10 +05:30
Marc Delisle
b427d13b0f Merge commit '1292a53' 2014-11-30 06:38:17 -05:00
Marc Delisle
c4966c6fb5 Merge commit '41277d1' 2014-11-30 06:37:49 -05:00
Marc Delisle
c237f27a1b Merge commit '0ab3ee3' 2014-11-30 06:37:38 -05:00
Marc Delisle
1292a53379 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-11-30 06:36:33 -05:00
Marc Delisle
e8aa77761e Merge commit '0ab3ee3' into QA_4_3 2014-11-30 06:36:23 -05:00
Marc Delisle
41277d1887 4.2.13 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-30 06:35:21 -05:00
Hugues Peccatte
e037f60015 Factorization. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 16:04:29 +01:00
Hugues Peccatte
115065b3f6 Reduce nesting levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-29 14:40:02 +01:00
Marc Delisle
73e4c5653f Merge branch 'QA_4_3' 2014-11-29 06:50:03 -05:00
Marc Delisle
1e39ac53d0 Bug Undefined index menuswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-29 06:49:24 -05:00
Marc Delisle
cbbdf9825a Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-28 10:33:36 -05:00
Marc Delisle
d17215986d Improve English 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-11-28 08:02:01 -05:00
Michal Čihař
109f08f429 Improve a bit recommendation to use another authentication as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-11-28 13:44:31 +01:00
Madhura Jayaratne
4476dbfee0 Use a unique number to distinguish multiple result sets 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 16:03:01 +05:30
Madhura Jayaratne
698813db3d Cleanup makegrid.js and do scoped selections 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 15:32:46 +05:30
Madhura Jayaratne
501a4c9c1f Use sqlqueryresultsouter to show USE or DROP query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 13:44:30 +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
be9a324138 This is redundant 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:58:52 +05:30
Madhura Jayaratne
981fc9f165 Match teardown selector with register selector 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:57:29 +05:30
Madhura Jayaratne
d21f37b3f1 Use class to identify bookmarkQueryForm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-28 12:51:30 +05:30