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

91982 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
df0aeb5f73 Merge remote-tracking branch 'origin/master' 2014-04-28 17:52:51 +02:00
Júlio Sebastião
040efe7222 Translated using Weblate (Portuguese) 
Currently translated at 56.2% (1556 of 2768)
 2014-04-28 17:52:48 +02:00
Marc Delisle
a5377e373e Merge commit '55a12b6' 2014-04-28 11:52:08 -04:00
Marc Delisle
de0a22d51b Merge commit '719b162' 2014-04-28 11:51:18 -04:00
Marc Delisle
724e6e6f2e Merge commit '73d9b0f' 2014-04-28 11:51:08 -04:00
Weblate
55a12b6d82 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-04-28 17:49:50 +02:00
Anders Jonsson
67a30ea33f Translated using Weblate (Swedish) 
Currently translated at 99.8% (2765 of 2768)
 2014-04-28 17:49:47 +02:00
Júlio Sebastião
1d65e099c6 Translated using Weblate (Portuguese) 
Currently translated at 53.1% (1472 of 2768)
 2014-04-28 17:49:44 +02:00
Giovanni Sora
c3a6c993d3 Translated using Weblate (Interlingua) 
Currently translated at 47.6% (1320 of 2768)
 2014-04-28 17:49:42 +02:00
Claus Svalekjaer
019a4b70f0 Translated using Weblate (Danish) 
Currently translated at 99.9% (2767 of 2768)
 2014-04-28 17:49:40 +02:00
Marc Delisle
719b1624e3 bug #4381 Cannot remove the last remembered sorted column 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-28 11:48:31 -04:00
Michal Čihař
40503652d8 Revert "Prepare for testing of PHP 5.6" 
This reverts commit 1c8d05cfe7.

I misread the Travis announcement, 5.6 will be available tomorrow.
 2014-04-28 15:36:22 +02:00
Weblate
645c330d5c Merge remote-tracking branch 'origin/master' 2014-04-28 15:20:21 +02:00
Anders Jonsson
3113acef0d Translated using Weblate (Swedish) 
Currently translated at 99.8% (2765 of 2768)
 2014-04-28 15:20:18 +02:00
Michal Čihař
1c8d05cfe7 Prepare for testing of PHP 5.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-28 15:20:14 +02:00
Weblate
03e380d4e8 Merge remote-tracking branch 'origin/master' 2014-04-28 14:18:48 +02:00
Anders Jonsson
da788e21e9 Translated using Weblate (Swedish) 
Currently translated at 99.7% (2760 of 2768)
 2014-04-28 14:18:45 +02:00
Panagiotis Papazoglou
be78af6966 Translated using Weblate (Greek) 
Currently translated at 100.0% (2768 of 2768)
 2014-04-28 14:18:42 +02:00
Claus Svalekjaer
113bee18b7 Translated using Weblate (Danish) 
Currently translated at 99.9% (2767 of 2768)
 2014-04-28 14:18:40 +02:00
Michal Čihař
8fa5709b38 Try adding another random sleep here... 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-28 14:18:37 +02:00
Panagiotis Papazoglou
73d9b0fe45 Translated using Weblate (Greek) 
Currently translated at 100.0% (2768 of 2768)
 2014-04-28 13:56:15 +02:00
Weblate
24a21d11a6 Merge remote-tracking branch 'origin/master' 2014-04-28 13:27:30 +02:00
Júlio Sebastião
efcb6c0ea4 Translated using Weblate (Portuguese) 
Currently translated at 55.4% (1534 of 2768)
 2014-04-28 13:27:28 +02:00
Giovanni Sora
b21bb57383 Translated using Weblate (Interlingua) 
Currently translated at 47.6% (1320 of 2768)
 2014-04-28 13:27:24 +02:00
Michal Čihař
f3e051dacc Merge branch 'QA_4_2' 2014-04-28 13:24:39 +02:00
Michal Čihař
4cfc7ee70d Merge remote-tracking branch 'origin/QA_4_1' into QA_4_2 2014-04-28 13:24:21 +02:00
Júlio Sebastião
ba60e5a723 Translated using Weblate (Portuguese) 
Currently translated at 61.3% (1687 of 2750)
 2014-04-28 13:22:27 +02:00
Rui Silva
4e740bf283 Translated using Weblate (Portuguese) 
Currently translated at 53.0% (1468 of 2768)
 2014-04-28 12:11:03 +02:00
Diogo Santos
35a8e22785 Translated using Weblate (Portuguese) 
Currently translated at 52.9% (1467 of 2768)
 2014-04-28 12:08:38 +02:00
Júlio Sebastião
c8fbe8a199 Translated using Weblate (Portuguese) 
Currently translated at 52.9% (1467 of 2768)
 2014-04-28 12:08:23 +02:00
Júlio Sebastião
c1f25b0535 Translated using Weblate (Portuguese) 
Currently translated at 52.3% (1449 of 2768)

uma string é umalista de carateres, e não uma linha de carateres
 2014-04-28 11:54:38 +02:00
Júlio Sebastião
d9df770aca Translated using Weblate (Portuguese) 
Currently translated at 52.3% (1448 of 2768)
 2014-04-28 11:54:13 +02:00
Diogo Santos
1a11d5155e Translated using Weblate (Portuguese) 
Currently translated at 52.2% (1446 of 2768)
 2014-04-28 11:51:56 +02:00
Marc Delisle
14d5f77ed6 Merge commit 'f880e55' 2014-04-27 13:30:19 -04:00
Marc Delisle
ab17c23e21 Merge commit '1375652' 2014-04-27 13:30:06 -04:00
Marc Delisle
58f9d3cbfa Merge commit '6fb15d8' 2014-04-27 13:29:50 -04:00
Atul Pratap Singh
4b8a910fbc Merge branch 'QA_4_2' 2014-04-28 02:07:17 +05:30
Atul Pratap Singh
ad7c5bbbac Add check when there is no #pma_navigation_tree_content 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-04-28 02:03:43 +05:30
Atul Pratap Singh
cc7957fac3 Add check when there is no #pma_navigation_tree_content 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-04-28 01:56:00 +05:30
Marc Delisle
f880e5591c Move ChangeLog entry and clarify it 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 13:28:09 -04:00
Marc Delisle
1375652746 Merge pull request #1159 from Tithugues/b4380_42 
phpmyadmin refuses to show tables with enums containing special data
 2014-04-27 13:26:12 -04:00
Hugues Peccatte
6fb15d8a41 Use PMA_String class to substr multi-bytes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-04-27 17:30:58 +02:00
Hugues Peccatte
520872da74 Fix 'phpmyadmin refuses to show tables with enums containing special data' bug #4380 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>

Conflicts:
	ChangeLog
 2014-04-27 17:30:19 +02:00
Marc Delisle
9e5602eb37 4.3.0-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:49:45 -04:00
Marc Delisle
4048f525f2 Merge commit 'fc2cd8f' 2014-04-27 08:47:27 -04:00
Marc Delisle
fc2cd8f41b 4.2.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:46:30 -04:00
Marc Delisle
4770f7e496 Merge commit '3d6362a' into QA_4_2 2014-04-27 08:44:28 -04:00
Marc Delisle
3d6362a294 4.2.0-rc1 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:43:38 -04:00
Edward Cheng
b77d8fa6d4 Fix scrolling 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-27 08:32:38 -04:00
Marc Delisle
4299961046 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-26 18:01:41 -04:00