Commit Graph

99118 Commits

Author SHA1 Message Date
P.Alex
d5ce381e94 Ignore ./vendor directory of composer
Signed-off-by: P.Alex <web.is.art@p-alex.com>
2015-04-13 11:33:36 +02:00
Madhura Jayaratne
abe7f3bdcd Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-13 14:36:18 +05:30
Madhura Jayaratne
d56b35ec08 bug #4850 Relation view on 1920
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-13 14:34:44 +05:30
Kristjan Räts
fff6dc885f Translated using Weblate (Estonian)
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
2015-04-13 10:20:27 +02:00
Madhura Jayaratne
ffac71c312 Consistently provide editing for procedures, functions, events and triggers
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-13 12:18:56 +05:30
Madhura Jayaratne
0be5115f01 Merge branch 'QA_4_4' 2015-04-13 12:09:37 +05:30
Weblate
ecb7767a9b Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-13 08:38:19 +02:00
Burak Yavuz
1561679246 Translated using Weblate (Turkish)
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
2015-04-13 08:38:16 +02:00
Stefano Martinelli
5246629cc8 Translated using Weblate (Italian)
Currently translated at 98.6% (2995 of 3035 strings)

[CI skip]
2015-04-13 08:38:13 +02:00
dingo thirteen
7e3b73bb08 Translated using Weblate (Dutch)
Currently translated at 100.0% (3035 of 3035 strings)

[CI skip]
2015-04-13 08:38:11 +02:00
Ondra Šimeček
ef8ed6d590 Translated using Weblate (Czech)
Currently translated at 96.7% (2936 of 3035 strings)

[CI skip]
2015-04-13 08:38:09 +02:00
Valter Georgiev
ef83484b79 Translated using Weblate (Bulgarian)
Currently translated at 62.4% (1894 of 3035 strings)

[CI skip]
2015-04-13 08:38:07 +02:00
Madhura Jayaratne
677c8f7c62 bug #4849 Functions accessed from navigation do not load on ajax dialog
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-13 12:07:44 +05:30
Madhura Jayaratne
66304349ad rfe #1639 Add grouping to stored procedures in the navigation tree
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-13 09:59:22 +05:30
Marc Delisle
357ab293ce Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-04-12 07:30:57 -04:00
Marc Delisle
6e748aa7fb Fix coding style
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-12 07:30:53 -04:00
Weblate
c0abe18735 Merge remote-tracking branch 'origin/master' 2015-04-12 13:03:24 +02:00
Burak Yavuz
5b994970be Translated using Weblate (Turkish)
Currently translated at 99.9% (3074 of 3075 strings)

[CI skip]
2015-04-12 13:03:21 +02:00
Thiago Casotti
411aae0427 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.0% (3045 of 3075 strings)

[CI skip]
2015-04-12 13:03:18 +02:00
Stefano Martinelli
116a1598e3 Translated using Weblate (Italian)
Currently translated at 98.4% (3027 of 3075 strings)

[CI skip]
2015-04-12 13:03:16 +02:00
Giovanni Sora
2d1fa803d6 Translated using Weblate (Interlingua)
Currently translated at 69.2% (2128 of 3075 strings)

[CI skip]
2015-04-12 13:03:14 +02:00
Ondra Šimeček
57c79cb793 Translated using Weblate (Czech)
Currently translated at 95.6% (2940 of 3075 strings)

[CI skip]
2015-04-12 13:03:11 +02:00
Marc Delisle
4c6181dbf1 Fix some PMD ShortVariable warnings
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-12 07:02:59 -04:00
dingo thirteen
2a9bcf124f Translated using Weblate (Dutch)
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
2015-04-12 00:52:24 +02:00
Domen
0761875224 Translated using Weblate (Slovenian)
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
2015-04-11 23:33:34 +02:00
Παναγιώτης Παπάζογλου
d10e45bf16 Translated using Weblate (Greek)
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
2015-04-11 17:05:45 +02:00
Marc Delisle
7a7ed1f4f6 Mention nginx
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-11 08:52:51 -04:00
Marc Delisle
f9873b553a Starting from PHP 7, the mysql extension is no longer present
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-11 08:38:11 -04:00
Weblate
f14e4bf3ef Merge remote-tracking branch 'origin/master' 2015-04-11 12:42:27 +02:00
Burak Yavuz
d86ca74dc5 Translated using Weblate (Turkish)
Currently translated at 99.9% (3074 of 3075 strings)

[CI skip]
2015-04-11 12:42:24 +02:00
Stefano Martinelli
c7cbf6bef7 Translated using Weblate (Italian)
Currently translated at 97.7% (3007 of 3075 strings)

[CI skip]
2015-04-11 12:42:21 +02:00
Valter Georgiev
aa3ef5cca8 Translated using Weblate (Bulgarian)
Currently translated at 61.4% (1889 of 3075 strings)

[CI skip]
2015-04-11 12:42:18 +02:00
Marc Delisle
81bf0afe40 Merge pull request #1637 from Kdecherf/master
Add option to show/hide git revision on main panel
2015-04-11 06:42:12 -04:00
Marc Delisle
6db5d30c82 Translated using Weblate (French)
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
2015-04-11 12:33:49 +02:00
Balázs Úr
562ab064d0 Translated using Weblate (Hungarian)
Currently translated at 100.0% (3075 of 3075 strings)

[CI skip]
2015-04-11 01:02:21 +02:00
Marc Delisle
dbf45856a2 Update po files
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-10 10:21:41 -04:00
Marc Delisle
9edefa2e6c Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-04-10 10:20:30 -04:00
Evert Beurskens
d76971d8dd Clarify configuration message
Signed-off-by: Evert Beurskens evertbeurskens@gmail.com
2015-04-10 10:18:38 -04:00
Madhura Jayaratne
c14385fada Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-04-10 19:41:51 +05:30
Marc Delisle
a582077812 Merge branch 'QA_4_4' 2015-04-10 09:55:33 -04:00
Marc Delisle
dbf30ecf41 Merge commit '8821b39' 2015-04-10 09:55:27 -04:00
Marc Delisle
b01503a293 Merge commit '847fa85' 2015-04-10 09:55:11 -04:00
Marc Delisle
566c9d1ced ChangeLog entry
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-10 09:54:40 -04:00
Madhura Jayaratne
15e5c3d9f7 Do not use globals
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 19:23:52 +05:30
Weblate
8821b39920 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-04-10 15:52:58 +02:00
Stefano Martinelli
2c1883f3ac Translated using Weblate (Italian)
Currently translated at 96.7% (2935 of 3035 strings)

[CI skip]
2015-04-10 15:52:56 +02:00
Marc Delisle
6f58a69511 Merge pull request #1638 from madhuracj/ob
Bug #4833 CSS and Javascript are not compressed - Work in progress
2015-04-10 09:52:50 -04:00
Madhura Jayaratne
cb57dbb0ad Use object properties rather than using globals
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 17:46:54 +05:30
Madhura Jayaratne
04c39ebe30 Identify types
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 17:36:11 +05:30
Madhura Jayaratne
84c7c61cd2 Make sql_metadata configurable
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-10 16:53:56 +05:30