Commit Graph

86880 Commits

Author SHA1 Message Date
Marc Delisle
3535dc9d62 Merge pull request #696 from scnakandala/refac_tbl_add_field
Refactoring tbl_addfield.php
2013-09-14 08:23:38 -07:00
Marc Delisle
2dbc95d110 Fix typos 2013-09-14 11:00:38 -04:00
Marc Delisle
d4a480328b Use proper term (SQL column) 2013-09-14 10:59:38 -04:00
Marc Delisle
84dbb40e88 Merge pull request #693 from scnakandala/refac_tbl_change
Refac tbl change
2013-09-14 07:56:04 -07:00
Spun Nakandala
c9e2c9ac93 removed dead code. extracted method PMA_tryColumnCreationQuery 2013-09-14 20:07:06 +05:30
Spun Nakandala
17ce188db4 value tab offset error corrected 2013-09-14 19:35:37 +05:30
Marc Delisle
f2a939d24f Merge branch 'QA_4_0' 2013-09-14 09:37:32 -04:00
Marc Delisle
830d94a7a8 ChangeLog entry for bug 4079 2013-09-14 09:36:40 -04:00
Marc Delisle
7b49998113 Merge pull request #690 from abhikandoi2000/QA_4_0
Adds AUTO_INCREMENT value while copying table. Fixes bug 4079
2013-09-14 06:35:40 -07:00
Spun Nakandala
e60f53599d extracted methods to insert_edit.lib.php 2013-09-14 18:40:51 +05:30
Abhishek Kandoi
b8c67d9697 Adds AUTO_INCREMENT value while copying table. Fixes bug 4079 2013-09-14 17:29:26 +05:30
Madhura Jayaratne
a0f48a536a Merge branch 'QA_4_0' 2013-09-14 17:10:01 +05:30
Madhura Jayaratne
b3d7194468 Add missing schema link 2013-09-14 17:08:30 +05:30
Madhura Jayaratne
f98528a533 Merge branch 'QA_4_0'
Conflicts:
	test/classes/PMA_DisplayResults_test.php
2013-09-14 16:49:49 +05:30
Madhura Jayaratne
f4fce01443 Fix failing tests 2013-09-14 16:46:58 +05:30
Madhura Jayaratne
fe0baeebb1 Merge branch 'QA_4_0'
Conflicts:
	libraries/special_schema_links.lib.php
2013-09-14 16:39:21 +05:30
Madhura Jayaratne
14ceff5d54 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-09-14 16:37:02 +05:30
Madhura Jayaratne
791244d70b bug #4092 Clicking on table name in view of information_schema redirects to wrong page 2013-09-14 16:35:06 +05:30
Madhura Jayaratne
9c7623089d Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0 2013-09-14 16:31:53 +05:30
Marc Delisle
4c0ec8563f Merge branch 'QA_4_0' 2013-09-14 06:25:04 -04:00
Marc Delisle
2d611cfa87 bug #4090 Downloading BLOB downloads page template 2013-09-14 06:24:32 -04:00
Marc Delisle
3bb750ca2b Fix coding style 2013-09-14 06:00:35 -04:00
Marc Delisle
6e1d16a162 Merge pull request #687 from xmujay/more_UT_for_server
UTs for PMA_server_engines and PMA_server_status
2013-09-14 02:52:04 -07:00
Madhura Jayaratne
a34a46c22d Merge branch 'QA_4_0'
Conflicts:
	libraries/DisplayResults.class.php
	libraries/information_schema_relations.lib.php
2013-09-14 14:45:27 +05:30
Madhura Jayaratne
3c8e4fb0bb Add missing default transformations 2013-09-14 14:36:03 +05:30
Madhura Jayaratne
2e5bc24899 Add missing relations 2013-09-14 12:30:04 +05:30
Marc Delisle
74aed0560c Merge pull request #685 from scnakandala/Bug_Fix_4085
Bug Fix 4085
2013-09-13 11:19:45 -07:00
Spun Nakandala
3c785e76ed modified PMA_handleQueryExecuteError method in sql.lib.php 2013-09-13 23:13:11 +05:30
Marc Delisle
d71b354876 Merge branch 'QA_4_0' 2013-09-13 12:52:03 -04:00
Marc Delisle
255fe5b436 Merge commit 'edb8cd6' 2013-09-13 12:51:55 -04:00
Marc Delisle
4a4b22c59f bug #4091 Insert ignore option does not work 2013-09-13 12:50:25 -04:00
xmujay
9185bc2279 UTs for PMA_server_engines and PMA_server_status 2013-09-13 22:37:20 +08:00
Weblate
c0a314deab Merge remote-tracking branch 'origin/master' 2013-09-13 13:59:05 +02:00
Domen
498e03d7f6 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2720 of 2720)
2013-09-13 13:59:02 +02:00
Kristjan Räts
a63e77f537 Translated using Weblate (Estonian)
Currently translated at 100.0% (2720 of 2720)
2013-09-13 13:58:59 +02:00
Madhura Jayaratne
de48fc3f1c Merge branch 'QA_4_0' 2013-09-13 17:28:13 +05:30
Weblate
edb8cd6f62 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-09-13 13:55:59 +02:00
Burak Yavuz
15114e8543 Translated using Weblate (Turkish)
Currently translated at 100.0% (2610 of 2610)
2013-09-13 13:55:57 +02:00
Matías Bellone
0e4d2ac29e Translated using Weblate (Spanish)
Currently translated at 100.0% (2610 of 2610)
2013-09-13 13:55:54 +02:00
Domen
c4bfd6a3c0 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2610 of 2610)
2013-09-13 13:55:51 +02:00
Panagiotis Papazoglou
51ccfa98f5 Translated using Weblate (Greek)
Currently translated at 100.0% (2610 of 2610)
2013-09-13 13:55:48 +02:00
Kristjan Räts
3d4e4248fc Translated using Weblate (Estonian)
Currently translated at 100.0% (2610 of 2610)
2013-09-13 13:55:46 +02:00
Dieter Adriaenssens
611041752f Translated using Weblate (Dutch)
Currently translated at 100.0% (2610 of 2610)
2013-09-13 13:55:44 +02:00
Michal Čihař
a5cdda1ee4 Translated using Weblate (Czech)
Currently translated at 100.0% (2610 of 2610)
2013-09-13 13:55:42 +02:00
Madhura Jayaratne
be6a794899 bug #4089 Moving Columns will alter column definition 2013-09-13 17:24:32 +05:30
Weblate
306613722d Merge remote-tracking branch 'origin/master' 2013-09-12 18:07:47 +02:00
Giovanni Sora
d15d3c6a38 Translated using Weblate (Interlingua)
Currently translated at 25.2% (686 of 2720)
2013-09-12 18:07:43 +02:00
Dieter Adriaenssens
1155edf53d Translated using Weblate (Dutch)
Currently translated at 100.0% (2720 of 2720)
2013-09-12 18:07:41 +02:00
Dieter Adriaenssens
7cde468669 fix docblock : newline between parameterlist and description 2013-09-12 18:07:11 +02:00
Dieter Adriaenssens
e3ca94efae wrap long lines 2013-09-12 18:01:10 +02:00