gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,486 Commits 12 Branches 481 Tags 2.4 GiB
001ebb8d03
Commit Graph

95486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristjan Räts
001ebb8d03 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-17 11:17:49 +02:00
Weblate
7b3e081aa0 Merge remote-tracking branch 'origin/master' 2014-10-17 10:05:49 +02:00
Giovanni Sora
292197a89a Translated using Weblate (Interlingua) 
Currently translated at 61.4% (1826 of 2973 strings)

[CI skip]
 2014-10-17 10:05:48 +02:00
Madhura Jayaratne
00f2788a66 bug #4560 PHP error on master branch 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:35:16 +05:30
Madhura Jayaratne
ae148f37e6 Merge branch 'QA_4_2' 2014-10-17 13:16:45 +05:30
Madhura Jayaratne
bdd76f18ce bug #4259 reCaptcha sound session expired problem 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:14:28 +05:30
Madhura Jayaratne
55114b95e0 Wrap more long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 13:07:25 +05:30
Madhura Jayaratne
8ef9ced453 Wrap some long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 12:51:28 +05:30
Madhura Jayaratne
55d90fd018 Bug #4561 PHP error in transformations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 12:49:18 +05:30
Madhura Jayaratne
a87294fbe4 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-17 08:28:05 +05:30
Chanaka Dharmarathna
0afe20e942 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-17 01:29:30 +05:30
Chanaka Dharmarathna
ad67a3a831 Change log entry 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-17 01:27:31 +05:30
Wojciech Mleczek
998f969d5e rfe1547 - Wrap message with message box 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-17 01:16:21 +05:30
Weblate
916112e9ac Merge remote-tracking branch 'origin/master' 2014-10-16 21:46:10 +02:00
Edgars Neimanis
cccd56a735 Translated using Weblate (Latvian) 
Currently translated at 21.6% (645 of 2973 strings)

[CI skip]
 2014-10-16 21:46:08 +02:00
Weblate
f3fe7ca528 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-16 21:13:36 +02:00
Burak Yavuz
aa3fd712e9 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-16 21:13:35 +02:00
Michael Koch
85866b8a84 Translated using Weblate (German) 
Currently translated at 99.6% (2759 of 2768 strings)

[CI skip]
 2014-10-16 21:13:33 +02:00
josep constanti
c7de289f95 Translated using Weblate (Catalan) 
Currently translated at 87.5% (2424 of 2768 strings)

[CI skip]
 2014-10-16 21:13:31 +02:00
Boyan Kehayov
a10ce357a0 Translated using Weblate (Bulgarian) 
Currently translated at 66.0% (1828 of 2768 strings)

[CI skip]
 2014-10-16 21:13:30 +02:00
Chanaka Dharmarathna
38f3ae91ce Merge branch 'madhuracj-Bug4552' into QA_4_2 2014-10-17 00:41:32 +05:30
Chanaka Dharmarathna
3e70eb4789 Resolved merge conflict in Changelog 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-17 00:41:07 +05:30
Panagiotis Papazoglou
5157d1cf26 Translated using Weblate (Greek) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-16 20:43:44 +02:00
Marc Delisle
3f6d1e870a Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-16 13:32:29 -04:00
Marc Delisle
bc7d57f613 The minimum supported MySQL version is 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 13:32:15 -04:00
Burak Yavuz
7180bb0f15 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2973 of 2973 strings)

[CI skip]
 2014-10-16 18:57:59 +02:00
Marc Delisle
b158bd195e Update po files 2014-10-16 12:25:39 -04:00
Marc Delisle
5b5953b371 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 10:47:28 -04:00
Marc Delisle
e6d2eeecd6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-16 10:41:06 -04:00
Marc Delisle
5efd2feb49 Merge pull request #1378 from nisargjhaveri/bug_4558 
bug #4558 Unable to Add Rows while Creating Table
 2014-10-16 10:39:39 -04:00
Nisarg Jhaveri
310b76c585 bug #4558 Unable to Add Rows while Creating Table 
- Remove inline JS from add column button.
- Remove unnecessary eventhandler to submit form on enter.
- Added event handler to add column field to add on enter.
- Fix tests

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-16 19:43:52 +05:30
Weblate
e64a0839b0 Merge remote-tracking branch 'origin/master' 2014-10-16 15:19:26 +02:00
josep constanti
612049237b Translated using Weblate (Catalan) 
Currently translated at 82.9% (2460 of 2965 strings)

[CI skip]
 2014-10-16 15:19:24 +02:00
Boyan Kehayov
c7179ef4f4 Translated using Weblate (Bulgarian) 
Currently translated at 62.7% (1860 of 2965 strings)

[CI skip]
 2014-10-16 15:19:23 +02:00
Madhura Jayaratne
8059f3fff0 Merge pull request #1375 from madhuracj/DisableIS 
Performance improvements related to IS
 2014-10-16 18:49:18 +05:30
Madhura Jayaratne
3c2f85774e Initialize the array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-16 17:52:23 +05:30
Madhura Jayaratne
492d0f133f Additional fix for bug #3869. Consider tables in information_schema as views to benefit from 'MaxExactCountViews' and avoid count(*) in information_schema tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-16 14:59:45 +05:30
Weblate
6150914fe5 Merge remote-tracking branch 'origin/master' 2014-10-15 18:58:32 +02:00
josep constanti
28d9f67141 Translated using Weblate (Catalan) 
Currently translated at 82.9% (2459 of 2965 strings)

[CI skip]
 2014-10-15 18:58:30 +02:00
Marc Delisle
0bea9ef91f Merge pull request #1377 from nisargjhaveri/autocomplete 
Autocomplete table/column names in SQL editors
 2014-10-15 12:58:26 -04:00
Madhura Jayaratne
6031f7a0bc Remove outdated comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 10:58:46 +05:30
Madhura Jayaratne
771847102f SHOW GRANTS based privilege checking 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 10:55:33 +05:30
Madhura Jayaratne
6daef8eee8 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 09:43:06 +05:30
Madhura Jayaratne
6ebca5a49d Fix privilege checking queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-15 07:43:59 +05:30
Nisarg Jhaveri
6cc3ea6eae Autocomplete table/column names in SQL editors 
- In DB and Table level SQL editors, console
- Updated CodeMirror addon `sql-hint.js` to newer version

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-14 23:22:15 +05:30
Weblate
bd25766b7b Merge remote-tracking branch 'origin/master' 2014-10-14 18:13:55 +02:00
Michael Koch
fff27355bd Translated using Weblate (German) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-14 18:13:53 +02:00
Marc Delisle
32c1192351 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-14 12:12:49 -04:00
Madhura Jayaratne
98ea25d9ea Additional unit tests for new execution paths 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 18:51:12 +05:30
Madhura Jayaratne
c925d46f92 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-14 15:21:15 +05:30