Marc Delisle
|
2ac444acd4
|
The DisableIS directive is being deprecated
|
2013-11-05 04:42:43 -05:00 |
|
Marc Delisle
|
869c1847c2
|
4.1.0-beta2
|
2013-11-04 14:58:04 -05:00 |
|
Marc Delisle
|
1b0037f108
|
Merge branch 'QA_4_0'
|
2013-11-04 12:34:35 -05:00 |
|
Marc Delisle
|
9c0a4022d2
|
Fix merge conflict
|
2013-11-04 12:34:09 -05:00 |
|
Madhura Jayaratne
|
4d8e34d954
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2013-11-04 22:22:02 +05:30 |
|
Madhura Jayaratne
|
525fd79d19
|
Remove more trailing white spaces
|
2013-11-04 22:20:39 +05:30 |
|
Madhura Jayaratne
|
f1a461d7bf
|
Remove trailing white spaces
|
2013-11-04 22:09:15 +05:30 |
|
Marc Delisle
|
e94f74fa51
|
The DisableIS directive is being deprecated
|
2013-11-04 06:11:50 -05:00 |
|
Marc Delisle
|
89d6473f49
|
The DisableIS directive is being deprecated
|
2013-11-04 05:56:39 -05:00 |
|
Michal Čihař
|
399fd56504
|
Add some credits for website as requested by Tony
|
2013-11-04 10:11:16 +01:00 |
|
Michal Čihař
|
5a614aeb64
|
Fix expected result
|
2013-11-04 09:49:01 +01:00 |
|
Michal Čihař
|
1ec6b61f46
|
Fix PMA_getHtmlForOptionsList parameters
|
2013-11-04 09:45:27 +01:00 |
|
Michal Čihař
|
bc4a5f35fa
|
Use shared version of PMA_getHtmlForOptionsList instead of duplicating it
|
2013-11-04 09:27:42 +01:00 |
|
Michal Čihař
|
af00f1a4a5
|
Include standard check for running inside phpMyAdmin
|
2013-11-04 09:27:00 +01:00 |
|
Marc Delisle
|
8fd0d79405
|
The DisableIS directive is being deprecated
|
2013-11-03 09:55:39 -05:00 |
|
Madhura Jayaratne
|
3b70bbc44e
|
Remove more trailing white spaces
|
2013-11-03 19:20:24 +05:30 |
|
Madhura Jayaratne
|
0c887a5a55
|
Trailing white spaces
|
2013-11-03 19:16:50 +05:30 |
|
Madhura Jayaratne
|
f311c9c502
|
Remove trailing white spaces
|
2013-11-03 19:13:23 +05:30 |
|
Madhura Jayaratne
|
184316d891
|
Coding style fixes
|
2013-11-03 19:00:41 +05:30 |
|
Marc Delisle
|
d64ea21bed
|
Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin
|
2013-11-03 07:47:32 -05:00 |
|
Piotr Przybylski
|
0f71786031
|
Tuned logo colors in setup
One more test fix
|
2013-11-03 13:17:29 +01:00 |
|
Piotr Przybylski
|
29ea84be7f
|
Fixed failing test
|
2013-11-03 13:10:20 +01:00 |
|
Piotr Przybylski
|
858b20d26d
|
Removed wiki links from setup script and user preferences
|
2013-11-03 13:07:22 +01:00 |
|
Marc Delisle
|
4905240aed
|
The DisableIS directive is being deprecated
|
2013-11-03 07:00:00 -05:00 |
|
Piotr Przybylski
|
a67e41a646
|
Refactored ConfigFile class so that it is no longer a singleton
Fixes bug #4123 Double config including
|
2013-11-03 12:54:20 +01:00 |
|
Piotr Przybylski
|
a75b5a6e2c
|
Fix saving user preferences to configuration storage
'server' parameter was not passed, so it was broken when default server required authentication
added missing AJAX operation result check
|
2013-11-03 12:38:51 +01:00 |
|
Weblate
|
c48b78d773
|
Merge remote-tracking branch 'origin/master'
|
2013-11-03 12:28:23 +01:00 |
|
Piotr Przybylski
|
6667a4e567
|
Translated using Weblate (Polish)
Currently translated at 92.8% (2548 of 2744)
|
2013-11-03 12:28:19 +01:00 |
|
Aputsiaq Niels Janussen
|
8668cb472c
|
Translated using Weblate (Danish)
Currently translated at 100.0% (2744 of 2744)
|
2013-11-03 12:28:14 +01:00 |
|
Marc Delisle
|
60938c67fa
|
The DisableIS directive is being deprecated
|
2013-11-03 06:27:02 -05:00 |
|
Marc Delisle
|
e3f974d902
|
Merge commit 'b1b555b'
|
2013-11-02 21:28:05 -04:00 |
|
Marc Delisle
|
86d3b289d8
|
Merge commit 'e377e19'
|
2013-11-02 21:27:49 -04:00 |
|
Marc Delisle
|
baa7577b6b
|
Merge commit 'cc73bb6'
|
2013-11-02 21:27:34 -04:00 |
|
Marc Delisle
|
9cec77d0e0
|
Adapt fix to 4.1
|
2013-11-02 21:26:58 -04:00 |
|
Marc Delisle
|
cfbf4b84b2
|
Merge commit '902e2bd'
|
2013-11-02 21:18:46 -04:00 |
|
Marc Delisle
|
2a9acc26f3
|
Merge commit '7c98659'
|
2013-11-02 21:18:27 -04:00 |
|
Marc Delisle
|
b1b555bab4
|
Merge branch 'QA_4_0' of https://github.com/phpmyadmin/phpmyadmin into QA_4_0
|
2013-11-02 21:17:24 -04:00 |
|
Marc Delisle
|
e377e1968a
|
ChangeLog entry for bug #4150 fix
|
2013-11-02 21:17:06 -04:00 |
|
Weblate
|
cc73bb6ee3
|
Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0
|
2013-11-03 02:15:50 +01:00 |
|
Piotr Przybylski
|
98b94da797
|
Translated using Weblate (Polish)
Currently translated at 99.1% (2592 of 2614)
|
2013-11-03 02:15:46 +01:00 |
|
Marc Delisle
|
cbf480351d
|
Merge pull request #739 from omerjerk/QA_4_0
Bug Fix #4150
|
2013-11-02 18:15:32 -07:00 |
|
Marc Delisle
|
60d91b4a38
|
Merge pull request #738 from scnakandala/master
bug fix 4148
|
2013-11-02 18:03:43 -07:00 |
|
Umair Khan
|
902e2bd0ad
|
Bug Fix #4150
|
2013-11-02 20:59:35 +05:30 |
|
Chien Wei Lin
|
7c98659cfe
|
Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2614 of 2614)
|
2013-11-02 16:10:34 +01:00 |
|
Chien Wei Lin
|
12b5f7ba14
|
Translated using Weblate (Traditional Chinese)
Currently translated at 99.9% (2743 of 2744)
|
2013-11-02 16:09:41 +01:00 |
|
Marc Delisle
|
a83d0b7bfb
|
Fix coding style
|
2013-11-02 08:02:36 -04:00 |
|
Spun Nakandala
|
d0631be88d
|
removed trailing white spaces.
|
2013-11-02 14:45:44 +05:30 |
|
Spun Nakandala
|
8860c81ab8
|
balanced html tags
|
2013-11-02 14:43:04 +05:30 |
|
Spun Nakandala
|
ba137a85f8
|
bug fix 4148
|
2013-11-02 02:32:18 +05:30 |
|
Marc Delisle
|
3065a3edcf
|
The DisableIS directive is being deprecated
|
2013-11-01 12:49:54 -04:00 |
|
