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

100566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Isaac Bennetch
e19d64785b Minor style adjustment 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-22 22:51:42 -04:00
Madhura Jayaratne
2abda1c1d3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-23 08:18:39 +05:30
Madhura Jayaratne
81659dc2cb Match the old query, so the tests won't complain 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 08:17:20 +05:30
Isaac Bennetch
bb435183a3 Merge pull request #1737 from devenbansod/rfe1060_new 
Designer settings saved in a new table in configuration storage
 2015-06-22 22:42:52 -04:00
Madhura Jayaratne
e0750d93ae Distinguish between null and empty default values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-23 08:12:09 +05:30
Madhura Jayaratne
456ec1c796 Merge pull request #1755 from udan11/refactor 
Remove dead code. Following commit fd77f8d.
 2015-06-23 08:08:20 +05:30
Weblate
f2f8ee1819 Merge remote-tracking branch 'origin/master' 2015-06-23 04:23:07 +02:00
Burak Yavuz
c9989c792e Translated using Weblate (Turkish) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-23 04:23:01 +02:00
Franco
bd56018102 Translated using Weblate (Spanish) 
Currently translated at 97.9% (3060 of 3125 strings)

[CI skip]
 2015-06-23 04:22:57 +02:00
Domen
3bbf53e55a Translated using Weblate (Slovenian) 
Currently translated at 99.9% (3122 of 3125 strings)

[CI skip]
 2015-06-23 04:22:54 +02:00
Giovanni Sora
e8303d644b Translated using Weblate (Interlingua) 
Currently translated at 69.5% (2173 of 3125 strings)

[CI skip]
 2015-06-23 04:22:50 +02:00
Isaac Bennetch
9b310c3dc8 Merge pull request #1744 from devenbansod/rfe342 
Multi-file export with ZIP
 2015-06-22 22:22:45 -04:00
Dan Ungureanu
bf55d536ad Remove dead code. Following commit fd77f8d. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-06-22 23:09:18 +03:00
Burak Yavuz
3309cd0128 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-22 19:17:05 +02:00
Madhura Jayaratne
63ab039edf ChangeLog entry for bug #4963 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 20:02:44 +05:30
Madhura Jayaratne
5a1ebc2b4a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-22 19:54:50 +05:30
Madhura Jayaratne
eac19b87ad bug #4966 MySQL errors are not shown when DebugSQL is enabled 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 19:47:58 +05:30
Michal Čihař
52ea1026ad Remove type annotation 
It seems to be broken on some PHP versions:

Argument 1 passed to PMA_Util::configureCurl() must be an instance of
resource, resource given, called in libraries/Config.class.php on line
774 and defined

Seen this on my workstation with PHP 5.6.1 and Google shows some hits of
this as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-22 15:14:49 +02:00
Michal Čihař
67c858265d Add error checking 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-22 15:14:48 +02:00
Michal Čihař
13a3fb0635 Revert "Temporarily deactivate these tests (almost always fail on ci.phpmyadmin.net)" 
This reverts commit 9403921e4e.

We should really test those. In case the requests will fail, some other
solution should be found to actually execute this code.

Signed-off-by: Michal Čihař <michal@cihar.com>

Conflicts:
	test/classes/PMA_Config_test.php
	test/classes/PMA_Util_test.php
	test/libraries/PMA_SetupIndex_test.php
 2015-06-22 15:14:48 +02:00
Παναγιώτης Παπάζογλου
14e630f6aa Translated using Weblate (Greek) 
Currently translated at 100.0% (3125 of 3125 strings)

[CI skip]
 2015-06-22 14:51:37 +02:00
Marc Delisle
536b0a6245 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-22 08:04:40 -04:00
Marc Delisle
1685669970 Add doc to messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-22 08:02:41 -04:00
Weblate
9fc3e34321 Merge remote-tracking branch 'origin/master' 2015-06-22 13:42:08 +02:00
Zrng Abdulla
4f018d8b12 Translated using Weblate (Kurdish Sorani) 
Currently translated at 19.8% (620 of 3122 strings)

[CI skip]
 2015-06-22 13:42:04 +02:00
Marc Delisle
7edd9524c0 Merge pull request #1751 from madhuracj/bug4963 
#4963 Improve/restore non-unique index row editing
 2015-06-22 07:42:02 -04:00
Atul Pratap Singh
7d8faa6818 Merge pull request #1748 from Tithugues/templating_master 
Templating getStartAndNumberOfRowsPanel function, recursivity and failures
 2015-06-22 13:54:46 +05:30
Madhura Jayaratne
e0aa1a4c92 #4963 Improve/restore non-unique index row editing 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 13:46:18 +05:30
Madhura Jayaratne
b91101e190 Make the method more generic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 10:30:38 +05:30
Madhura Jayaratne
8c7d825038 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-22 08:39:33 +05:30
Madhura Jayaratne
0b813a421f Remove tabs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 08:38:08 +05:30
Weblate
cba75e5d61 Merge remote-tracking branch 'origin/master' 2015-06-22 05:07:05 +02:00
Sebastian
02ded86702 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 62.2% (1943 of 3122 strings)

[CI skip]
 2015-06-22 05:07:02 +02:00
Madhura Jayaratne
f889561c59 Get default_fk_check_value on demand rather than checking the value in every script 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-22 08:36:46 +05:30
Weblate
b31b92032a Merge remote-tracking branch 'origin/master' 2015-06-21 16:01:07 +02:00
Franco
0fd9997c48 Translated using Weblate (Spanish) 
Currently translated at 97.4% (3041 of 3122 strings)

[CI skip]
 2015-06-21 16:01:03 +02:00
Marc Delisle
a03936a70c Clarify logic 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-21 10:00:51 -04:00
Deven Bansod
a49e6f533d Provide an option to export tables in a database as separate files 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-21 16:05:43 +05:30
Deven Bansod
54a480e8eb Designer settings saved in a new table in configuration storage 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-21 15:44:39 +05:30
Balázs Úr
b6ab6c4117 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3122 of 3122 strings)

[CI skip]
 2015-06-20 23:27:32 +02:00
Domen
06456c83ef Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3121 of 3121 strings)

[CI skip]
 2015-06-20 19:09:24 +02:00
Hugues Peccatte
96328df5f4 Fix syntax error. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-20 17:35:32 +02:00
dingo thirteen
1c61a0d785 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3122 of 3122 strings)

[CI skip]
 2015-06-20 15:02:04 +02:00
Παναγιώτης Παπάζογλου
e5149262c7 Translated using Weblate (Greek) 
Currently translated at 100.0% (3122 of 3122 strings)

[CI skip]
 2015-06-20 14:54:54 +02:00
Burak Yavuz
02bf444cc2 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3122 of 3122 strings)

[CI skip]
 2015-06-20 14:47:43 +02:00
Marc Delisle
6163ea3df5 Translated using Weblate (French) 
Currently translated at 100.0% (3122 of 3122 strings)

[CI skip]
 2015-06-20 14:35:54 +02:00
Marc Delisle
0db84bf03e Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-20 07:00:18 -04:00
Marc Delisle
6a3edc21e4 Improve translatability and consistency with the "Sort by key" dialog 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-20 06:59:46 -04:00
Marc Delisle
c3bde70f7e Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-20 06:33:07 -04:00
Marc Delisle
24fb9412a6 Merge pull request #1747 from nisargjhaveri/debug_console 
Fix scrutinizer issues, console SQL debugging
 2015-06-20 06:31:04 -04:00