Marc Delisle
|
7411185bd6
|
Fix coding style
|
2013-12-03 06:18:14 -05:00 |
|
Marc Delisle
|
10293081e8
|
Merge branch 'QA_4_1'
|
2013-12-02 13:02:29 -05:00 |
|
Marc Delisle
|
c51ff6f9d9
|
Unused code
|
2013-12-02 13:01:54 -05:00 |
|
Marc Delisle
|
c4f008b6cf
|
bug #4119 Huge session data with ['Error_Handler']['gather']
|
2013-12-02 13:00:51 -05:00 |
|
Dieter Adriaenssens
|
89bdfbc7d4
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (2743 of 2743)
|
2013-12-02 13:40:35 +01:00 |
|
Marc Delisle
|
3ad9ba59f6
|
Fix coding style
|
2013-12-02 06:01:12 -05:00 |
|
Kristjan Räts
|
a33a23b010
|
Translated using Weblate (Estonian)
Currently translated at 100.0% (2743 of 2743)
|
2013-12-02 09:30:40 +01:00 |
|
Burak Yavuz
|
df25503340
|
Translated using Weblate (Turkish)
Currently translated at 100.0% (2743 of 2743)
|
2013-12-01 18:16:50 +01:00 |
|
Marc Delisle
|
b39b0e5e09
|
Fix typo
|
2013-12-01 09:39:09 -05:00 |
|
Marc Delisle
|
2edca90bdb
|
Merge branch 'QA_4_1'
|
2013-12-01 09:27:58 -05:00 |
|
Marc Delisle
|
7256dbd070
|
Merge commit '38891e5'
|
2013-12-01 09:27:49 -05:00 |
|
Marc Delisle
|
3840c43403
|
This is undefined when we copy a user without deleting the old one
|
2013-12-01 09:27:01 -05:00 |
|
Hugues Peccatte
|
7b581ff403
|
Merge pull request #771 from Tithugues/fix-4157-v2
Fix 4157: Display error message when using "Change Login Information / Copy User" dialog to update password
|
2013-12-01 06:26:18 -08:00 |
|
Marc Delisle
|
0d74b94564
|
Fix coding style
|
2013-12-01 07:40:05 -05:00 |
|
Hugues Peccatte
|
8b5c1ae617
|
Throw an error not to leave the interface.
|
2013-12-01 10:17:17 +01:00 |
|
Hugues Peccatte
|
ce336c5c73
|
Add French translation for new error message.
|
2013-12-01 00:47:04 +01:00 |
|
Hugues Peccatte
|
146879ea14
|
Update po files
|
2013-12-01 00:40:45 +01:00 |
|
Hugues Peccatte
|
6b2ed44c50
|
Display error message when using "Change Login Information / Copy User" dialog to update password (bug 4157)
|
2013-12-01 00:21:05 +01:00 |
|
Weblate
|
38891e5d27
|
Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
|
2013-11-30 14:13:42 +01:00 |
|
Andriy Bandura
|
cac94c98b6
|
Translated using Weblate (Ukrainian)
Currently translated at 94.2% (2584 of 2742)
|
2013-11-30 14:13:38 +01:00 |
|
Marc Delisle
|
458cb8c626
|
Merge branch 'QA_4_1'
|
2013-11-30 08:13:11 -05:00 |
|
Marc Delisle
|
35ab010a46
|
4.1.0-rc2
|
2013-11-30 08:12:31 -05:00 |
|
Weblate
|
5efb085912
|
Merge remote-tracking branch 'origin/master'
|
2013-11-30 13:46:17 +01:00 |
|
Andriy Bandura
|
cbbe265fd7
|
Translated using Weblate (Ukrainian)
Currently translated at 94.2% (2584 of 2742)
|
2013-11-30 13:46:12 +01:00 |
|
Marc Delisle
|
204e138770
|
- Fix typo
- Fix coding style
|
2013-11-30 07:44:15 -05:00 |
|
Madhura Jayaratne
|
e28f8824bf
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2013-11-30 00:04:04 +05:30 |
|
Madhura Jayaratne
|
03fef95e14
|
Coding style fixes - valid class names
|
2013-11-30 00:00:56 +05:30 |
|
Weblate
|
2b6d6ffd3e
|
Merge remote-tracking branch 'origin/master'
|
2013-11-29 19:17:05 +01:00 |
|
Andriy Bandura
|
925a687fbb
|
Translated using Weblate (Ukrainian)
Currently translated at 86.4% (2371 of 2742)
|
2013-11-29 19:17:01 +01:00 |
|
Madhura Jayaratne
|
4484acdc49
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2013-11-29 23:46:31 +05:30 |
|
Madhura Jayaratne
|
728d3f32a3
|
Doc comment improvements
|
2013-11-29 23:23:19 +05:30 |
|
Marc Delisle
|
6c90e8b8b7
|
Merge branch 'QA_4_1'
|
2013-11-29 12:23:02 -05:00 |
|
Weblate
|
64dece9fb3
|
Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
|
2013-11-29 18:20:20 +01:00 |
|
Chien Wei Lin
|
432ab953c1
|
Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2742 of 2742)
|
2013-11-29 18:20:15 +01:00 |
|
흥재 신
|
6191c36fb4
|
Translated using Weblate (Korean)
Currently translated at 71.0% (1948 of 2742)
|
2013-11-29 18:20:10 +01:00 |
|
Atul Pratap Singh
|
91ab107e3a
|
Fix bug#4146, set guid of wrapped function same as original function
|
2013-11-29 12:19:14 -05:00 |
|
Chien Wei Lin
|
955a8e8f1e
|
Translated using Weblate (Traditional Chinese)
Currently translated at 100.0% (2742 of 2742)
|
2013-11-29 15:23:34 +01:00 |
|
Atul Pratap Singh
|
5fd23f1385
|
Fix bug#4146, set guid of wrapped function same as original function
|
2013-11-29 22:22:28 +05:30 |
|
Weblate
|
a63bf83abe
|
Merge remote-tracking branch 'origin/master'
|
2013-11-29 11:35:49 +01:00 |
|
흥재 신
|
ce1631ec0b
|
Translated using Weblate (Korean)
Currently translated at 71.0% (1948 of 2742)
|
2013-11-29 11:35:43 +01:00 |
|
Marc Delisle
|
b7015b68f4
|
Fix coding style
|
2013-11-29 05:34:32 -05:00 |
|
Madhura Jayaratne
|
e97a5fedef
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2013-11-28 23:15:52 +05:30 |
|
Madhura Jayaratne
|
de2f210fc9
|
Improve doc comments
|
2013-11-28 23:13:41 +05:30 |
|
Marc Delisle
|
7aa96075fa
|
Merge branch 'QA_4_1'
|
2013-11-28 12:40:37 -05:00 |
|
Marc Delisle
|
a07ff540f3
|
Merge commit 'a88e3b3'
|
2013-11-28 12:40:28 -05:00 |
|
Marc Delisle
|
a65be4fef8
|
Complete the list of credits for GSoC 2013
|
2013-11-28 12:39:58 -05:00 |
|
Marc Delisle
|
8f9652e903
|
Merge pull request #719 from ruleant/string_width
move duplicate getStringWidth method to seperate class
|
2013-11-28 08:07:08 -08:00 |
|
Madhura Jayaratne
|
ecbcfa3e36
|
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
|
2013-11-28 21:35:47 +05:30 |
|
Madhura Jayaratne
|
6a5062af3d
|
Fix failing tests
|
2013-11-28 21:34:02 +05:30 |
|
Dieter Adriaenssens
|
0fe2acc424
|
Merge branch 'master' into string_width
Conflicts:
test/classes/schema/Svg_test.php
|
2013-11-28 16:32:49 +01:00 |
|
