gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,534 Commits 12 Branches 481 Tags 2.4 GiB
b84c08f4d4
Commit Graph

98534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
b84c08f4d4 Merge branch 'QA_4_4' 2015-03-17 16:02:54 -04:00
Marc Delisle
a278b809a3 Merge branch 'QA_4_3' into QA_4_4 2015-03-17 16:02:03 -04:00
Marc Delisle
4b8f3c9e61 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-17 16:01:37 -04:00
Marc Delisle
3c49594c56 Merge pull request #1588 from andreaval/QA_4_3 
Bug #4798 Missing column when exporting in sql (2)
 2015-03-17 16:00:06 -04:00
Andrea Vallorani
364b26b0dd Bug #4798 Missing column when exporting in sql (2) 
Export failure when the comments contains reserved keywords (KEY, CONSTRAINT)
To resolve, I removed the SQL comment from the current line before checking the presence of reserved keywords.

Signed-off-by: Andrea Vallorani <andrea.vallorani@gmail.com>
 2015-03-17 18:15:13 +01:00
Weblate
23953011c3 Merge remote-tracking branch 'origin/master' 2015-03-17 13:48:59 +01:00
dingo thirteen
3afbb9f06e Translated using Weblate (Dutch) 
Currently translated at 100.0% (3036 of 3036 strings)

[CI skip]
 2015-03-17 13:48:56 +01:00
Jonas
9cac1064f2 Translated using Weblate (Danish) 
Currently translated at 99.6% (3026 of 3036 strings)

[CI skip]
 2015-03-17 13:48:55 +01:00
Xavier Navarro
8ec9527eaa Translated using Weblate (Catalan) 
Currently translated at 97.9% (2973 of 3036 strings)

[CI skip]
 2015-03-17 13:48:53 +01:00
Marc Delisle
0cdceae0c6 Merge commit '18e8b5d' 2015-03-17 08:48:37 -04:00
Marc Delisle
22e94622f2 Merge commit '08adc35' 2015-03-17 08:48:27 -04:00
Marc Delisle
d532852c5e Merge commit 'd7e68f6' 2015-03-17 08:48:17 -04:00
Marc Delisle
7801dee5dc Merge commit '6a3be99' 2015-03-17 08:48:06 -04:00
Marc Delisle
8209948ba7 Merge commit 'e12582a' 2015-03-17 08:47:31 -04:00
Marc Delisle
32a6570844 Merge commit '3d31796' 2015-03-17 08:46:08 -04:00
Weblate
18e8b5d5f0 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-17 13:45:52 +01:00
Jonas
0ec97263f0 Translated using Weblate (Danish) 
Currently translated at 99.7% (3024 of 3032 strings)

[CI skip]
 2015-03-17 13:45:48 +01:00
Xavier Navarro
9fcfcd8d19 Translated using Weblate (Catalan) 
Currently translated at 97.9% (2969 of 3032 strings)

[CI skip]
 2015-03-17 13:45:47 +01:00
Marc Delisle
08adc35651 Merge branch 'QA_4_3' into QA_4_4 2015-03-17 08:44:17 -04:00
Marc Delisle
da656d7f5d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-17 08:43:48 -04:00
Marc Delisle
6a3be994aa Merge pull request #1580 from nisargjhaveri/issue_4807 
Fix bug#4807
 2015-03-17 08:41:54 -04:00
dingo thirteen
d7e68f6fac Translated using Weblate (Dutch) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-16 17:37:07 +01:00
Nisarg Jhaveri
e12582acdb Fix bug#4807 
Don't add `.` if table name is not set when trying to get column in
sort expression.

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-03-16 19:04:42 +05:30
Weblate
9ebd1260d0 Merge remote-tracking branch 'origin/master' 2015-03-16 13:04:08 +01:00
Giovanni Sora
0de31a770b Translated using Weblate (Interlingua) 
Currently translated at 68.8% (2091 of 3036 strings)

[CI skip]
 2015-03-16 13:04:05 +01:00
Xavier Navarro
1a60ce22cc Translated using Weblate (Catalan) 
Currently translated at 95.8% (2911 of 3036 strings)

[CI skip]
 2015-03-16 13:04:03 +01:00
Marc Delisle
4b1f7490d8 Merge commit '31472e0' 2015-03-16 08:03:47 -04:00
Marc Delisle
fd4e8955c7 Merge commit '12e8654' 2015-03-16 08:03:29 -04:00
Marc Delisle
aa7afe519f Merge commit 'ceb9467' 2015-03-16 08:03:18 -04:00
Marc Delisle
b2e3277d81 Merge commit 'd5ae95d' 2015-03-16 08:03:04 -04:00
Marc Delisle
4a7d799a99 Merge commit '9f1f0e6' 2015-03-16 08:02:48 -04:00
Marc Delisle
d313e4a973 Merge commit '0b8e328' 2015-03-16 08:02:37 -04:00
Marc Delisle
9a400be32d Merge commit '18bccea' 2015-03-16 08:02:03 -04:00
Weblate
3d31796d30 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-16 13:01:19 +01:00
Xavier Navarro
14ef13024e Translated using Weblate (Catalan) 
Currently translated at 95.9% (2908 of 3032 strings)

[CI skip]
 2015-03-16 13:01:16 +01:00
Marc Delisle
31472e0cf0 Merge branch 'QA_4_3' into QA_4_4 2015-03-16 07:59:52 -04:00
Marc Delisle
12e8654df0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-16 07:59:26 -04:00
Marc Delisle
d5ae95d7ff Merge pull request #1578 from devenbansod/QA_4_3 
Fixes bug #4803
 2015-03-16 07:58:21 -04:00
Weblate
ceb94674f6 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-16 04:05:46 +01:00
Giovanni Sora
31cbe20756 Translated using Weblate (Interlingua) 
Currently translated at 68.8% (2087 of 3032 strings)

[CI skip]
 2015-03-16 04:05:42 +01:00
Madhura Jayaratne
9f1f0e6bc1 Per server iv 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-16 08:34:40 +05:30
Hauke Henningsen
cf15d76413 Translated using Weblate (German) 
Currently translated at 100.0% (3036 of 3036 strings)

[CI skip]
 2015-03-16 02:12:07 +01:00
Hauke Henningsen
0b8e328f9d Translated using Weblate (German) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-16 02:11:42 +01:00
Deven Bansod
18bccea291 Fixes bug #4803 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-03-16 05:09:26 +05:30
Marc Delisle
728599e890 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-15 06:55:18 -04:00
Marc Delisle
c326cc9542 Merge pull request #1572 from tapanhalani/master 
Fix Feature#1609- Lock page navigation when entering data.
 2015-03-15 06:52:28 -04:00
Atul Pratap Singh
40a391ecec Merge branch 'QA_4_4' 2015-03-15 15:36:25 +05:30
Raimund Meyer
98231225e2 Fix bug#4799 Position of sticky columns wrong when screen width too small 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-15 15:25:12 +05:30
Atul Pratap Singh
dc29142610 Related to bug#4725 and rfe#1426: maintain navigation state with just required info stored in sessionstorage 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-03-15 14:27:47 +05:30
Tapan Halani
0ac7e8f0f6 Fix feature#1609: Lock page navigation when entering data. 
Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
 2015-03-14 22:07:44 +05:30