Marc Delisle
|
51b7426263
|
Fix merge conflict
|
2013-05-17 12:42:58 -04:00 |
|
Weblate
|
78e5e4dbeb
|
Merge remote-tracking branch 'origin/master'
|
2013-05-17 07:34:24 +02:00 |
|
Yungu Kim
|
5ede7a9199
|
Translated using Weblate (Korean)
Currently translated at 62.6% (1660 of 2651)
|
2013-05-17 07:34:20 +02:00 |
|
Yungu Kim
|
1628b866be
|
Translated using Weblate (Korean)
Currently translated at 62.6% (1659 of 2651)
|
2013-05-17 07:34:14 +02:00 |
|
Atul Pratap Singh
|
3a68fb3e6c
|
Fix bug#3936 in master
|
2013-05-17 11:03:19 +05:30 |
|
Isaac Bennetch
|
dd2ca745b9
|
Fix unwanted trailing spacing
|
2013-05-16 09:46:15 -04:00 |
|
Isaac Bennetch
|
8fbad56812
|
Merge remote branch 'upstream/master' into ayusun-fr1410
|
2013-05-16 09:39:09 -04:00 |
|
Michal Čihař
|
16febdbd87
|
There should be message variable as well
|
2013-05-16 20:25:57 +02:00 |
|
Michal Čihař
|
0486cc71b1
|
Fix variable name
|
2013-05-16 19:37:48 +02:00 |
|
Marc Delisle
|
35a423efdf
|
Merge branch 'QA_4_0'
|
2013-05-16 13:17:06 -04:00 |
|
Marc Delisle
|
a8e5a455f4
|
$HTTP_USER_AGENT no longer exists
|
2013-05-16 13:16:19 -04:00 |
|
Marc Delisle
|
dc92c29f5b
|
Bug #3907, other fixes
|
2013-05-16 13:03:13 -04:00 |
|
Marc Delisle
|
92b35fec45
|
Bug #3907, other fixes
|
2013-05-16 12:55:36 -04:00 |
|
Weblate
|
aee3df5936
|
Merge remote-tracking branch 'origin/master'
|
2013-05-16 15:43:08 +02:00 |
|
Rytis Slatkevičius
|
f62af40369
|
Translated using Weblate (Lithuanian)
Currently translated at 64.9% (1720 of 2651)
|
2013-05-16 15:43:02 +02:00 |
|
Michal Čihař
|
2eecd40b29
|
Merge pull request #392 from adamgsoc2013/unit_PMA4
test case for static function of PMA_Util
|
2013-05-16 06:42:18 -07:00 |
|
Isaac Bennetch
|
fcd891514e
|
Manually merge ayusun-fr1410
|
2013-05-16 09:36:36 -04:00 |
|
adamgsoc2013
|
2d322608e5
|
test case for static function of PMA_Util
|
2013-05-16 21:30:50 +08:00 |
|
Michal Čihař
|
17576dcb29
|
Merge pull request #388 from xmujay/2332_xmujay1
refactor function naming on server view files
|
2013-05-15 23:21:52 -07:00 |
|
Michal Čihař
|
2c8242d4eb
|
Merge pull request #389 from xmujay/2332_xmujay3
make function starting with "PMA"
|
2013-05-15 23:21:37 -07:00 |
|
Michal Čihař
|
c8e032c0c4
|
Merge pull request #390 from adamgsoc2013/unit_PMA2
add test getFontsizeOptions for "em","Pt","px" unit
|
2013-05-15 23:21:16 -07:00 |
|
Michal Čihař
|
37b6f67fcb
|
Merge pull request #387 from xmujay/2332_xmujay
make function outside class starting with "PMA"; render HTML at once
|
2013-05-15 23:20:28 -07:00 |
|
Marc Delisle
|
c445775595
|
Fix merge conflicts
|
2013-05-15 16:47:20 -04:00 |
|
Marc Delisle
|
ecd0435012
|
Merge commit '50ca355'
|
2013-05-15 16:45:54 -04:00 |
|
Marc Delisle
|
5681279f34
|
Remove dead code
|
2013-05-15 16:42:45 -04:00 |
|
Atul Pratap Singh
|
50ca35576f
|
Use live here, fix bug#3936
|
2013-05-15 23:23:07 +05:30 |
|
Marc Delisle
|
d44367e4db
|
Fix merge conflicts
|
2013-05-15 13:07:22 -04:00 |
|
Marc Delisle
|
920d827c37
|
Merge pull request #379 from mynetx/bug-3907
Fix most analysis results discovered in bug 3907
|
2013-05-15 09:52:03 -07:00 |
|
adamgsoc2013
|
01fe907a28
|
add test getFontsizeOptions for "em","Pt","px" unit
|
2013-05-16 00:44:36 +08:00 |
|
xmujay
|
191cc35760
|
make function starting with "PMA"
|
2013-05-16 00:16:30 +08:00 |
|
xmujay
|
87ec31ce5f
|
refactor function naming on server view files
|
2013-05-15 23:58:50 +08:00 |
|
xmujay
|
76df1ca1c1
|
make function outside class starting with "PMA"; render HTML at once
|
2013-05-15 23:48:30 +08:00 |
|
Marc Delisle
|
b07df01340
|
Code cleanup
|
2013-05-15 10:21:08 -04:00 |
|
Marc Delisle
|
144b5040cc
|
Fix typo
|
2013-05-15 10:19:46 -04:00 |
|
Marc Delisle
|
7357ce0071
|
Merge pull request #348 from hisamith/refactor_tbl_create_and_add_field
Refactored “tbl_addfield.php” and “tbl_create.php” by moving duplicated code
|
2013-05-15 07:17:35 -07:00 |
|
Samith Dassanayake
|
9746f07ae9
|
Fixed typos.
|
2013-05-15 19:33:30 +05:30 |
|
Marc Delisle
|
74ec3817a9
|
Merge branch 'QA_4_0'
|
2013-05-14 17:32:34 -04:00 |
|
Marc Delisle
|
7b819aa6d1
|
Fix merge conflict
|
2013-05-14 17:31:47 -04:00 |
|
Madhura Jayaratne
|
77e31ceeb6
|
Use single indentation (4 spaces)
|
2013-05-14 23:54:05 +05:30 |
|
Marc Delisle
|
ef62569540
|
Fix merge conflict
|
2013-05-14 14:13:32 -04:00 |
|
Marc Delisle
|
84d7995680
|
Move ChangeLog entry
|
2013-05-14 14:10:26 -04:00 |
|
Marc Delisle
|
f1df54b99c
|
Merge pull request #376 from ayusun/bug3910
Bug fix 3910. Updated Export plugin to support zero rows
|
2013-05-14 11:08:04 -07:00 |
|
ayusun
|
818e15bfc9
|
Updated ChangeLog for bug #3910
|
2013-05-14 22:54:41 +05:30 |
|
Samith Dassanayake
|
485d104662
|
Renamed the function names, using "column" instead of "field".
Corrected indentation according to cording standards.
|
2013-05-14 22:48:51 +05:30 |
|
ayusun
|
25e71b71da
|
Bug fix #3910 with updated code indentation
|
2013-05-14 22:40:39 +05:30 |
|
Marc Delisle
|
57e144edde
|
Merge pull request #270 from roccivic/version-check-proxy
Implemented rfe #1416 config.inc.php proxy settings for version_check.ph...
|
2013-05-14 09:48:22 -07:00 |
|
Marc Delisle
|
e28f3c064d
|
Merge branch 'QA_4_0'
|
2013-05-14 12:19:58 -04:00 |
|
Marc Delisle
|
be4f24265b
|
Fix typo
|
2013-05-14 12:19:20 -04:00 |
|
Marc Delisle
|
f8e90174a0
|
Merge pull request #375 from Chanaka/QA_4_0
Fixed #3902: Cannot browse when table name contains keyword 'call'
|
2013-05-14 09:18:21 -07:00 |
|
Weblate
|
183bd776ab
|
Merge remote-tracking branch 'origin/master'
|
2013-05-14 16:10:42 +02:00 |
|
