gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,342 Commits 12 Branches 481 Tags 2.4 GiB
734d0684e5
Commit Graph

100342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
734d0684e5 Merge pull request #1723 from madhuracj/qbe 
QBE improvements including bug fixes
 2015-06-14 07:46:57 +05:30
Hugues Peccatte
3f8dab6d33 Make PHPcs happy. 
Add missing PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 00:49:19 +02:00
Isaac Bennetch
79b43e1c8a Merge pull request #1729 from devenbansod/1594C 
Corrected small error in PR #1720
 2015-06-13 12:29:25 -04:00
Deven Bansod
0709cb606b Corrected small error in PR#1720 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-14 01:56:19 +05:30
Marc Delisle
adc34b7638 Merge pull request #1726 from nisargjhaveri/fk_check_tbl_op 
Foreign key checkbox for empty/drop in table operation
 2015-06-13 10:34:40 -04:00
Nisarg Jhaveri
8f242871dc Foreign key checkbox for empty/drop in table operation 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-13 19:51:28 +05:30
Marc Delisle
18b0a957bd Remove tab characters 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-13 07:24:51 -04:00
Domen
acd51bc039 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-13 11:41:49 +02:00
Burak Yavuz
148cd13b28 Translated using Weblate (Turkish) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-13 09:20:50 +02:00
Madhura Jayaratne
40a19030ec Merge branch 'master' into qbe 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-13 07:46:33 +05:30
Madhura Jayaratne
b7fabb63be Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-13 07:36:51 +05:30
Madhura Jayaratne
5a149202dc Fix typos 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-13 07:35:12 +05:30
Madhura Jayaratne
794a6d805d Match HTML tags 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-13 07:22:28 +05:30
Hugues Peccatte
3827e3e988 Make PHPcs happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-12 22:24:32 +02:00
Isaac Bennetch
10f5d6e586 Changelog for rfe 1594 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-06-12 15:18:39 -04:00
Weblate
83b1a3fdcb Merge remote-tracking branch 'origin/master' 2015-06-12 21:13:42 +02:00
Burak Yavuz
fa268f9b6c Translated using Weblate (Turkish) 
Currently translated at 99.9% (3101 of 3102 strings)

[CI skip]
 2015-06-12 21:13:39 +02:00
Kurt Eilertsen
26f271cfa6 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 61.1% (1897 of 3102 strings)

[CI skip]
 2015-06-12 21:13:36 +02:00
Isaac Bennetch
cad0eda2c7 Merge pull request #1720 from devenbansod/rfe1594 
RFE#1594: Use plain English descriptors instead of script names for Browse, SQL, Privileges, etc links
 2015-06-12 15:13:34 -04:00
Deven Bansod
edad7fcb3c Replace script names as config options with plain english words 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-06-13 04:41:54 +05:30
Weblate
bc276389cb Merge remote-tracking branch 'origin/master' 2015-06-12 17:03:14 +02:00
Kurt Eilertsen
0491bb8e41 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 60.7% (1884 of 3102 strings)

[CI skip]
 2015-06-12 17:03:11 +02:00
Marc Delisle
aa6ec4be0a Merge pull request #1725 from nisargjhaveri/fk_check_sql 
Foreign key check checkbox for empty/drop table in db_structure
 2015-06-12 11:03:08 -04:00
Nisarg Jhaveri
4ca5064aeb Fix tests 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Nisarg Jhaveri
620600f3b9 Foreign key check checkbox for empty/drop in db_structure 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 19:40:23 +05:30
Madhura Jayaratne
393aa8e694 Add master table only if it's not empty 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 18:31:02 +05:30
Madhura Jayaratne
8dacdd198e Move the column count obtaining logic to a separate method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 18:24:47 +05:30
Madhura Jayaratne
d42e05b9f8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-12 17:35:57 +05:30
Madhura Jayaratne
a759ac0185 Bug #4954 Warnings on query results refresh 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 17:33:42 +05:30
Marc Delisle
c289df12cd Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-12 07:35:34 -04:00
Marc Delisle
66a8288c77 Merge pull request #1724 from nisargjhaveri/issue_4948 
Fix bug#4948
 2015-06-12 07:26:54 -04:00
Marc Delisle
44b00e2007 Translated using Weblate (French) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-12 13:02:20 +02:00
Nisarg Jhaveri
d1bb026034 Fix bug#4948 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 12:18:25 +05:30
Weblate
b6a11a1658 Merge remote-tracking branch 'origin/master' 2015-06-12 08:31:55 +02:00
Pedro Ribeiro
1950230fed Translated using Weblate (Portuguese) 
Currently translated at 57.5% (1784 of 3102 strings)

[CI skip]
 2015-06-12 08:31:52 +02:00
Giovanni Sora
697d6cef6c Translated using Weblate (Interlingua) 
Currently translated at 69.5% (2158 of 3102 strings)

[CI skip]
 2015-06-12 08:31:49 +02:00
Michal Čihař
04dec8ba4a Upload files to our file server and CDN as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-12 08:31:30 +02:00
Madhura Jayaratne
ab9a8bdd25 Do array multi sort only when sort order is defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 11:58:50 +05:30
Kristjan Räts
713bda0618 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-12 08:25:08 +02:00
Madhura Jayaratne
401dbb1918 Allow ordering order by clauses 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 10:36:16 +05:30
Madhura Jayaratne
ab6b617e97 Introduce aliases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 07:27:51 +05:30
Madhura Jayaratne
2a0397dd33 Remove the choice to select whether or not to use joins. Reverts 27c259c and 357f0be 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 06:23:51 +05:30
Madhura Jayaratne
4b9ef9db9f Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-12 05:39:42 +05:30
Balázs Úr
4fd1fdae0d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-11 23:26:03 +02:00
Stefano Martinelli
76608fc1ee Translated using Weblate (Italian) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-11 18:16:45 +02:00
Παναγιώτης Παπάζογλου
f2bb1944ac Translated using Weblate (Greek) 
Currently translated at 100.0% (3102 of 3102 strings)

[CI skip]
 2015-06-11 18:03:49 +02:00
Madhura Jayaratne
115607abb2 bug #4510 QBE generates wrong query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 21:27:06 +05:30
Marc Delisle
20de061c0f Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-11 09:31:48 -04:00
Madhura Jayaratne
357f0be265 Use negation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 14:00:04 +05:30
Madhura Jayaratne
ce304b3157 Remove database name for consistency 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-11 13:53:02 +05:30