Commit Graph

85496 Commits

Author SHA1 Message Date
Madhura Jayaratne
4f93739fc5 Fix typo 2013-07-30 17:46:35 +05:30
Madhura Jayaratne
28b669a1aa Remove redundant checks 2013-07-30 17:46:15 +05:30
Isaac Bennetch
0174f102aa Merge pull request #546 from kasunchathuranga/exportView
Export views as if they were tables
2013-07-29 21:14:21 -07:00
Kasun Chathuranga
94ff649d0d Fix undefined index notices on sql_views_as_tables 2013-07-30 07:20:35 +05:30
Weblate
459d2f8502 Merge remote-tracking branch 'origin/master' 2013-07-29 22:54:53 +02:00
Marcelo Camargo
99dc84f233 Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.1% (2683 of 2707)
2013-07-29 22:54:31 +02:00
Marc Delisle
1ad632c6df Fix merge conflicts 2013-07-29 16:52:35 -04:00
Rodrigo Souza
8ead0163ec Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.0% (2679 of 2707)
2013-07-29 22:46:48 +02:00
Marc Delisle
36a22d282b Merge pull request #542 from xmujay/server_refactor2
refactor server_import and related files
2013-07-29 13:46:15 -07:00
Marc Delisle
30c1ed99cb Merge branch 'QA_4_0' 2013-07-29 16:34:46 -04:00
Marc Delisle
072d193af4 Merge commit '965105c' 2013-07-29 16:34:31 -04:00
Marc Delisle
5d946eaf57 Merge branch 'MAINT_4_0_5' into QA_4_0 2013-07-29 16:32:03 -04:00
Marc Delisle
66fe475d4f ChangeLog entry for Improved protection against cross framing 2013-07-29 16:31:44 -04:00
Matías Bellone
e8d465618d Translated using Weblate (Spanish)
Currently translated at 100.0% (2708.0 of 2708)
2013-07-29 22:30:12 +02:00
Matías Bellone
5ff68783cb Translated using Weblate (Spanish)
Currently translated at 99.7% (2699 of 2708)
2013-07-29 22:22:55 +02:00
Marc Delisle
4243170951 Fix merge conflicts 2013-07-29 16:20:15 -04:00
Matías Bellone
c0b40b2710 Translated using Weblate (Spanish)
Currently translated at 99.3% (2689 of 2708)
2013-07-29 22:05:33 +02:00
Burak Yavuz
518d0e02ad Translated using Weblate (Turkish)
Currently translated at 100.0% (2708.0 of 2708)
2013-07-29 22:04:41 +02:00
Matías Bellone
965105c14c Translated using Weblate (Spanish)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 21:15:26 +02:00
Burak Yavuz
d68dfbfe64 Translated using Weblate (Turkish)
Currently translated at 99.5% (2695 of 2708)
2013-07-29 20:43:00 +02:00
Burak Yavuz
5fa2399cba Translated using Weblate (Turkish)
Currently translated at 99.0% (2682 of 2708)
2013-07-29 20:21:41 +02:00
Marc Delisle
dfaf2b91b4 Translated using Weblate (French)
Currently translated at 100.0% (2708.0 of 2708)
2013-07-29 20:21:14 +02:00
Burak Yavuz
22f2158def Translated using Weblate (Turkish)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 20:20:21 +02:00
Marc Delisle
c5e3979193 Translated using Weblate (French)
Currently translated at 99.6% (2697 of 2707)
2013-07-29 19:40:16 +02:00
Marc Delisle
ba8d5f7fd5 Translated using Weblate (French)
Currently translated at 99.6% (2697 of 2707)
2013-07-29 19:39:55 +02:00
Weblate
239ce57941 Merge remote-tracking branch 'origin/master' 2013-07-29 19:39:35 +02:00
Domen
0d6f02d226 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2693 of 2693)
2013-07-29 19:39:09 +02:00
Marc Delisle
dd0276a90b Translated using Weblate (French)
Currently translated at 99.6% (2696 of 2707)
2013-07-29 19:38:50 +02:00
Marc Delisle
6aaf0cc007 Update po files 2013-07-29 13:37:48 -04:00
Marc Delisle
a9b7592c8d English improvement in messages 2013-07-29 13:36:46 -04:00
Marc Delisle
f464ba0f0d Translated using Weblate (French)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 19:26:09 +02:00
Domen
cbd43d5468 Translated using Weblate (Slovenian)
Currently translated at 100.0% (2693.0 of 2693)
2013-07-29 18:25:44 +02:00
Domen
35d553f34f Translated using Weblate (Slovenian)
Currently translated at 100.0% (2609.0 of 2609)
2013-07-29 18:20:00 +02:00
Weblate
659f973173 Merge remote-tracking branch 'origin/master' 2013-07-29 18:04:11 +02:00
Giovanni Sora
129ae2e0f6 Translated using Weblate (Interlingua)
Currently translated at 18.5% (500 of 2700)
2013-07-29 18:04:08 +02:00
Isaac Bennetch
07160dec71 Merge pull request #548 from kasunchathuranga/hideTables
Move common code to a common ancestor
2013-07-29 09:03:46 -07:00
xmujay
776ba8c0f8 fix code style 2013-07-29 23:31:35 +08:00
Weblate
4039f0ce7a Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-07-29 16:21:52 +02:00
Dieter Adriaenssens
24b93c3a74 Translated using Weblate (Dutch)
Currently translated at 100.0% (2609 of 2609)
2013-07-29 16:20:58 +02:00
Atul Pratap Singh
90b04fd1e7 Left while fixing 4006 2013-07-29 19:48:29 +05:30
Weblate
84bf4f5675 Merge remote-tracking branch 'origin/master' 2013-07-29 16:12:19 +02:00
Kristjan Räts
54068e38e4 Translated using Weblate (Estonian)
Currently translated at 100.0% (2708 of 2708)
2013-07-29 16:11:40 +02:00
Dieter Adriaenssens
d7e585e854 Translated using Weblate (Dutch)
Currently translated at 99.4% (2692 of 2708)
2013-07-29 16:11:29 +02:00
Atul Pratap Singh
51f5a3eb65 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-07-29 19:40:25 +05:30
xmujay
c406a0c190 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2 2013-07-29 22:09:00 +08:00
Atul Pratap Singh
78cf1c4e22 Left while fixing 4006 2013-07-29 19:37:43 +05:30
Kristjan Räts
dcee4d5cd6 Translated using Weblate (Estonian)
Currently translated at 100.0% (2708.0 of 2708)
2013-07-29 16:05:49 +02:00
Weblate
2b38f879e8 Merge remote-tracking branch 'origin/master' 2013-07-29 15:50:52 +02:00
Kristjan Räts
c88f287566 Translated using Weblate (Estonian)
Currently translated at 99.0% (2682 of 2708)
2013-07-29 15:50:46 +02:00
Michal Čihař
fc5eace830 Process only php files using phpcs 2013-07-29 15:50:36 +02:00