gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,513 Commits 12 Branches 481 Tags 2.4 GiB
eaeafda8ea
Commit Graph

96513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
eaeafda8ea Merge commit '2c19d17' 2014-12-08 12:26:56 -05:00
Marc Delisle
2c19d17ce1 4.3.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-08 12:26:01 -05:00
Madhura Jayaratne
67756cc3f9 Merge branch 'QA_4_3' 2014-12-08 20:44:01 +05:30
Madhura Jayaratne
2d18ea2d4c Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-08 20:40:12 +05:30
Madhura Jayaratne
aab6b291a9 Add comment explaining why strlen is used in place of mb_strlen 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 20:37:36 +05:30
Marc Delisle
0958d981e1 Merge branch 'QA_4_3' 2014-12-08 07:55:30 -05:00
Marc Delisle
18477cc467 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-08 07:53:20 -05:00
Madhura Jayaratne
b02758e383 Merge branch 'QA_4_3' 2014-12-08 18:08:56 +05:30
Madhura Jayaratne
5233ee8bb1 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 18:07:58 +05:30
Madhura Jayaratne
d4cfbdad2e Merge branch 'QA_4_3' 2014-12-08 18:00:09 +05:30
Madhura Jayaratne
d475b3444c bug #4617 UI issues with sortable tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 17:56:15 +05:30
Madhura Jayaratne
bcc11ba137 Merge branch 'QA_4_3' 2014-12-08 14:13:41 +05:30
Madhura Jayaratne
b69bb37361 bug #4627 "file_get_contents(examples/create_tables.sql): failed to open stream" after update 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 14:12:03 +05:30
Madhura Jayaratne
60c5e7316e Merge branch 'QA_4_3' 2014-12-08 12:57:10 +05:30
Madhura Jayaratne
6f1b4fa259 A better fix for bug #4625 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 12:56:11 +05:30
Madhura Jayaratne
775436f70f bug #4625 "Insufficient space to save the file" on export SQL to file on server 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 12:46:46 +05:30
Madhura Jayaratne
7baa11fe6c Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 11:42:13 +05:30
Madhura Jayaratne
adceb3af89 Show loading message while updating sort 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 11:39:52 +05:30
Madhura Jayaratne
669e8981d7 bug #4626 Ctrl + click on a column not in sort triggers a server call to erroneous url 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 11:36:51 +05:30
Madhura Jayaratne
19f6b1fa1a Add loading messages to multi column sorting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-08 09:55:37 +05:30
Marc Delisle
69052a0663 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 18:40:53 -05:00
Hugues Peccatte
5b6c0d0693 Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-07 16:29:25 +01:00
Hugues Peccatte
d4c221160a Fix #4619 SELECT LENGTH(field) FROM does not sort 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-07 16:28:00 +01:00
Michal Čihař
5c5c4fbf40 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-07 12:53:51 +01:00
Marc Delisle
f87458719e Merge branch 'QA_4_3' 2014-12-07 06:41:20 -05:00
Marc Delisle
15deeb0cae Merge commit 'e770763' 2014-12-07 06:41:09 -05:00
Marc Delisle
a8a158e0f0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 06:40:23 -05:00
Robert Scheck
d9468e3fff Bug #4623 Incomplete PHP OpenSSL support 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-07 06:37:15 -05:00
Weblate
2162e4bb73 Merge remote-tracking branch 'origin/master' 2014-12-07 09:57:44 +01:00
Weblate
e770763f2b Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-07 09:57:41 +01:00
Xuan Hung
8506ec3df1 Translated using Weblate (Vietnamese) 
Currently translated at 1.6% (49 of 2991 strings)

[CI skip]
 2014-12-07 09:57:41 +01:00
Xuan Hung
551e9a76b1 Translated using Weblate (Vietnamese) 
Currently translated at 1.6% (49 of 2978 strings)

[CI skip]
 2014-12-07 09:57:39 +01:00
Chirayu Chiripal
3d5008a05c Merge branch 'QA_4_3' 2014-12-07 14:11:45 +05:30
Chirayu Chiripal
b8e698e22f remove HHVM from allowed failures 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-07 13:58:26 +05:30
Chirayu Chiripal
94a94c05c1 fix tests for HHVM 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-12-07 13:52:56 +05:30
Marc Delisle
6e9eee5cc6 Merge pull request #1414 from Tithugues/b4593_master 
Fix #4593 Manual SELECT doesn't change active table
 2014-12-06 18:28:11 -05:00
Marc Delisle
fa6ca2a504 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-06 18:27:47 -05:00
Marc Delisle
1b1bc83e1e Merge commit '96c0b6d' 2014-12-06 18:26:12 -05:00
Marc Delisle
e435379efd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-06 18:24:51 -05:00
Weblate
96c0b6d5b9 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2014-12-07 00:23:15 +01:00
Aputsiaĸ Niels Janussen
f8c2658a04 Translated using Weblate (Danish) 
Currently translated at 98.0% (2921 of 2978 strings)

[CI skip]
 2014-12-07 00:23:12 +01:00
Marc Delisle
732904f0f2 Merge pull request #1416 from Tithugues/b4593_qa43 
Fix #4593 Manual SELECT doesn't change active table
 2014-12-06 18:23:10 -05:00
Hugues Peccatte
5d911e902d Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:15:23 +01:00
Hugues Peccatte
b5118010c7 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:14:35 +01:00
Hugues Peccatte
ef450c156a Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:13:53 +01:00
Hugues Peccatte
19b9c893fc Fix #4593 Refresh navigation tree on manual select into SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:01:17 +01:00
Hugues Peccatte
35c4dbcaa1 Fix #4593 Refresh navigation tree on manual select into SQL tab. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 22:00:34 +01:00
Hugues Peccatte
3f16b312e1 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:02:27 +01:00
Hugues Peccatte
f5af9d7123 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:02:26 +01:00
Hugues Peccatte
fc2498361b Add unit test for PMA_Menu::setTable(). 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-06 14:02:26 +01:00