Michal Čihař
|
805d28e85b
|
Merge branch 'UT_import_sharp_files' of git://github.com/adamgsoc2013/phpmyadmin into adamgsoc2013-UT_import_sharp_files
|
2013-09-16 08:39:44 +02:00 |
|
Weblate
|
a6deb7a898
|
Merge remote-tracking branch 'origin/master'
|
2013-09-16 08:39:25 +02:00 |
|
Myung Han Yu
|
dae5d64371
|
Translated using Weblate (Korean)
Currently translated at 70.4% (1916 of 2720)
|
2013-09-16 08:39:22 +02:00 |
|
Robert Readman
|
5ae7f2c375
|
Translated using Weblate (English (United Kingdom))
Currently translated at 96.3% (2620 of 2720)
|
2013-09-16 08:39:19 +02:00 |
|
Michal Čihař
|
c539e46cb1
|
Merge pull request #698 from adamgsoc2013/UnitTestCases
add Unit test cases for PMA_tbl_indexes
|
2013-09-15 23:39:10 -07:00 |
|
adamgsoc2013
|
1f1325578a
|
add Unit test cases for PMA_tbl_indexes
|
2013-09-16 11:28:53 +08:00 |
|
Madhura Jayaratne
|
4205e2a065
|
Merge pull request #689 from ayushchd/ut_fix
Fix date-second issue with Tracker tests
|
2013-09-15 19:29:23 -07:00 |
|
Madhura Jayaratne
|
0d9e452591
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2013-09-15 19:04:42 +05:30 |
|
Madhura Jayaratne
|
347dc5c27e
|
bug #4068 Headline in operations not readable in IE10
|
2013-09-15 19:03:24 +05:30 |
|
Dieter Adriaenssens
|
70d9f27213
|
remove trailing space
|
2013-09-15 12:37:39 +02:00 |
|
Dieter Adriaenssens
|
377c682304
|
wrap long lines
|
2013-09-15 12:35:44 +02:00 |
|
Marc Delisle
|
df21b2cebe
|
Fix codestyle
|
2013-09-15 06:09:25 -04:00 |
|
Madhura Jayaratne
|
b162238695
|
bug #4087 Undefined index query
|
2013-09-15 13:57:57 +05:30 |
|
Madhura Jayaratne
|
ccfb9a8954
|
Merge branch 'QA_4_0'
Conflicts:
libraries/database_interface.lib.php
|
2013-09-15 13:22:21 +05:30 |
|
Madhura Jayaratne
|
988b1142ac
|
Merge branch 'QA_4_0' of github.com:phpmyadmin/phpmyadmin into QA_4_0
Conflicts:
ChangeLog
|
2013-09-15 13:18:05 +05:30 |
|
Madhura Jayaratne
|
5111eb7eb5
|
bug #4088 MySQL server version at index.php incorrect w/ controlhost
|
2013-09-15 13:16:00 +05:30 |
|
Madhura Jayaratne
|
80afe42f19
|
Remove trailing white spaces
|
2013-09-15 13:15:28 +05:30 |
|
Marc Delisle
|
90accaef3b
|
Fix failing test
|
2013-09-14 12:26:14 -04:00 |
|
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 |
|
ayushchd
|
4b7edee82b
|
Fix date-second issue with Tracker tests
|
2013-09-14 16:29:03 +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 |
|
adamgsoc2013
|
d3a87951de
|
using a smaller test data to make it run more quick
|
2013-09-14 16:53:38 +08:00 |
|
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 |
|
