Marc Delisle
582be8cdbe
Merge pull request #1585 from harish095/Bug-Fix-#4792
...
Bug Fix #4792
2015-03-18 14:14:57 -04:00
Marc Delisle
56d1070da9
Merge pull request #1584 from harish095/Designer-bug-fix
...
Minor UI bug fix in designer
2015-03-18 08:36:02 -04:00
Weblate
392ee68b83
Merge remote-tracking branch 'origin/master'
2015-03-18 08:44:13 +01:00
Xavier Navarro
7e660013d7
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (3036 of 3036 strings)
[CI skip]
2015-03-18 08:44:10 +01:00
Madhura Jayaratne
6f4f4dbd6c
Merge branch 'QA_4_4'
...
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-18 13:13:35 +05:30
Madhura Jayaratne
b678749e7c
Add a class for styling
...
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-18 13:09:42 +05:30
Madhura Jayaratne
15c19a3b31
Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4
2015-03-18 13:06:19 +05:30
Madhura Jayaratne
592a6ef5b8
Remove dead code
...
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-18 13:05:52 +05:30
Madhura Jayaratne
21302c235e
Add a class for bitT column
...
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-18 13:04:56 +05:30
Madhura Jayaratne
c27d16f95f
Starts with a odd row
...
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-18 12:05:26 +05:30
Madhura Jayaratne
24db9d5cde
Set row span when there are more privileges
...
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-18 12:03:43 +05:30
Xavier Navarro
42afa53f32
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (3032 of 3032 strings)
[CI skip]
2015-03-18 06:47:33 +01:00
Weblate
9a10222b42
Merge remote-tracking branch 'origin/master'
2015-03-17 21:03:40 +01:00
Xavier Navarro
3a9304883f
Translated using Weblate (Catalan)
...
Currently translated at 99.0% (3008 of 3036 strings)
[CI skip]
2015-03-17 21:03:37 +01:00
Marc Delisle
b84c08f4d4
Merge branch 'QA_4_4'
2015-03-17 16:02:54 -04:00
Weblate
c8ec2a2218
Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4
2015-03-17 21:02:28 +01:00
Xavier Navarro
d5bcc22ebe
Translated using Weblate (Catalan)
...
Currently translated at 99.0% (3004 of 3032 strings)
[CI skip]
2015-03-17 21:02:26 +01: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
harish095
69063ae4a5
Bug fix #4792
...
Signed-off-by: harish095 <kandalaharish95@gmail.com>
2015-03-17 08:05:47 +05:30
harish095
c9aa31c8d7
Minor UI bug fix in designer
...
Signed-off-by: harish095 <kandalaharish95@gmail.com>
2015-03-17 07:54:16 +05:30
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
