gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,616 Commits 12 Branches 481 Tags 2.4 GiB
93ebada51b
Commit Graph

99616 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
93ebada51b Merge branch 'QA_4_4' 2015-05-09 06:18:02 -04:00
Marc Delisle
683088a4b8 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-09 06:17:24 -04:00
Marc Delisle
07dbc73a55 Merge pull request #1666 from nisargjhaveri/issue_4897 
Fix bug#4897
 2015-05-09 06:16:26 -04:00
Nisarg Jhaveri
4e9c3db67d Fix bug#4897 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-09 08:21:36 +05:30
Marc Delisle
4d02033f47 Merge branch 'QA_4_4' 2015-05-08 14:50:05 -04:00
Marc Delisle
b3a18956cf Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 14:49:41 -04:00
Marc Delisle
7fd24d1644 Merge branch 'QA_4_4' 2015-05-08 13:47:10 -04:00
Marc Delisle
4db6481ea3 Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 13:46:43 -04:00
Madhura Jayaratne
16fc314235 Fix more indentations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:17:42 +05:30
Madhura Jayaratne
b4b1f5edda Fix bad indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:14:18 +05:30
Madhura Jayaratne
af1f78902c Prefix private methods with underscore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:11:15 +05:30
Madhura Jayaratne
1f6a2c53c5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-08 21:10:50 +05:30
Madhura Jayaratne
096535fa8a Remove trailing white spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 21:09:41 +05:30
Marc Delisle
8d1bdb8228 Merge branch 'QA_4_4' 2015-05-08 11:37:39 -04:00
Marc Delisle
b254c928da ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 11:36:55 -04:00
Nisarg Jhaveri
c8a4ed578b Prevent multiple request for SQL autocomplete 
Fix Bug#4858

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-08 11:36:04 -04:00
Marc Delisle
879a609774 Merge branch 'QA_4_4' 2015-05-08 10:56:26 -04:00
Marc Delisle
4c5592e632 Fix for PHP < 5.5 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 10:56:00 -04:00
Marc Delisle
52b8aadd74 Refactor _setDisplayParts() due to excessive method length 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 09:44:50 -04:00
Marc Delisle
cfe8a00b1b Refactor _setDisplayParts() due to excessive method length 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-08 08:00:55 -04:00
Madhura Jayaratne
e3132374cc Merge branch 'QA_4_4' 2015-05-08 15:51:38 +05:30
Madhura Jayaratne
e60278b414 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 15:50:34 +05:30
Madhura Jayaratne
c59aef5860 Merge branch 'QA_4_4' 2015-05-08 15:41:41 +05:30
Madhura Jayaratne
470d61abaf bug #4894 Deleting without confirmation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 15:40:47 +05:30
Madhura Jayaratne
f931072342 Use CodeMirror editor in query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 13:44:21 +05:30
Madhura Jayaratne
dc72faf6ab Specific condition for cell values 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 10:02:19 +05:30
Madhura Jayaratne
02cbe875cc Merge branch 'QA_4_4' 2015-05-08 08:20:12 +05:30
Madhura Jayaratne
34c2837894 bug #4896 Non-styled error page when following results link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-08 08:18:15 +05:30
Marc Delisle
2f180d2132 Merge branch 'QA_4_4' 2015-05-07 14:20:26 -04:00
Marc Delisle
822c4dfec2 bug #4876 Settings issues (Favorite tables shown twice in Settings) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 14:19:42 -04:00
Marc Delisle
375f6cb954 Clarify variable name and doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 13:31:48 -04:00
Marc Delisle
73fdb59e72 4.4.6 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:32:33 -04:00
Marc Delisle
6bf603d47e Merge branch 'QA_4_4' 2015-05-07 10:31:31 -04:00
Marc Delisle
5cb4292e6a 4.4.7-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:31:01 -04:00
Marc Delisle
6dd341f5c5 phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:24:06 -04:00
Marc Delisle
5d9a7a748c Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:18:08 -04:00
Marc Delisle
504b80adbf phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 10:16:20 -04:00
Marc Delisle
a5398611f7 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 08:47:46 -04:00
Marc Delisle
53677b8e25 Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4 2015-05-07 08:45:46 -04:00
Marc Delisle
9306a93bec phpunit 4.2: assertTag is deprecated 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-07 08:45:43 -04:00
Madhura Jayaratne
0e7ac33cb4 Merge branch 'QA_4_4' 2015-05-07 18:03:19 +05:30
Madhura Jayaratne
a0d8975544 Merge pull request #1663 from madhuracj/bug4891 
bug #4891 CSV Import ignores "Replace table data with file" checkbox
 2015-05-07 18:00:54 +05:30
Madhura Jayaratne
7199825abd Long links may be converted to forms 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 17:53:50 +05:30
Madhura Jayaratne
ae4e5db376 rfe #1413 Explain analyzer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 17:40:33 +05:30
Madhura Jayaratne
1663995c59 bug #4891 CSV Import ignores "Replace table data with file" checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 10:26:36 +05:30
Madhura Jayaratne
11893d99dc Merge branch 'QA_4_4' 2015-05-07 07:58:27 +05:30
Madhura Jayaratne
f7716754f4 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-07 07:54:12 +05:30
Madhura Jayaratne
1e6750cbc9 bug #4892 Undefined variable: unique_conditions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-07 07:51:16 +05:30
Weblate
b5c7b6445d Merge remote-tracking branch 'origin/master' 2015-05-06 21:16:55 +02:00
dingo thirteen
7134bdad04 Translated using Weblate (Dutch) 
Currently translated at 100.0% (3082 of 3082 strings)

[CI skip]
 2015-05-06 21:16:52 +02:00