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

107652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deven Bansod
d73bf36ff7 Merge branch 'QA_4_6' 2016-10-28 13:13:52 +05:30
Deven Bansod
2fbf09ba2d ChangeLog for #12195 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-28 13:12:43 +05:30
Deven Bansod
3e9c30a561 Document prevention of errors with import of ROW_FORMAT=fixed in newer MySQL versions 
See https://github.com/phpmyadmin/phpmyadmin/issues/12195#issuecomment-256849353

Fix #12195

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-28 13:08:17 +05:30
Deven Bansod
24aee3758d Merge branch 'QA_4_6' 2016-10-27 17:02:41 +05:30
Deven Bansod
368b74bad6 ChangeLog for #12661 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 17:02:02 +05:30
Deven Bansod
c5d3b0bbb0 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-27 16:54:04 +05:30
Deven Bansod
e4fe53217e Try adding query to history only if Database links are available 
Fix #12661

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 16:52:40 +05:30
Michal Čihař
e8946e4824 Merge branch 'QA_4_6' 2016-10-27 11:37:10 +02:00
Stefano Martinelli
6555f23db6 Translated using Weblate (Italian) 
Currently translated at 100.0% (3230 of 3230 strings)

[CI skip]
 2016-10-27 11:36:42 +02:00
Stefano Martinelli
077a79b5ce Translated using Weblate (Italian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 11:36:18 +02:00
Stefano Martinelli
e0195f1928 Translated using Weblate (Italian) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 10:33:31 +02:00
dingo thirteen
8f29910c03 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 10:32:16 +02:00
Burak Yavuz
b249cdbc95 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 07:31:13 +02:00
Deven Bansod
c2a8f0a3cd Merge branch 'QA_4_6' 2016-10-27 10:04:09 +05:30
Deven Bansod
74db20cc9e ChangeLog for #12610 
Fix #12610 , with updating of SQL Parser to 3.4.11 in 1ec99a

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-27 10:02:40 +05:30
Weblate
d44caac678 Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6 2016-10-27 06:32:02 +02:00
Παναγιώτης Παπάζογλου
e7e8c9a5b4 Translated using Weblate (Greek) 
Currently translated at 100.0% (3219 of 3219 strings)

[CI skip]
 2016-10-27 06:32:00 +02:00
Domen
95877a8621 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3230 of 3230 strings)

[CI skip]
 2016-10-26 04:15:40 +02:00
Burak Yavuz
3f23272d45 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3230 of 3230 strings)

[CI skip]
 2016-10-25 19:20:11 +02:00
Stefano Martinelli
f55f48bef3 Translated using Weblate (Italian) 
Currently translated at 100.0% (3230 of 3230 strings)

[CI skip]
 2016-10-25 15:53:47 +02:00
dingo thirteen
1eb08462a9 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3230 of 3230 strings)

[CI skip]
 2016-10-25 13:49:09 +02:00
Deven Bansod
92d9310ef2 ChangeLog for #12664 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-25 16:37:57 +05:30
Deven Bansod
9de4ad2b0d Fix call to old and now undefined functions 
Fix #12664

Occurred due to a merge issue in 54c81312

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-25 16:36:34 +05:30
Παναγιώτης Παπάζογλου
c05f80214e Translated using Weblate (Greek) 
Currently translated at 100.0% (3230 of 3230 strings)

[CI skip]
 2016-10-25 12:17:46 +02:00
Michal Čihař
ffeafda9fe Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 11:15:22 +02:00
Michal Čihař
f81f1b7fb0 Merge branch 'QA_4_6' 2016-10-25 11:14:45 +02:00
Michal Čihař
9e0e8a4bf1 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 11:14:19 +02:00
Michal Čihař
1c5c4860c2 Merge branch 'QA_4_6' 2016-10-25 10:45:19 +02:00
Michal Čihař
a6dd27897e Remove no longer used file 
The docs is now generated using ApiGen.

See also phpmyadmin/docker#78

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:41:38 +02:00
Michal Čihař
39f09e7aa9 Merge branch 'QA_4_6' 2016-10-25 10:31:26 +02:00
Michal Čihař
a33693bb8e Changelog entry for #12334 and #12626 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:30:59 +02:00
Michal Čihař
2c91327374 Merge pull request #12626 from madhuracj/bug12234 
Fix bug #12234 No page indicator in view
 2016-10-25 10:28:54 +02:00
Michal Čihař
d184081cca Merge branch 'QA_4_6' 2016-10-25 10:27:53 +02:00
Michal Čihař
0983ff0586 Changelog entry for #12648 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:27:30 +02:00
Michal Čihař
287cd62497 Merge pull request #12648 from devenbansod/fix_12622 
Fix submission of 'Save page' form using Enter keypress
 2016-10-25 10:27:00 +02:00
Michal Čihař
7ea746fb66 Merge branch 'QA_4_6' 2016-10-25 10:25:46 +02:00
Michal Čihař
bd135e105b Merge commit '10ef1af71ef73168ebb1671dcb0dfe8e330ebdee' 2016-10-25 10:25:36 +02:00
Michal Čihař
cefb072fea Changelog entry for #12654 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:25:14 +02:00
Michal Čihař
83c0873570 Merge pull request #12654 from devenbansod/fix_12637 
Allow for all MySQL values of TIME data type
 2016-10-25 10:24:30 +02:00
Michal Čihař
10ef1af71e Translated using Weblate (Slovenian) 
Currently translated at 99.6% (3218 of 3218 strings)

[CI skip]
 2016-10-25 10:23:07 +02:00
Domen
1793a4547b Translated using Weblate (Slovenian) 
Currently translated at 99.6% (3207 of 3218 strings)

[CI skip]
 2016-10-25 10:22:43 +02:00
Michal Čihař
fa30f8e23b Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:04:50 +02:00
Michal Čihař
1ec99a431b Update SQL parser to 3.4.11 
- issue #12344 Fixed parsing of labels in loop
- issue #12228 Fixed parsing of BEGIN labels

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:02:48 +02:00
Deven Bansod
f82cc5b2e8 ChangeLog for #12543 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-25 13:02:35 +05:30
Deven Bansod
262e0a47bb Merge pull request #12662 from anemones/master 
Null results in dataset now colored grey (Fix #12543)
 2016-10-25 12:58:01 +05:30
Antoine Theriault Brunet
7690345289 Null results in dataset now colored grey (#12543) 
Signed-off-by: Antoine Theriault Brunet <atheriaultbrunet@dept-info.crosemont.quebec>
 2016-10-24 14:20:59 -07:00
Deven Bansod
d15e9a40a4 Merge branch 'QA_4_6' 2016-10-24 18:17:15 +05:30
Deven Bansod
25baf8dd85 Merge branch 'QA_4_6' of https://github.com/phpmyadmin/phpmyadmin into QA_4_6 2016-10-24 18:15:54 +05:30
Deven Bansod
32db2e418c ChangeLog for #12454 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-24 18:15:22 +05:30
Deven Bansod
8250f8e030 Fix typo in ChangeLog 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-24 18:15:09 +05:30