gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,420 Commits 12 Branches 481 Tags 2.4 GiB
2be24a07ff
Commit Graph

92420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2be24a07ff Show Swekey example in the docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 14:46:01 +02:00
Michal Čihař
4b0dedbdbf Merge remote-tracking branch 'origin/QA_4_2' 2014-05-10 14:37:22 +02:00
Robert Readman
31d8c7e0ca Translated using Weblate (English (United Kingdom)) 
Currently translated at 89.7% (2484 of 2768)
 2014-05-10 14:37:00 +02:00
Michal Čihař
86e0fc6fdb Use our own coding standard 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 14:21:43 +02:00
Madhura Jayaratne
04dc16e1fc Fix long lines 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:33:15 +02:00
Madhura Jayaratne
0b580f20c6 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:24:52 +02:00
Madhura Jayaratne
16ddc78df8 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:21:41 +02:00
Madhura Jayaratne
af857f33bc Fix parameter name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:19:06 +02:00
Madhura Jayaratne
f487813356 Remove sperfluous doc comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:17:29 +02:00
Madhura Jayaratne
9079749206 Fix coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:12:03 +02:00
Madhura Jayaratne
288c012128 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:05:12 +02:00
Madhura Jayaratne
348c51a5a3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-10 13:03:11 +02:00
Madhura Jayaratne
a5d0b1196c Fix yet another typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:02:55 +02:00
Madhura Jayaratne
553000a423 Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:02:22 +02:00
Madhura Jayaratne
839094612a Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:00:26 +02:00
Marc Delisle
277c0c57db Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:58:37 +02:00
Marc Delisle
15f42ca8c6 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 12:55:41 +02:00
Marc Delisle
d12d752c8c Merge pull request #1171 from ashutoshdhundhara/rfe_1445 
RFE: #1445 Easy access to "SHOW CREATE".
 2014-05-10 12:54:27 +02:00
Michal Čihař
71c0eba99f Add test for NavigationTree::renderPath 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:48:16 +02:00
Michal Čihař
b8a879cef2 Document when the function is called 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:09:08 +02:00
Madhura Jayaratne
c93a2f8c0f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-10 12:06:19 +02:00
Madhura Jayaratne
d0fd5acc0f Revert 33a30ad7ae. Those funcitons are infact used. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 12:04:36 +02:00
Michal Čihař
cff38db7f2 Share code for rending correct page after export 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 12:02:39 +02:00
Michal Čihař
4dea92dc9d Simplify condition (this is just an else branch) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:59:09 +02:00
Michal Čihař
e984b2a609 The ini_set function takes string, not booleans or integers 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:57:10 +02:00
Madhura Jayaratne
c154b1b9c5 Explicitly stating the visibility 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:54:49 +02:00
Madhura Jayaratne
33a30ad7ae These functions do not seem to be used anywhere, removing... 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:51:03 +02:00
Michal Čihař
72d180afd8 Add basic test for navigation tree 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
64cce57669 Fix Node self referencing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
f9d2cc0c31 Always initialize match variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
725073709c Use token directly for session 
There is no need to have intermediate global variable to store the token
once we have it in the session data.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Michal Čihař
e5ddfc87dc Remove dead code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 11:23:33 +02:00
Madhura Jayaratne
aa3b6bf2b8 Fix some coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 11:19:32 +02:00
Madhura Jayaratne
0dc03cad1e Check whether message is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:49:26 +02:00
Madhura Jayaratne
eb96dc7003 This should be an array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:31:51 +02:00
Madhura Jayaratne
a53ded5d9e $cfgRelation is an array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:21:53 +02:00
Madhura Jayaratne
af7e17a53d A boolean is expected here also 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:16:49 +02:00
Madhura Jayaratne
c6f72f6734 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-05-10 10:09:00 +02:00
Madhura Jayaratne
d0dfcfb41c A boolean is expected here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 10:08:50 +02:00
Michal Čihař
8341ddea85 Add ChangeLog entry for rfe #1518 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 10:07:40 +02:00
Michal Čihař
35828972c1 Another point to do on the release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 10:02:10 +02:00
Michal Čihař
0f3fdcc310 Add another point to do when creating a release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:52:06 +02:00
Michal Čihař
c1f060d77f More compact rendering of code status 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:50:07 +02:00
Michal Čihař
1865f72f2f Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:45:33 +02:00
Michal Čihař
a56ec50fb2 Move code for geting navigation node icon into Node class 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:42:53 +02:00
Michal Čihař
e320d423e2 Factor out tree walking into separate method to share the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:40:22 +02:00
Michal Čihař
e82c53f93d Move navigation node CSS class generation to Node object 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:34:37 +02:00
Weblate
ef81d95ab5 Merge remote-tracking branch 'origin/master' 2014-05-10 09:20:27 +02:00
Robert Readman
acdcfa4ee7 Translated using Weblate (English (United Kingdom)) 
Currently translated at 89.7% (2484 of 2768)
 2014-05-10 09:20:24 +02:00
Michal Čihař
07b090bcd2 Revert "Simplify code for generating separators array" 
This reverts commit e3d93b7f8a.

The new code did not properly handle empty separator.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 09:19:37 +02:00