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
|
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 |
|
J.M
|
2a968d96a3
|
Merge branch 'origin/QA_4_0'
Conflicts:
libraries/server_privileges.lib.php
|
2013-05-14 16:10:37 +02:00 |
|
Randall Fan
|
f617c487cd
|
Translated using Weblate (Simplified Chinese)
Currently translated at 97.3% (2579 of 2651)
|
2013-05-14 16:10:35 +02:00 |
|
J.M
|
3f7bd7f8a7
|
Use PEAR standard in PMA_getHtmlForDisplaySelectDbInEditPrivs function name
|
2013-05-14 16:07:38 +02:00 |
|
J.M
|
e2ea214267
|
Fix bug #3930 Databases to choose for specific privileges show up escaped
|
2013-05-14 16:04:49 +02:00 |
|
J.M
|
a1c17d7a7a
|
Merge branch 'QA_4_0' into bug-3907
Conflicts:
ChangeLog
|
2013-05-14 14:35:24 +02:00 |
|
Weblate
|
159927a742
|
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
|
2013-05-14 12:00:47 +02:00 |
|
J.M
|
8473a5f789
|
add changelog entry for bug #3919 PropertiesIconic not honored
|
2013-05-14 12:01:07 +02:00 |
|
Randall Fan
|
04ee24ffd9
|
Translated using Weblate (Simplified Chinese)
Currently translated at 99.7% (2600 of 2607)
|
2013-05-14 12:00:43 +02:00 |
|
Spun Nakandala
|
22ba2d8147
|
Bug #3919 PropertiesIconic not honored fixed
(cherry picked from commit 01c57f71ca)
|
2013-05-14 11:51:29 +02:00 |
|
Michal Čihař
|
712bbac48e
|
Merge pull request #380 from ibennetch/faq1_34
Documentation - fix URL with line break issue
|
2013-05-13 15:01:59 -07:00 |
|
Michal Čihař
|
f38001d962
|
Merge pull request #378 from adamgsoc2013/unit_index_ut2
add more test case for PMA_Index
|
2013-05-13 15:01:26 -07:00 |
|
Michal Čihař
|
a1e711b919
|
Merge pull request #361 from scnakandala/Bug_3919
Bug #3919 PropertiesIconic not honored fixed
|
2013-05-13 14:58:22 -07:00 |
|
Marc Delisle
|
3f2c9466e2
|
Incomplete change during previous fixing of conflicts
|
2013-05-13 17:02:48 -04:00 |
|
Marc Delisle
|
e1078c38ee
|
Fix merge conflicts
|
2013-05-13 16:33:21 -04:00 |
|
Marc Delisle
|
d5add05ba5
|
Fix merge conflicts
|
2013-05-13 15:48:21 -04:00 |
|
Kasun Chathuranga
|
a24b4ae33a
|
PMA_Table::analyzeStructure() method to centralize the analysis of the structure of a view/table
|
2013-05-13 23:11:30 +05:30 |
|
Weblate
|
e5074e3c64
|
Merge remote-tracking branch 'origin/master'
|
2013-05-13 19:16:22 +02:00 |
|
Lassi Ruonavaara
|
d370358524
|
Translated using Weblate (Finnish)
Currently translated at 67.3% (1785 of 2651)
|
2013-05-13 19:16:16 +02:00 |
|
Marc Delisle
|
0b5ad79701
|
Merge commit '8a4f44f'
|
2013-05-13 13:15:43 -04:00 |
|
Marc Delisle
|
886c7e700a
|
Merge commit '837b794'
|
2013-05-13 13:15:24 -04:00 |
|
