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

102936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
b239793429 Clarify function name 
Clarify variable name

Remove duplicate test

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-07 11:02:34 -04:00
Michal Čihař
e820e9b0c5 Translated using Weblate (Polish) 
Currently translated at 78.2% (2517 of 3217 strings)

[CI skip]
 2015-10-07 15:19:22 +02:00
Weblate
f4694fb78c Merge remote-tracking branch 'origin/master' 2015-10-07 14:33:53 +02:00
Przemo
95cb0dacf9 Translated using Weblate (Polish) 
Currently translated at 78.2% (2517 of 3217 strings)

[CI skip]
 2015-10-07 14:33:47 +02:00
disorderman
9b2b50dd3c Translated using Weblate (Chinese (China)) 
Currently translated at 84.1% (2707 of 3217 strings)

[CI skip]
 2015-10-07 14:33:42 +02:00
Michal Čihař
a376557d9a Merge remote-tracking branch 'origin/QA_4_5' 2015-10-07 14:33:27 +02:00
Michal Čihař
bb35147500 Merge commit 'feeb54ce8cdb2d4b73b6b3739d6ab8c9116c20f5' 2015-10-07 14:33:18 +02:00
Weblate
9e4d59a880 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-07 14:32:17 +02:00
Przemo
4a24c55ad7 Translated using Weblate (Polish) 
Currently translated at 78.9% (2535 of 3209 strings)

[CI skip]
 2015-10-07 14:32:15 +02:00
disorderman
de72c2312c Translated using Weblate (Chinese (China)) 
Currently translated at 84.9% (2726 of 3209 strings)

[CI skip]
 2015-10-07 14:32:13 +02:00
Michal Čihař
feeb54ce8c Fix file permissions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-10-07 14:32:04 +02:00
Weblate
83ba191a26 Merge remote-tracking branch 'origin/master' 2015-10-06 22:44:00 +02:00
disorderman
96684c0290 Translated using Weblate (Chinese (China)) 
Currently translated at 83.6% (2692 of 3217 strings)

[CI skip]
 2015-10-06 22:43:54 +02:00
Marc Delisle
621825fadd Merge branch 'QA_4_5' 2015-10-06 16:43:39 -04:00
Marc Delisle
8b615feb1a Merge commit 'ca85cd1' 2015-10-06 16:43:33 -04:00
Marc Delisle
8668a92716 Merge commit 'efe0416' 2015-10-06 16:43:19 -04:00
Marc Delisle
ee958f08cb ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 16:42:47 -04:00
Weblate
ca85cd134a Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-06 22:39:49 +02:00
disorderman
1fb6395e61 Translated using Weblate (Chinese (China)) 
Currently translated at 84.4% (2711 of 3209 strings)

[CI skip]
 2015-10-06 22:39:46 +02:00
Marc Delisle
efe0416565 Merge pull request #11545 from udan11/QA_4_5 
Fix #11542. Import parser broken in 4.5.x.x.
 2015-10-06 16:39:38 -04:00
Dan Ungureanu
6f802746d6 Fix #11542. Import parser broken in 4.5.x.x. 
Cherry-picked udan11/sql-parser@402890bc7b.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-06 23:20:54 +03:00
Marc Delisle
911217e6b4 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 07:33:41 -04:00
Marc Delisle
64758a0c82 Merge commit 'f830b07' 2015-10-06 07:31:38 -04:00
Marc Delisle
087a4035b5 Merge commit '9ee5e0d' 2015-10-06 07:31:28 -04:00
Marc Delisle
065d6e33ad Merge commit 'e4d422c' 2015-10-06 07:31:10 -04:00
Marc Delisle
e8a5bf23d5 Merge commit '6914dff' 2015-10-06 07:30:59 -04:00
Marc Delisle
f830b07319 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-06 07:30:27 -04:00
Marc Delisle
8e81b91372 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-06 07:28:47 -04:00
Weblate
9ee5e0d871 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-06 13:27:52 +02:00
disorderman
a5c9d9ef7f Translated using Weblate (Chinese (China)) 
Currently translated at 84.4% (2711 of 3209 strings)

[CI skip]
 2015-10-06 13:27:49 +02:00
Florian Rey
e4d422cb43 Minimum supported PHP version is now 5.5. 
Signed-off-by: Florian Rey <florian.rey@elao.com>
 2015-10-06 07:26:54 -04:00
Weblate
e369c7d8dc Merge remote-tracking branch 'origin/master' 2015-10-06 12:04:22 +02:00
disorderman
ed5c9975f8 Translated using Weblate (Chinese (China)) 
Currently translated at 83.6% (2692 of 3217 strings)

[CI skip]
 2015-10-06 12:04:16 +02:00
Madhura Jayaratne
2f5d952244 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-06 21:03:20 +11:00
Madhura Jayaratne
dab71427cd Tracking does not make sense for information_schema 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 20:58:32 +11:00
Weblate
0a7b008743 Merge remote-tracking branch 'origin/master' 2015-10-06 11:40:33 +02:00
disorderman
afb9900402 Translated using Weblate (Chinese (China)) 
Currently translated at 83.4% (2685 of 3217 strings)

[CI skip]
 2015-10-06 11:40:26 +02:00
Madhura Jayaratne
1411ffaaef Merge branch 'QA_4_5' 2015-10-06 20:39:59 +11:00
Weblate
6914dffcdb Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-06 11:35:01 +02:00
disorderman
9b915e1624 Translated using Weblate (Chinese (China)) 
Currently translated at 84.2% (2703 of 3209 strings)

[CI skip]
 2015-10-06 11:34:59 +02:00
Madhura Jayaratne
558e6be76e ChangeLog entry for issue #11544 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 20:34:42 +11:00
Madhura Jayaratne
ea68442ca3 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 2015-10-06 20:33:45 +11:00
Madhura Jayaratne
a56aaada17 Fix #11544 Notices about undefined indexes on structure pages of information_schema tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-06 20:33:19 +11:00
Terry Weng
8de61f4526 Translated using Weblate (Chinese (China)) 
Currently translated at 82.5% (2656 of 3217 strings)

[CI skip]
 2015-10-06 10:49:25 +02:00
Terry Weng
13aff1ce97 Translated using Weblate (Chinese (China)) 
Currently translated at 83.3% (2675 of 3209 strings)

[CI skip]
 2015-10-06 10:49:19 +02:00
disorderman
2506058df9 Translated using Weblate (Chinese (China)) 
Currently translated at 82.2% (2647 of 3217 strings)

[CI skip]
 2015-10-06 06:51:35 +02:00
disorderman
ef57682b92 Translated using Weblate (Chinese (China)) 
Currently translated at 83.0% (2666 of 3209 strings)

[CI skip]
 2015-10-06 06:51:29 +02:00
Marc Delisle
be17cf15cb Merge branch 'QA_4_5' 2015-10-05 18:19:34 -04:00
Marc Delisle
ed8ba7b3d7 Fixes #11541 Missing arguments for PMA_Table::generateAlter() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-05 18:18:55 -04:00
Atul Pratap Singh
ad7d40c59e Merge branch 'QA_4_5' 2015-10-06 02:35:26 +05:30