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

92494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
c8294ac3d4 Merge commit 'dac3175' 2014-05-14 08:19:59 -04:00
Burak Yavuz
f334b61242 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-14 13:58:27 +02:00
Marc Delisle
558ae8dca5 Update po files 2014-05-14 07:15:14 -04:00
Marc Delisle
0adcec8663 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-14 07:14:41 -04:00
Weblate
dfd7d3567d Merge remote-tracking branch 'origin/master' 2014-05-14 13:08:54 +02:00
Dieter Adriaenssens
3ca66bdc58 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-14 13:08:50 +02:00
Marc Delisle
d9a1da1237 Merge pull request #1173 from ashutoshdhundhara/rfe_1448 
RFE: #1448 Allow clicking an approximate row count to get a correct one.
 2014-05-14 07:08:45 -04:00
Michal Čihař
0d1e903386 Merge pull request #1179 from EagleErwin/patch-1 
Update config.rst
 2014-05-13 20:54:43 +02:00
Marc Delisle
6f738d5834 Merge commit '9f9d85c' 2014-05-13 12:25:32 -04:00
Marc Delisle
922cbac956 Merge commit 'f23ae33' 2014-05-13 12:25:21 -04:00
Marc Delisle
9f9d85c382 4.2.1 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-13 12:24:51 -04:00
Erwin Bronkhorst
be6cf1edcf Update config.rst 
Fixed typo in description of config:option ProxyUrl
 2014-05-13 17:42:24 +02:00
Michal Čihař
c21ae63339 Merge pull request #1178 from EagleErwin/patch-1 
Update nl.po
 2014-05-13 16:05:41 +02:00
Erwin Bronkhorst
51d7088894 Update nl.po 
Fixed spelling error in Dutch translation file.
 2014-05-13 15:54:14 +02:00
Weblate
eecb8f9cc9 Merge remote-tracking branch 'origin/master' 2014-05-13 15:27:48 +02:00
Júlio Sebastião
9511e84043 Translated using Weblate (Portuguese) 
Currently translated at 63.2% (1751 of 2768)
 2014-05-13 15:27:45 +02:00
Marcin Kozioł
1af03d413e Translated using Weblate (Polish) 
Currently translated at 94.7% (2624 of 2768)
 2014-05-13 15:27:43 +02:00
Michal Čihař
d0aeb9e342 Use fetchValue directly as we do not need the query anyway 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-13 15:27:26 +02:00
Marcin Kozioł
f23ae33314 Translated using Weblate (Polish) 
Currently translated at 84.6% (2342 of 2768)
 2014-05-12 22:33:42 +02:00
Marcin Kozioł
c7174e7ed3 Translated using Weblate (Polish) 
Currently translated at 84.6% (2342 of 2768)
 2014-05-12 22:30:30 +02:00
Marc Delisle
4baa72d4e5 4.2.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 08:04:19 -04:00
Marc Delisle
3ff01604b8 Merge commit '6be855a' 2014-05-12 08:03:49 -04:00
Marc Delisle
6be855a6c6 4.2.2-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 08:03:14 -04:00
Marc Delisle
fda6dba26b Merge commit '7248341' 2014-05-12 07:54:57 -04:00
Marc Delisle
3a53d2c926 Merge commit '69369fe' 2014-05-12 07:54:37 -04:00
Marc Delisle
99ba9004b8 Merge commit '0f13675' 2014-05-12 07:54:27 -04:00
Marc Delisle
c3723d975c Merge commit '9154902' 2014-05-12 07:53:53 -04:00
Marc Delisle
72483414d1 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-12 07:52:31 -04:00
Marc Delisle
69369fe896 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-12 07:51:51 -04:00
Weblate
0f13675558 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-12 13:50:13 +02:00
Edie Johnny
cc17bdea8d Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-12 13:50:10 +02:00
Yungu Kim
c7c7ba3ba5 Translated using Weblate (Korean) 
Currently translated at 79.2% (2194 of 2768)
 2014-05-12 13:50:08 +02:00
Marco Pozzato
b11e0324c0 Translated using Weblate (Italian) 
Currently translated at 86.4% (2393 of 2768)
 2014-05-12 13:50:06 +02:00
Marc Delisle
44efb8c8f8 Merge pull request #1172 from D-storm/bug-4390 
Bug #4390: Data type changing by itself
 2014-05-12 07:49:57 -04:00
Michal Čihař
3f5f22f258 Merge remote-tracking branch 'origin/QA_4_2' 2014-05-12 11:30:31 +02:00
Michal Čihař
c06a1b99e8 Coding style improvements (issue #1174) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-12 08:32:19 +02:00
Weblate
b7c231790d Merge remote-tracking branch 'origin/master' 2014-05-12 08:31:04 +02:00
Marco Pozzato
52a7e216f1 Translated using Weblate (Italian) 
Currently translated at 86.4% (2393 of 2768)
 2014-05-12 08:31:01 +02:00
Michal Čihař
b6ad6c4860 Merge pull request #1174 from mebjas/bug-fix-confirm-navigation 
Bug fix for: #4393, #4399, #4400
 2014-05-12 08:30:52 +02:00
Weblate
bc4b42a470 Merge remote-tracking branch 'origin/master' 2014-05-11 06:24:13 +02:00
Yungu Kim
fd1a81cc29 Translated using Weblate (Korean) 
Currently translated at 79.2% (2194 of 2768)
 2014-05-11 06:24:10 +02:00
Marc Delisle
d6fc37e6a0 Clarify the parameter's origin 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-11 06:23:58 +02:00
minhaz
c70c1cf880 Bug fix for: #4393, #4399, #4400 
#Reason: This is because, the once the table has been created, the js triggers a redirection to table structure which is like clicking on the link.
Signed-off-by: A V Minhaz <minhazav@gmail.com>
 2014-05-11 01:18:06 +05:30
Weblate
2b441ff157 Merge remote-tracking branch 'origin/master' 2014-05-10 20:45:33 +02:00
Edie Johnny
32cda86b07 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-10 20:45:30 +02:00
Michal Čihař
ca90d760dd Simplify coveralls settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 20:45:22 +02:00
Edie Johnny
2ff202a733 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-10 20:24:51 +02:00
Michal Čihař
8f45363f66 Merge branch 'QA_4_2' 2014-05-10 17:35:59 +02:00
Michal Čihař
b177557c11 Use preg_quote instead of home made replacement to quote string for preg 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:35:49 +02:00
Michal Čihař
8496dfde6c Correctly pass empty parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-10 17:23:07 +02:00