Marc Delisle
f0cb0e7dab
3.5.7-rc1
2013-02-12 14:53:05 -05:00
J.M
eb7b59b609
Merge branch 'QA_3_5'
2013-02-12 19:34:36 +01:00
J.M.
c5ad32e00d
Merge pull request #167 from lem9/chrome_detection
...
Correct detection of the Chrome browser
2013-02-12 10:21:05 -08:00
Marc Delisle
5aad30f760
Correct detection of the Chrome browser
2013-02-12 12:53:58 -05:00
Michal Čihař
6c4aedbac2
Fix typo
2013-02-12 15:54:49 +01:00
Michal Čihař
9afa1f3690
Update po files
2013-02-12 15:53:00 +01:00
Michal Čihař
192ca5de47
Merge pull request #166 from helmo/master
...
Place some more variable names between curly braces
2013-02-12 06:48:21 -08:00
Herman van Rink
5b295a8916
Place some more variable names between curly braces
2013-02-12 15:00:02 +01:00
Michal Čihař
5e7e416dab
Merge remote-tracking branch 'origin/QA_3_5'
...
Conflicts:
libraries/header_http.inc.php
2013-02-12 14:15:12 +01:00
Michal Čihař
9702c92f82
Merge pull request #164 from lem9/bug_3821
...
Bug #3821 Safari: white page
2013-02-12 05:13:27 -08:00
Michal Čihař
d64daa0cdb
Include some possibly missing variables
2013-02-12 14:09:06 +01:00
Marc Delisle
c758fdae2c
No longer need to allow phpmyadmin.net
2013-02-12 08:06:53 -05:00
Marc Delisle
95e948fbfd
Bug #3821 Safari: white page
2013-02-12 08:00:37 -05:00
Michal Čihař
8f159ee62c
Merge remote-tracking branch 'origin/QA_3_5'
2013-02-12 10:09:32 +01:00
Michal Čihař
6836ec03dd
Add link to developers section
2013-02-12 10:09:19 +01:00
Weblate
83f396164a
Merge remote-tracking branch 'origin/master'
2013-02-12 10:06:56 +01:00
Kai-Ove Finvold
e22c6fdcff
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 72.0% (1874 of 2602)
2013-02-12 10:06:00 +01:00
Edgaras Janušauskas
cccf972f04
Translated using Weblate (Lithuanian)
...
Currently translated at 67.8% (1764 of 2602)
2013-02-12 10:05:58 +01:00
Kai-Ove Finvold
a358df5c58
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 77.2% (1977 of 2562)
2013-02-12 10:05:45 +01:00
Edgaras Janušauskas
9e3d5a6c7d
Translated using Weblate (Lithuanian)
...
Currently translated at 73.5% (1882 of 2562)
2013-02-12 10:05:43 +01:00
Atul Pratap Singh
cf200355a7
Fixing bug: 3798, correcting CHAR_LENGTH use, for blob in where clause
2013-02-12 11:14:42 +05:30
Supun Nakandala
6ff5e7fe7f
indentation refactored
2013-02-11 22:50:18 +05:30
Supun Nakandala
d5c3f91daa
indentation refactored
2013-02-11 22:35:43 +05:30
Michal Čihař
bf638ee837
Fix tests to use http urls as well
2013-02-11 08:53:54 +01:00
Weblate
b7d2f994ce
Merge remote-tracking branch 'origin/master'
2013-02-11 08:49:21 +01:00
Michal Čihař
fe003c609c
Merge remote-tracking branch 'origin/QA_3_5'
2013-02-11 08:48:58 +01:00
Andrey Prokopenko
aee739fc75
Translated using Weblate (Ukrainian)
...
Currently translated at 97.2% (2489 of 2562)
2013-02-11 08:47:56 +01:00
Weblate
28b47ffc8c
Merge remote-tracking branch 'origin/master'
2013-02-11 08:42:58 +01:00
Andrey Prokopenko
2cfbe04dc5
Translated using Weblate (Ukrainian)
...
Currently translated at 90.6% (2357 of 2602)
2013-02-11 08:42:52 +01:00
Michal Čihař
c618ffffbb
Merge git://github.com/helmo/phpmyadmin
2013-02-11 08:42:13 +01:00
Supun Nakandala
fcefcc8517
Further modified and removed php sleep calls
2013-02-10 23:48:28 +05:30
Victor Volkov
a3ba7c87cf
Translated using Weblate (Russian)
...
Currently translated at 100.0% (2602 of 2602)
2013-02-10 16:40:06 +01:00
ayushchd
541538f099
Selenium Create Drop DB Test refactored to handle AJAX Content
...
I have refactored the Create/Drop Database test to handle the AJAX
content, it uses waitForElementPresent() method to wait for an ajax
response which should be more reliable than sleep(). Next, I have tried
to use more of cssSelectors rather than xpaths as cssselectors cope up
well with structural changes on the page. Not yet added to
AllSeleniumTests.php, waiting for approval.
2013-02-10 16:40:52 +05:30
ayushchd
dc986d9d74
CreateDropDatabaseTest refactored to handle AJAX content
...
I have refactored the Create/Drop Database test to handle the AJAX
content, it uses waitForElementPresent() method to wait for an ajax
response which should be more reliable than sleep(). Next, I have tried
to use more of cssSelectors rather than xpaths as cssselectors cope up
well with structural changes on the page. Not yet added to
AllSeleniumTests.php, waiting for approval.
2013-02-10 16:34:58 +05:30
Supun Nakandala
8163dc1c0b
Existing selenium tests refactored s that they work with the latest revision.5
2013-02-10 15:57:41 +05:30
Weblate
9ac7b0bedb
Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5
2013-02-09 13:51:12 +01:00
Weblate
b1b93ed559
Merge remote-tracking branch 'origin/master'
2013-02-09 13:51:10 +01:00
Ewald Gemert, van
2eab182e9f
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (2562 of 2562)
2013-02-09 13:51:09 +01:00
Marc Delisle
bcfba0d46c
Fix merge conflicts
2013-02-09 07:50:16 -05:00
Marc Delisle
4aa963ac87
Merge branch 'QA_3_5'
2013-02-09 07:46:16 -05:00
Marc Delisle
9b7f2180df
Bug #3816 Missing server_processlist.php
2013-02-09 07:36:10 -05:00
Weblate
1cb22d9b28
Merge remote-tracking branch 'origin/master'
2013-02-09 12:44:31 +01:00
Ewald Gemert, van
0f29321d96
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (2602 of 2602)
2013-02-09 12:44:25 +01:00
Marc Delisle
ea2f0d01e2
4.0.0-beta1
2013-02-09 06:44:05 -05:00
Rouslan Placella
26c398e165
Disable ajax in sql confirmations
2013-02-08 19:49:50 +00:00
Rouslan Placella
4e297d9770
Fixed PHP error in sql.php
...
Also see: 543fc6231a (L0R511)
2013-02-08 18:34:11 +00:00
Atul Pratap Singh
498bd261de
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
2013-02-08 23:27:21 +05:30
Marc Delisle
a92893b09e
Merge pull request #155 from ayushchd/master
...
Pull request for bugs:#3802 Datepicker displayed just the first time
2013-02-08 09:42:20 -08:00
Burak Yavuz
e0ff6c0a0e
Translated using Weblate (Turkish)
...
Currently translated at 100.0% (2602 of 2602)
2013-02-08 18:39:02 +01:00
ayushchd
403bafb999
Indentation fix
2013-02-08 23:08:06 +05:30
