Michal Čihař
a3e11b4d33
Merge pull request #700 from ruleant/offset
...
offset is a global var
2013-09-17 06:47:23 -07:00
Dieter Adriaenssens
ccd9835347
offset is a global var
2013-09-17 15:40:51 +02:00
Dieter Adriaenssens
d0d419fe8d
display esri-type in message
2013-09-17 13:52:07 +02:00
Madhura Jayaratne
5638d6b956
Merge branch 'QA_4_0'
2013-09-17 16:51:07 +05:30
Madhura Jayaratne
f9300c7b07
bug #4001 Import error: Class 'ImportOds' not found
2013-09-17 16:49:06 +05:30
Marc Delisle
3f385970f4
Fix coding style
2013-09-17 06:06:07 -04:00
Dieter Adriaenssens
ad6f253869
coding style : fix indenting
2013-09-17 11:45:21 +02:00
Weblate
07d2783450
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
2013-09-17 11:25:47 +02:00
Myung Han Yu
08ac91f1be
Translated using Weblate (Korean)
...
Currently translated at 74.2% (1937 of 2610)
2013-09-17 11:25:40 +02:00
Robert Readman
870bfac621
Translated using Weblate (English (United Kingdom))
...
Currently translated at 99.9% (2607 of 2610)
2013-09-17 11:25:38 +02:00
Michal Čihař
100416c25a
Fix variable name
2013-09-17 11:25:15 +02:00
Madhura Jayaratne
510c2db1de
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2013-09-17 07:30:16 +05:30
Madhura Jayaratne
cdd9312e65
bug #4000 "Table does not contain unique column" message appears after adding a unique column
2013-09-17 07:27:06 +05:30
Dieter Adriaenssens
6420189a16
fix coding style
2013-09-16 22:03:38 +02:00
Madhura Jayaratne
f497782262
#4034 Inline query edit has incorrect overflow
2013-09-16 22:17:57 +05:30
Marc Delisle
a6924ec916
Fix codestyle
2013-09-16 05:56:37 -04:00
Marc Delisle
f1b9eb2d62
Merge pull request #697 from xmujay/0915_UT_server_privileges
...
more UTs for PMA_server_privileges
2013-09-16 02:28:20 -07:00
Michal Čihař
3fef046acf
Do not set memory limit in SHP import as well
...
- First of all current detection is wrong and it will fail on values as
65536K.
- Also I see no reason why single import should override global settings
we have.
2013-09-16 09:19:42 +02:00
Michal Čihař
72ba7b62a8
Revert "Increase time limits for tests on Travis"
...
This reverts commit 63e71c6e15
2013-09-16 09:17:28 +02:00
Michal Čihař
db178d62c2
Avoid hardcoded time limit in SHP import
2013-09-16 09:17:05 +02:00
Michal Čihař
63e71c6e15
Increase time limits for tests on Travis
2013-09-16 08:47:33 +02:00
Michal Čihař
cf2a71dd3f
Use standard way for overriding Travis PHP configuration
2013-09-16 08:45:53 +02:00
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
xmujay
130bff3527
refactor the code style
2013-09-15 23:48:56 +08: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
xmujay
072d79bd2d
UTs for PMA_server_privileges
2013-09-15 21:17:13 +08:00
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
