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

101035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Marc Delisle
598ebb8057 Changelog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-14 06:45:46 -04:00
Olivier PIERRE
e62113e170 Add missing head tag 
Signed-off-by: Olivier PIERRE <mail@olivierpierre.net>
 2015-07-14 06:43:49 -04:00
Weblate
b54906dbf2 Merge remote-tracking branch 'origin/master' 2015-07-14 11:27:47 +02:00
Michal Čihař
5cc23386fe Translated using Weblate (Bengali) 
Currently translated at 78.3% (2472 of 3155 strings)

[CI skip]
 2015-07-14 11:27:43 +02:00
Madhura Jayaratne
b065dede6d Merge branch 'QA_4_4' 2015-07-14 14:57:23 +05:30
Weblate
62042d2776 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-14 11:25:33 +02:00
Michal Čihař
e849cb5b73 Translated using Weblate (Bengali) 
Currently translated at 82.6% (2512 of 3038 strings)

[CI skip]
 2015-07-14 11:25:28 +02:00
Madhura Jayaratne
e4de638bbd Only the empty repeats in the last column should be skipped 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 14:55:01 +05:30
Deven Bansod
f1961969f6 Fixed a small error 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-14 14:38:21 +05:30
Madhura Jayaratne
6cd73329a6 Merge branch 'QA_4_4' 2015-07-14 14:27:02 +05:30
Madhura Jayaratne
9614518999 bug #4979 Problem when import *.ods file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 14:25:19 +05:30
Madhura Jayaratne
57eb428335 ChangeLog entry for rfe #1517 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 10:57:27 +05:30
Madhura Jayaratne
ee1b179fcb Merge branch 'rfe1517' 2015-07-14 10:47:48 +05:30
Madhura Jayaratne
ae3fba2683 rfe #1517 Support for virtual/persistent columns in MariaDB 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 10:45:04 +05:30
Madhura Jayaratne
d90ebfe96b Get the latest version of sql-parser (8d2f7b5234fc6836c292051519d087f8a82cd48b) 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-14 10:17:14 +05:30
Balázs Úr
25f5cd774b Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-13 21:07:55 +02:00
Madhura Jayaratne
8b0088163d More show create queries 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 18:42:37 +05:30
Madhura Jayaratne
2b1234cff4 Result retrieve function has also changed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 18:40:02 +05:30
Madhura Jayaratne
1ed244db25 Fix test. Numeric indexes are being used to fetch value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 18:24:06 +05:30
Madhura Jayaratne
90b5983ddf Add a method to get CREATE TABLE statement to PMA_Table class 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 18:10:12 +05:30
Madhura Jayaratne
271b47956a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 16:31:30 +05:30
Madhura Jayaratne
80259fe7ee Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 16:30:21 +05:30
Marc Delisle
7f7e45de6b Merge branch 'QA_4_4' 2015-07-13 06:54:21 -04:00
Marc Delisle
9bffc176fe ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-13 06:53:44 -04:00
Jack Smith
e88f290d44 Remove confusing second inline edit window (bug #4826) 
When a long truncated text field is being inline edited it pops up a second edit window which could be confusing. Removed it.

Signed-off-by: Jack Smith <devjacksmith@gmail.com>
 2015-07-13 06:52:07 -04:00
Madhura Jayaratne
f09a583368 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 16:18:00 +05:30
Madhura Jayaratne
d37fed64b6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 16:11:12 +05:30