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

96301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
ef185e257d Translated using Weblate (French) 
Currently translated at 100.0% (2991 of 2991 strings)

[CI skip]
 2014-12-02 18:32:37 +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
Marc Delisle
cf860990cb Functions were used before being defined 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-02 10:18:44 -05:00
Madhura Jayaratne
bd02f91a2a Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 13:26:53 +05:30
Madhura Jayaratne
58df5ebed5 bug #4616 Warning in db structure print view page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 13:17:54 +05:30
Weblate
e49d35ae65 Merge remote-tracking branch 'origin/master' 2014-12-02 08:19:46 +01:00
Domen
66aed1e896 Translated using Weblate (Slovenian) 
Currently translated at 99.8% (2986 of 2991 strings)

[CI skip]
 2014-12-02 08:19:44 +01:00
Madhura Jayaratne
7e01f79fee ID is no longer used to facilitate multiple result sets 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 12:49:27 +05:30
Madhura Jayaratne
8fcf249a28 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 12:26:57 +05:30
Weblate
26895da3c9 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-02 07:55:27 +01:00
Domen
57646991df Translated using Weblate (Slovenian) 
Currently translated at 99.8% (2974 of 2978 strings)

[CI skip]
 2014-12-02 07:55:25 +01:00
Jan Erik Zassenhaus
43d044e5ee Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-02 07:55:23 +01:00
Madhura Jayaratne
5d0a2298e2 bug #4615 SQL highlighting in process list breaks on auto refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-02 12:25:05 +05:30
Hugues Peccatte
803df26c75 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-12-01 21:19:35 +01:00
Hugues Peccatte
c2d516cac4 Remove unused variables. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-01 21:19:13 +01:00
Weblate
07b01001f1 Merge remote-tracking branch 'origin/master' 2014-12-01 19:37:42 +01:00
Jan Erik Zassenhaus
d0470dfea3 Translated using Weblate (German) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-01 19:37:39 +01:00
Marc Delisle
918b089a37 Return statement not possible here 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-01 13:37:18 -05:00
Marc Delisle
e61dc35ba3 Merge branch 'QA_4_3' 2014-12-01 10:31:32 -05:00
Weblate
e09ff83c33 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-01 16:31:21 +01:00
Michal Čihař
7662bf11ef Translated using Weblate (Czech) 
Currently translated at 94.7% (2822 of 2978 strings)

[CI skip]
 2014-12-01 16:31:19 +01: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