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 |
|
Michal Čihař
|
840c5aba06
|
Translated using Weblate.
|
2012-06-19 10:44:26 +02:00 |
|
Domen
|
801b14ec01
|
Translated using Weblate.
|
2012-06-18 22:38:30 +02:00 |
|
Burak Yavuz
|
85921dd394
|
Translated using Weblate.
|
2012-06-18 13:24:48 +02:00 |
|
Michal Čihař
|
ce273ee357
|
Update po files
|
2012-06-18 10:55:13 +02:00 |
|
Michal Čihař
|
46f4f501a2
|
Merge remote-tracking branch 'origin/QA_3_5'
|
2012-06-18 10:13:41 +02:00 |
|
Michal Čihař
|
20a6d3b1c6
|
Translated using Weblate.
|
2012-06-18 10:13:08 +02:00 |
|
Michal Čihař
|
79ee73fb9b
|
Merge pull request #73 from roccivic/server-databases-ajax-fixes
server_databases.php ajax fixes
|
2012-06-18 01:11:26 -07:00 |
|
Michal Čihař
|
b30d448b53
|
Merge pull request #71 from davidhrbac/master
A few Czech translation corrections
|
2012-06-18 01:09:18 -07:00 |
|
Michal Čihař
|
3d2d7bf6dd
|
Merge remote-tracking branch 'chanaka/master'
|
2012-06-18 10:03:42 +02:00 |
|
Michal Čihař
|
4886150744
|
Correct usage of ob_end_clean and ob_get_contents
|
2012-06-18 10:01:59 +02:00 |
|
Michal Čihař
|
ded256cab3
|
Merge remote-tracking branch 'yasitha/master'
|
2012-06-18 09:53:28 +02:00 |
|
Michal Čihař
|
17f64f0cc2
|
Merge remote-tracking branch 'origin/master'
|
2012-06-17 23:05:26 +02:00 |
|
Rouslan Placella
|
547282a240
|
Fixed missing function argument in the PMA_Scripts class
|
2012-06-17 22:05:07 +01:00 |
|
Michal Čihař
|
d4b516b33f
|
Merge remote-tracking branch 'origin/master'
|
2012-06-17 15:06:45 +02:00 |
|
Marc Delisle
|
317fd70397
|
Fix fatal error when running phpunit
|
2012-06-17 09:06:32 -04:00 |
|
Michal Čihař
|
f382c604de
|
Merge remote-tracking branch 'origin/master'
|
2012-06-17 14:43:29 +02:00 |
|
Marc Delisle
|
7510ba77f8
|
PMA_generateHtmlTab() becomes PMA_getHtmlTab()
|
2012-06-17 08:42:09 -04:00 |
|
Marc Delisle
|
dbc7758f12
|
PMA_generateHtmlTabs() becomes PMA_getHtmlTabs()
|
2012-06-17 08:39:31 -04:00 |
|
Michal Čihař
|
459d3e8e4c
|
Merge remote-tracking branch 'origin/master'
|
2012-06-17 14:31:48 +02:00 |
|
Marc Delisle
|
bd3cf8cda8
|
Clarify possible return values
|
2012-06-17 08:31:34 -04:00 |
|
Yasitha Pandithawatta
|
8c90ab793b
|
geometrycollection test coverage improved
|
2012-06-17 12:23:35 +05:30 |
|
Chanaka Indrajith
|
5037181363
|
Merge remote branch 'upstream/master'
|
2012-06-16 22:10:47 +05:30 |
|
Michal Čihař
|
af9772e0a6
|
Merge remote-tracking branch 'origin/master'
|
2012-06-16 13:21:41 +02:00 |
|
Atul Pratap Singh
|
05e95d3aa5
|
Deleted unused file libraries/tbl_select.lib.php
|
2012-06-16 15:07:00 +05:30 |
|
Atul Pratap Singh
|
55a6de9474
|
Merge branch 'master' of git://github.com/phpmyadmin/phpmyadmin
|
2012-06-16 14:51:19 +05:30 |
|
Atul Pratap Singh
|
ef2123e06a
|
Use PMA_TableSearch in tbl_zoom_select.php
|
2012-06-16 14:26:41 +05:30 |
|
Atul Pratap Singh
|
60cb21cd3d
|
Add useful get function to PMA_TableSearch
|
2012-06-16 14:17:15 +05:30 |
|
Rouslan Placella
|
8e51382fcd
|
Drop dead code
|
2012-06-15 20:37:41 +01:00 |
|
Rouslan Placella
|
11a5cd8194
|
Validate database name on client side when creating one
|
2012-06-15 20:37:41 +01:00 |
|
Rouslan Placella
|
ee5ffd8df6
|
Moved 'create database' ajax handler back to server_databases.js, since it's no longer required on main.php
|
2012-06-15 20:37:41 +01:00 |
|
