Madhura Jayaratne
|
8284f22d54
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Conflicts:
libraries/insert_edit.lib.php
|
2012-06-23 21:16:30 +05:30 |
|
Madhura Jayaratne
|
f5329f23e0
|
Coding style improvements (wrap some long lines, fix indentation, remove trailing spaces)
|
2012-06-23 21:02:19 +05:30 |
|
Thilina Buddika
|
7957602212
|
add the missing parameters in the PMA_getPmaTypeEnum function's docblock
|
2012-06-23 19:27:37 +05:30 |
|
Thilina Buddika
|
e49bcc8584
|
insclude missing code in insert_edit-lib
|
2012-06-23 19:19:08 +05:30 |
|
Thilina Buddika
|
f999925313
|
merge upstream
|
2012-06-22 22:19:56 +05:30 |
|
Thilina Buddika
|
11776f7f11
|
fixed - Inserting-editing ENUM columns impossible - ID-3536333
|
2012-06-22 21:54:05 +05:30 |
|
ProUser
|
9d2a8ca65c
|
Translated using Weblate.
|
2012-06-22 13:11:37 +02:00 |
|
Michal Čihař
|
f4d1eed004
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-06-22 10:26:40 +02:00 |
|
Hyun-Sung Yun
|
c779b1ff10
|
Translated using Weblate.
|
2012-06-22 10:24:57 +02:00 |
|
Hyun-Sung Yun
|
61bf6575ec
|
Translated using Weblate.
|
2012-06-22 10:24:44 +02:00 |
|
Michal Čihař
|
906d025d1f
|
Merge remote-tracking branch 'origin/master'
|
2012-06-21 13:27:31 +02:00 |
|
Michal Čihař
|
64b19b0181
|
Wrap some long lines
|
2012-06-21 13:27:19 +02:00 |
|
Michal Čihař
|
82fc0ff49f
|
Some indenation fixes
|
2012-06-21 13:27:19 +02:00 |
|
Michal Čihař
|
419edd70c0
|
Merge remote-tracking branch 'origin/master'
|
2012-06-21 12:27:11 +02:00 |
|
Marc Delisle
|
10c9132fdf
|
Typos
|
2012-06-21 06:26:59 -04:00 |
|
Michal Čihař
|
dbc18bb2c9
|
Merge remote-tracking branch 'origin/master'
|
2012-06-21 12:18:33 +02:00 |
|
Marc Delisle
|
747d49f2be
|
Typo
|
2012-06-21 06:18:01 -04:00 |
|
Marc Delisle
|
ba0a51e9f9
|
This should be a boolean param
|
2012-06-21 06:17:22 -04:00 |
|
Victor Volkov
|
781f86712a
|
Translated using Weblate.
|
2012-06-21 12:09:24 +02:00 |
|
Michal Čihař
|
9102d0f1c1
|
Wrap some long lines
|
2012-06-21 11:34:11 +02:00 |
|
Michal Čihař
|
8a41de8c24
|
Fix docblocks
|
2012-06-21 11:29:50 +02:00 |
|
Michal Čihař
|
cad77715a4
|
Indenation fix
|
2012-06-21 10:54:11 +02:00 |
|
Michal Čihař
|
1924460dba
|
Some minor coding style fixes
|
2012-06-21 10:43:24 +02:00 |
|
Michal Čihař
|
50c01dbd19
|
Wrap some long lines
|
2012-06-21 10:07:57 +02:00 |
|
Michal Čihař
|
aa3a1bbb0d
|
Various spacing and indentation improvements
|
2012-06-21 10:00:52 +02:00 |
|
Michal Čihař
|
7c645a10c6
|
Various fixes for docblocks
|
2012-06-21 09:58:35 +02:00 |
|
Michal Čihař
|
bc3ecfbba2
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-06-21 09:07:26 +02:00 |
|
Marc Delisle
|
2f47c31a66
|
Translated using Weblate.
|
2012-06-21 09:06:23 +02:00 |
|
Marc Delisle
|
b035024500
|
Translated using Weblate.
|
2012-06-20 18:40:32 +02:00 |
|
Marc Delisle
|
092b24227e
|
Translated using Weblate.
|
2012-06-20 18:39:04 +02:00 |
|
Marc Delisle
|
90770909d0
|
- Use strict comparison, in case the user put 0 for the ProtectBinary
directive
- Add a space after the ! operator
|
2012-06-20 06:08:25 -04:00 |
|
Michal Čihař
|
d80cc28087
|
Forgot to correctly merge changelog
|
2012-06-20 10:42:48 +02:00 |
|
Michal Čihař
|
75f3174436
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-06-20 10:31:20 +02:00 |
|
Michal Čihař
|
2e354b7b75
|
Document backport
|
2012-06-20 10:29:54 +02:00 |
|
Michal Čihař
|
6fe86fc549
|
More clever URL rewriting with ForceSSL (bug #3510196)
|
2012-06-20 10:29:16 +02:00 |
|
Michal Čihař
|
d578bda100
|
Clarify code for ForceSSL
Conflicts:
libraries/common.inc.php
|
2012-06-20 10:29:09 +02:00 |
|
J.M
|
7f6e422952
|
Fix possibly undefined $return_to_sql_query in insert_edit.lib.php
|
2012-06-19 19:18:53 +02:00 |
|
Marc Delisle
|
6db3d79ce0
|
Merge branch 'atul'
|
2012-06-19 12:39:07 -04:00 |
|
Madhura Jayaratne
|
9762547096
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-06-19 21:24:49 +05:30 |
|
Michal Čihař
|
e6492b592a
|
Fix typo
|
2012-06-19 17:52:08 +02:00 |
|
Madhura Jayaratne
|
c84ec82994
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2012-06-19 21:16:02 +05:30 |
|
Atul Pratap Singh
|
4ccf9b29b2
|
Fix sql results display in database search while deleting from search results
|
2012-06-19 18:14:57 +05:30 |
|
Michal Čihař
|
e729dc9a18
|
Wrap some long lines and various other minor coding style improvements
|
2012-06-19 13:21:31 +02:00 |
|
Michal Čihař
|
f529c10505
|
Various indentation and new line fixes
|
2012-06-19 11:29:05 +02:00 |
|
Michal Čihař
|
e26f9a03c4
|
Fix docblocks indentation
|
2012-06-19 11:23:26 +02:00 |
|
Michal Čihař
|
8f4243dacc
|
No need to unset local variables while leaving function
|
2012-06-19 11:12:36 +02:00 |
|
Michal Čihař
|
1774f2b0f5
|
Wrap some long lines
|
2012-06-19 11:12:12 +02:00 |
|
Michal Čihař
|
0a4fa4a25a
|
Fix some coding standard violations
|
2012-06-19 11:03:01 +02:00 |
|
Michal Čihař
|
26feda2eda
|
Fix documentation
|
2012-06-19 10:51:45 +02:00 |
|
Hamlet Muradyan
|
5f1f36d3d7
|
Translated using Weblate.
|
2012-06-19 10:44:45 +02:00 |
|
