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

96537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
efdda87f28 Merge branch 'QA_4_3' 2014-12-10 12:45:58 +05:30
Madhura Jayaratne
7ee1af4fc6 Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2014-12-10 12:41:22 +05:30
Madhura Jayaratne
ce2474f108 bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query. 
Url may not necessarily have a query part

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-10 12:39:37 +05:30
Robin van der Vliet
bbc39eb525 Translated using Weblate (Frisian) 
Currently translated at 0.0% (1 of 2989 strings)

[CI skip]
 2014-12-09 19:13:19 +01:00
Marc Delisle
c15d3f8051 Merge branch 'QA_4_3' 2014-12-09 13:06:42 -05:00
Marc Delisle
82c04dc0bd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 13:06:17 -05:00
Marc Delisle
7deba11168 Undefined index central_columnswork 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 13:05:14 -05:00
Marc Delisle
e17ccae612 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-09 12:52:40 -05:00
Madhura Jayaratne
ada04cb93a Merge branch 'QA_4_3' 2014-12-09 17:05:00 +05:30
Madhura Jayaratne
e9b9526199 #4629 Problem with custom SQL queries using cookie authentication 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 17:03:58 +05:30
Madhura Jayaratne
244a256d2c Merge branch 'QA_4_3' 2014-12-09 16:46:06 +05:30
Madhura Jayaratne
093be4b1ee Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 16:45:23 +05:30
Madhura Jayaratne
40aadeba78 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-09 16:29:09 +05:30
Madhura Jayaratne
38d180bf85 Merge branch 'QA_4_3' 2014-12-09 16:27:43 +05:30
Madhura Jayaratne
55488bf86f bug #4631 Server selector submits two server parameter values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 16:26:46 +05:30
Michal Čihař
9cc4d73c9d Translated using Weblate (Frisian) 
Currently translated at 0.0% (1 of 2989 strings)

[CI skip]
 2014-12-09 10:48:40 +01:00
Madhura Jayaratne
27a3391aff Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-09 13:34:01 +05:30
Madhura Jayaratne
c4df5731e0 Update with the version distributed at jQuery website. Earlier one was version 1.11.1 release from Github. This removed the reference to .map file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 13:32:03 +05:30
Michal Čihař
b3899f13f5 Add Frisian translation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-09 08:43:50 +01:00
Madhura Jayaratne
e048511e7f Merge branch 'QA_4_3' 2014-12-09 12:40:43 +05:30
Madhura Jayaratne
3eb3ce396b bug #4628 PHP error while exporting schema as PDF 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-09 12:36:52 +05:30
Marc Delisle
f87b1fa946 Merge branch 'QA_4_3' 2014-12-08 12:46:17 -05:00
Marc Delisle
24d2e4fa95 4.3.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-08 12:45:53 -05:00
Marc Delisle
901f149ad6 4.3.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-08 12:27:24 -05:00
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