gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,062 Commits 12 Branches 481 Tags 2.4 GiB
17d0f783d5
Commit Graph

101062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
17d0f783d5 Merge pull request #1793 from Tithugues/templatingErrorReportForm 
Templating error report form.
 2015-07-18 09:58:23 -04:00
Hugues Peccatte
ef16b1e358 Templating error report form. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-17 23:36:23 +02:00
Marc Delisle
770b0a05af Remove duplicate code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-17 16:21:37 -04:00
Madhura Jayaratne
fbd39de216 Opening braces should be on a new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:31:11 +05:30
Madhura Jayaratne
a405adb54d Fix coding style for another function call 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:28:39 +05:30
Madhura Jayaratne
453f996b92 Fix more coding style violations 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:24:33 +05:30
Madhura Jayaratne
6e5baa582c Inline control structures are discouraged 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:12:50 +05:30
Madhura Jayaratne
e8d3137a11 File is being conditionally included; use "include_once" instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 15:11:31 +05:30
Madhura Jayaratne
aec1782ada More coding style fixes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:48:47 +05:30
Madhura Jayaratne
318ee2dce5 Multi-line assignments must have the equal sign on the second line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:46:45 +05:30
Madhura Jayaratne
2b2b4777b4 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:42:41 +05:30
Madhura Jayaratne
658b8ad5e3 Revert tab changes in SqlFormatter_Test 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:36:15 +05:30
Madhura Jayaratne
a281d9c70f Use spaces in place of tabs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:32:55 +05:30
Madhura Jayaratne
9081580c63 Remove extra new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:23:27 +05:30
Madhura Jayaratne
039d0360fd Use underscore to prefix private variable names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:19:09 +05:30
Madhura Jayaratne
8c19eedca1 Use correct name format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:11:19 +05:30
Madhura Jayaratne
d93c110af8 Prefix more private methods with underscore 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:06:06 +05:30
Madhura Jayaratne
4f33dac829 Use underscores for private variables and methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:02:03 +05:30
Madhura Jayaratne
c4681f3e89 Fix coding styles for control structures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 13:57:05 +05:30
Madhura Jayaratne
64d76a2afd Merge branch 'QA_4_4' 2015-07-17 11:43:55 +05:30
Madhura Jayaratne
42eff5d11a bug #4985 Column headers move when scrolling 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 11:37:03 +05:30
Madhura Jayaratne
3afd40a490 Couple of more missing PMA_VERSION 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 11:32:42 +05:30
Madhura Jayaratne
06ee23ed26 Add PMA_VERSION to fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 11:28:34 +05:30
Madhura Jayaratne
8856d2b7da We need to test PMA_VERSION to avoid PMA_checkRelationsParam() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 11:11:47 +05:30
Madhura Jayaratne
390ce507a7 Merge branch 'bug4984' 2015-07-17 09:51:35 +05:30
Madhura Jayaratne
6b1523e3b4 No need to assign explicitly and it is assign inside the function call 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 09:47:34 +05:30
Madhura Jayaratne
1599481faa bug #4984 Undefined <feature>work upon upgrade to new version 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 09:38:09 +05:30
Marc Delisle
14e8e4b3ff - Remove code duplication 
- Improve variable name

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-16 14:22:35 -04:00
Marc Delisle
2c108f3268 Merge pull request #1791 from madhuracj/doc 
State clearing browser cache and session as required upon upgrading
 2015-07-16 05:50:47 -04:00
Παναγιώτης Παπάζογλου
f6c6cfa913 Translated using Weblate (Greek) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-16 07:37:16 +02:00
Madhura Jayaratne
0404f69ced State clearing browser cache and session as required upon upgrading 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-16 08:40:27 +05:30
Weblate
b2a7b91495 Merge remote-tracking branch 'origin/master' 2015-07-15 17:26:25 +02:00
Franco
380d272c0e Translated using Weblate (Spanish) 
Currently translated at 99.7% (3147 of 3155 strings)

[CI skip]
 2015-07-15 17:26:20 +02:00
Madhura Jayaratne
d2873e96ba Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-15 20:56:01 +05:30
Madhura Jayaratne
c64ed4ddcc Mark variable types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-15 20:54:48 +05:30
Franco
6b1353d6ea Translated using Weblate (Spanish) 
Currently translated at 100.0% (3038 of 3038 strings)

[CI skip]
 2015-07-15 17:02:15 +02:00
Madhura Jayaratne
ad49ae971e These checks are redundant. <feature>work variables should always be defined unless in an upgrade 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-15 19:31:37 +05:30
Marc Delisle
ea015a5389 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-15 08:06:35 -04:00
Weblate
48c895909a Merge remote-tracking branch 'origin/master' 2015-07-15 03:50:24 +02:00
Dalibor Straka
b36e840f81 Translated using Weblate (Czech) 
Currently translated at 97.1% (3064 of 3155 strings)

[CI skip]
 2015-07-15 03:50:20 +02:00
Isaac Bennetch
62547b127e Merge pull request #1790 from devenbansod/701C 
Improve Print View output by removing #prefs_autoload.
 2015-07-14 21:50:14 -04:00
Aleš Hakl
6875deffc8 Translated using Weblate (Czech) 
Currently translated at 98.1% (2983 of 3038 strings)

[CI skip]
 2015-07-14 23:54:20 +02:00
Aleš Hakl
acd6c4ea18 Translated using Weblate (Czech) 
Currently translated at 97.0% (3062 of 3155 strings)

[CI skip]
 2015-07-14 23:54:12 +02:00
Stefano Martinelli
03af422de4 Translated using Weblate (Italian) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-14 16:13:01 +02:00
Stefano Martinelli
b85e9a0c51 Translated using Weblate (Italian) 
Currently translated at 100.0% (3038 of 3038 strings)

[CI skip]
 2015-07-14 15:53:21 +02:00
Marc Delisle
680d70af8b The "Sort by key" drop-down should have priority over the remembered sorting 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-14 09:22:02 -04:00
Madhura Jayaratne
86e1510b9a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-14 17:04:40 +05:30
Madhura Jayaratne
e70d2cf551 bug #4981 Uncaught TypeError: Cannot read property 'attr' of null 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 17:03:30 +05:30
Marc Delisle
c7a4d176c5 Merge branch 'QA_4_4' 2015-07-14 06:46:29 -04:00
Marc Delisle
0ec95ea88b Merge commit '62042d2' 2015-07-14 06:46:22 -04:00