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

96329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
80daea0abf Merge branch 'QA_4_3' 2014-12-04 09:14:40 +01:00
Michal Čihař
680352b372 Merge branch 'MAINT_4_3_0' into QA_4_3 
Conflicts:
	README
	doc/conf.py
	libraries/Config.class.php
 2014-12-04 09:14:02 +01:00
Michal Čihař
ccc239040f Adjust testcase to new split methods 
Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
 2014-12-04 09:12:48 +01:00
Michal Čihař
f9dc6be7e6 Add missing call to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-04 09:12:05 +01:00
Weblate
49b017cd83 Merge remote-tracking branch 'origin/master' 2014-12-04 08:59:43 +01:00
Akos Eros
c77259e8ab Translated using Weblate (Hungarian) 
Currently translated at 79.4% (2377 of 2991 strings)

[CI skip]
 2014-12-04 08:59:40 +01:00
Madhura Jayaratne
c25da56114 Merge branch 'QA_4_3' 2014-12-04 13:29:19 +05:30
Weblate
6e71f2a72a Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-04 08:55:16 +01:00
Akos Eros
1d92e9db87 Translated using Weblate (Hungarian) 
Currently translated at 79.8% (2377 of 2978 strings)

[CI skip]
 2014-12-04 08:55:14 +01:00
Madhura Jayaratne
23f5a860f7 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-04 13:25:04 +05:30
Madhura Jayaratne
2895f6743a Cursor type 'move' wouldn't be appropriate for table headers that sort on click 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-04 13:21:42 +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
af52584a27 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 12:38:31 -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
cc0c82e2a3 4.3.0-rc2 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:09:50 -05:00
Weblate
83b48f3912 Merge remote-tracking branch 'origin/master' 2014-12-03 15:07:33 +01:00
josep constanti
c01044df31 Translated using Weblate (Catalan) 
Currently translated at 83.4% (2495 of 2991 strings)

[CI skip]
 2014-12-03 15:07:31 +01:00
Marc Delisle
be99b2d845 Merge commit '28d163f' 2014-12-03 09:07:13 -05:00
Marc Delisle
9591205e2c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:06:49 -05:00
Weblate
28d163f02c Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-03 15:03:40 +01:00
josep constanti
a23a49bf5a Translated using Weblate (Catalan) 
Currently translated at 83.7% (2495 of 2978 strings)

[CI skip]
 2014-12-03 15:03:38 +01:00
Marc Delisle
41c02abc41 Merge branch 'MAINT_4_3_0' into QA_4_3 2014-12-03 09:02:25 -05:00
Marc Delisle
20d0f08c58 Deactivate this test for now 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 09:00:45 -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
Michal Čihař
1daa32fb97 bug #4612 [security] XSS vulnerability in redirection mechanism 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-03 08:29:55 -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
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