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

96776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robin van der Vliet
eea4ec02f1 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 03:11:31 +01:00
A. Voogt
180748d4f6 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-24 03:11:28 +01:00
Robin van der Vliet
60649e9f98 Translated using Weblate (Punjabi) 
Currently translated at 0.1% (5 of 2988 strings)

[CI skip]
 2014-12-24 02:53:18 +01:00
Robin van der Vliet
3c70c619d3 Translated using Weblate (Kannada) 
Currently translated at 0.0% (2 of 2988 strings)

[CI skip]
 2014-12-24 02:12:30 +01:00
Robin van der Vliet
fc54a1fa34 Translated using Weblate (West Flemish) 
Currently translated at 3.0% (90 of 2988 strings)

[CI skip]
 2014-12-24 01:37:08 +01:00
Robin van der Vliet
09b25d51f1 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2988 of 2988 strings)

[CI skip]
 2014-12-23 23:43:57 +01:00
Robin van der Vliet
c90fb7168f Translated using Weblate (West Flemish) 
Currently translated at 0.1% (4 of 2988 strings)

[CI skip]
 2014-12-23 23:34:34 +01:00
Robin van der Vliet
6bf8dc023c Translated using Weblate (Frisian) 
Currently translated at 11.8% (354 of 2988 strings)

[CI skip]
 2014-12-23 22:56:25 +01:00
Robin van der Vliet
130e33966d Translated using Weblate (Frisian) 
Currently translated at 9.4% (281 of 2988 strings)

[CI skip]
 2014-12-23 21:27:20 +01:00
Marc Delisle
371780a0a1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 11:32:10 -05:00
Marc Delisle
e3d11adb74 Fix comments 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:59:29 -05:00
Marc Delisle
f6bafdc45e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:44:24 -05:00
Madhura Jayaratne
f6b7f98322 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 10:43:54 -05:00
Atul Pratap Singh
3be2f44e3a Merge branch 'QA_4_3' 2014-12-23 19:14:43 +05:30
Atul Pratap Singh
fdac93897a Merge commit 'a6c53149be8d357283436ad409a217c7c91a3ce4' 2014-12-23 19:14:29 +05:30
Atul Pratap Singh
b9cb88c5fc Merge pull request #1436 from smita786/QA_4_3 
fix bug #4665
 2014-12-23 18:55:27 +05:30
Smita Kumari
af33e8a144 fix bug #4665 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-12-23 18:38:46 +05:30
Marc Delisle
a6c53149be ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-23 08:03:09 -05:00
Marc Delisle
ac6657c1fd Merge pull request #1435 from madhuracj/Bug4663 
#4663 Export missing back ticks for order table name
 2014-12-23 08:02:04 -05:00
Atul Pratap Singh
6f43628f06 Merge branch 'QA_4_3' 2014-12-23 17:42:11 +05:30
Atul Pratap Singh
a98ec2c162 Fix js reports; TypeError: /([a-zA-Z]+):/.exec(...) is null 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-12-23 17:22:47 +05:30
Madhura Jayaratne
62b04a7b53 Merge branch 'QA_4_3' 2014-12-23 16:52:24 +05:30
Madhura Jayaratne
c445794bde bug #4666 Undefined indexes in table stucture print view of a view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 16:50:47 +05:30
Madhura Jayaratne
0bc4e2e604 Use spaces to improve readability 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 15:51:00 +05:30
Madhura Jayaratne
6e688982cc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-12-23 15:15:50 +05:30
Madhura Jayaratne
974f7afe71 Merge branch 'QA_4_3' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 15:15:18 +05:30
Madhura Jayaratne
7cf678f79d bug #4664 select min() displays 1 row, but reports the table amount of rows returned 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 15:03:23 +05:30
Atul Pratap Singh
21b63f9af4 Fix js reports: JSONparse Syntax Error: Unexpected token '<' 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-12-23 14:16:56 +05:30
Madhura Jayaratne
0430ac6337 #4663 Export missing back ticks for order table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-23 12:53:12 +05:30
Marc Delisle
26ecf0e954 Merge commit 'f735d23' 2014-12-22 11:54:21 -05:00
Marc Delisle
11f22027dd Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-22 11:54:04 -05:00
Marc Delisle
f735d2360b Merge pull request #1434 from Tithugues/b4648_qa43_browseTab 
Remove borders in table browse tab (linked to #4648).
 2014-12-22 11:51:49 -05:00
Hugues Peccatte
66c7c04582 Remove borders in table browse tab (linked to #4648). 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-12-22 14:16:40 +01:00
Marc Delisle
44060b77c9 Merge branch 'QA_4_3' 2014-12-22 07:33:02 -05:00
Madhura Jayaratne
481e89ac94 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-22 07:32:05 -05:00
Madhura Jayaratne
3621900b96 Merge branch 'QA_4_3' 2014-12-22 17:10:35 +05:30
Madhura Jayaratne
fbe587ce73 bug #4661 Drag and drop file import always fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 17:09:10 +05:30
Madhura Jayaratne
05a75cdae9 Fix comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 16:02:40 +05:30
Madhura Jayaratne
f6165c649f Update tcpdf to version 6.2.3 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 15:56:40 +05:30
Madhura Jayaratne
40dc352d3b Merge branch 'QA_4_3' 2014-12-22 15:03:18 +05:30
Madhura Jayaratne
bac38f3ef6 bug #4653 Always connection error was shown, on /setup at tab "configuration storage" 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-12-22 14:58:58 +05:30
Michal Čihař
d2fe838f72 Update po files 
[CI skip]

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-12-21 13:06:38 +01:00
Michal Čihař
79ec938ec4 Merge branch 'QA_4_3' 2014-12-21 13:06:04 +01:00
Michal Čihař
fb731ad37b Merge remote-tracking branch 'weblate-4.3/QA_4_3' into QA_4_3 
Conflicts:
	po/nl.po
 2014-12-21 13:05:45 +01:00
Marc Delisle
918d8d3253 Merge commit '3960df3' 2014-12-21 06:33:05 -05:00
Marc Delisle
7f7b465599 4.3.3 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:32:26 -05:00
Marc Delisle
3960df34bc 4.3.4-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:31:09 -05:00
Marc Delisle
3767f0ec92 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-21 06:13:23 -05:00
Marc Delisle
796f616e88 Merge commit '409049c' 2014-12-21 06:12:56 -05:00
A. Voogt
8b695200e7 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2978 of 2978 strings)

[CI skip]
 2014-12-21 12:12:31 +01:00