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

101017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Madhura Jayaratne
91397b24ec Add ChangeLog entry for MySQL virtual columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 16:07:59 +05:30
Marc Delisle
da47bab407 Translated using Weblate (French) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-13 12:36:34 +02:00
Madhura Jayaratne
cb8a75b719 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 15:59:25 +05:30
Atul Pratap Singh
904a4ce9f3 html5 history improvements: check if popstate fired on load, fix token mismatch, make use of selflink 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-13 15:40:22 +05:30
Madhura Jayaratne
a3285a7cd3 Support MySQL 5.7.5 virtual columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 15:14:15 +05:30
Weblate
4f361e41fa Merge remote-tracking branch 'origin/master' 2015-07-13 10:12:02 +02:00
Smart Kid
d242b60b76 Translated using Weblate (Serbian) 
Currently translated at 23.8% (754 of 3155 strings)

[CI skip]
 2015-07-13 10:11:58 +02:00
Helder Santana
4ec1de74e6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 95.6% (3019 of 3155 strings)

[CI skip]
 2015-07-13 10:11:54 +02:00
Giovanni Sora
a05d278527 Translated using Weblate (Interlingua) 
Currently translated at 70.2% (2215 of 3155 strings)

[CI skip]
 2015-07-13 10:11:50 +02:00
Atul Pratap Singh
8e3dc532e5 Merge branch 'QA_4_4' 2015-07-13 13:40:57 +05:30
Atul Pratap Singh
4fa27d43a6 Merge commit 'd141619' 
Conflicts:
	libraries/server_status_processes.lib.php

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-13 13:40:20 +05:30
Atul Pratap Singh
fc70a568a5 Merge commit 'b1aa8f9' 2015-07-13 13:38:05 +05:30
Weblate
6edbf61c22 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-13 10:03:58 +02:00
Smart Kid
5f037b89e5 Translated using Weblate (Serbian) 
Currently translated at 25.5% (775 of 3038 strings)

[CI skip]
 2015-07-13 10:03:53 +02:00
ddrmoscow
2c6e64c49b Translated using Weblate (Russian) 
Currently translated at 97.7% (2971 of 3038 strings)

[CI skip]
 2015-07-13 10:03:49 +02:00
Helder Santana
bcffca8135 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3035 of 3038 strings)

[CI skip]
 2015-07-13 10:03:44 +02:00
Atul Pratap Singh
d141619c89 Merge pull request #1783 from devenbansod/1606Correction 
Fixed a small error
 2015-07-13 13:33:01 +05:30
Domen
8634d9d086 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-12 20:53:42 +02:00