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

92389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Delisle
6f9435b3ea Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-10 08:17:44 +02:00
Marc Delisle
aa15281529 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-09 18:14:29 +02:00
Marc Delisle
b288a1676a Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 18:12:57 +02:00
Michal Čihař
3eccb9eb26 Improve signon-script example 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 18:07:39 +02:00
Michal Čihař
616e732c37 Add crossreferences to the auth docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 18:07:39 +02:00
Michal Čihař
33e8a493a4 Better documentation for authentication modes 
- move most of that to the setup section
- remove historical notes (like when it was introduced or originally
  called)
- include example scripts in the docs as well

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 18:07:39 +02:00
Michal Čihař
00b6fbe0fe Show sample script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 18:07:39 +02:00
Michal Čihař
721dc9798e Merge pull request #1152 from mebjas/feature-request-1518 
New patch for feature request 1518
 2014-05-09 17:08:31 +02:00
Michal Čihař
afe2279fc4 Avoid problems with undefined drizzle constants 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:49:05 +02:00
Michal Čihař
2f91d172ef Avoid duplicate flags 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:46:33 +02:00
Michal Čihař
55ed816931 Initialize variable (it is unset when saving of queries is disabled) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:35:42 +02:00
Michal Čihař
a5f338fe2f Fix handling of favorite tables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:32:49 +02:00
Michal Čihař
b1915bade0 The storeResult needs mysqli lin parameter to operate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:29:56 +02:00
Michal Čihař
8bc5e560e8 Uset errno before testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:19:59 +02:00
Michal Čihař
2a66d750a4 Use correct mock value 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:11:30 +02:00
Michal Čihař
0f39a811ce The DBI->getError is no longer called twice 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:03:00 +02:00
Michal Čihař
afe414102a Improve check for empty message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:02:48 +02:00
Michal Čihař
cb6b37f19d Remove extra spaces 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:57:45 +02:00
Michal Čihař
f159a39ff2 Handle cases when errno is set, but dbi does not return error message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:53:45 +02:00
Michal Čihař
bde44ed8e4 Separate function call formatting in backtrace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Michal Čihař
1d6e2e9479 Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Michal Čihař
38febf6daf Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Marc Delisle
fe3d80bb95 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-09 15:21:26 +02:00
Marc Delisle
2e089b4d8b Add a JQplot option to change the dot size in server status monitor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-09 15:19:06 +02:00
Michal Čihař
d44c4d9a96 Properly report MySQL error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:12:06 +02:00
Michal Čihař
650e0512de Share code for getting error message 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:05:36 +02:00
Michal Čihař
f420f1bcfd Document possible bug in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:57:10 +02:00
Michal Čihař
53eca3b2cb Share code for backtrace formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:44:41 +02:00
Michal Čihař
eb9a4b7771 Separate backtrace formatting from error handling 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:44:41 +02:00
Michal Čihař
82b4549176 Remove unused parameter of PMA_Util::cacheUnset 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:21:12 +02:00