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

100409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
714ab04d51 bug #4795 Query builder: missing joint for the intermediary table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 11:47:22 +05:30
Madhura Jayaratne
f965893c7b Refactor: Move table JOINing logic to a separate method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:53:39 +05:30
Madhura Jayaratne
fae84aca9a Refactor: move to a new method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:45:19 +05:30
Madhura Jayaratne
7a4efae405 Better variable names 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:32:15 +05:30
Madhura Jayaratne
2d331942f5 Reduce duplication 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 10:10:07 +05:30
Madhura Jayaratne
7c12bb64a3 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 08:51:28 +05:30
Madhura Jayaratne
ed357d7716 bug External URL for $cfg['NavigationLogoLink'] causes JavaScript error when clicked 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-17 08:48:14 +05:30
Madhura Jayaratne
4076c6b15f Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 19:44:02 +05:30
Madhura Jayaratne
bfac73dafd Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-16 19:39:46 +05:30
Madhura Jayaratne
37a40028e3 bug #4955 Clicking on the navi logo does not always work 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 19:39:06 +05:30
Madhura Jayaratne
2c4d25e19b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-16 17:17:13 +05:30
Madhura Jayaratne
ac0d22638d Merge branch 'QA_4_4' 2015-06-16 17:15:59 +05:30
Weblate
5eb853e5f4 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-16 13:42:06 +02:00
Tommy Surbakti
2d13780108 Translated using Weblate (Indonesian) 
Currently translated at 74.9% (2275 of 3035 strings)

[CI skip]
 2015-06-16 13:42:03 +02:00
Madhura Jayaratne
1d0de9881a bug #4962 Insert by foreign key scrolls page to top 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 17:10:13 +05:30
Marc Delisle
aa89456dc4 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-16 07:17:32 -04:00
Weblate
318d1e9794 Merge remote-tracking branch 'origin/master' 2015-06-16 12:05:24 +02:00
Tommy Surbakti
d359b1a1aa Translated using Weblate (Indonesian) 
Currently translated at 72.9% (2263 of 3102 strings)

[CI skip]
 2015-06-16 12:05:21 +02:00
Michal Čihař
e3b9049e51 Avoid creating .tar in every loop 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-16 12:04:05 +02:00
Madhura Jayaratne
d55fc100dc Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-16 12:11:28 +05:30
Madhura Jayaratne
29e68ddccf Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 12:10:24 +05:30
Madhura Jayaratne
a701f6e084 bug #4961 Javascript error when Designer is opened 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 12:08:57 +05:30
Weblate
dc118b82c6 Merge remote-tracking branch 'origin/master' 2015-06-16 07:39:38 +02:00
Martin Lacina
3cb9a3c975 Translated using Weblate (Slovak) 
Currently translated at 84.0% (2608 of 3102 strings)

[CI skip]
 2015-06-16 07:39:35 +02:00
Madhura Jayaratne
f4f183aacd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-16 11:08:28 +05:30
Madhura Jayaratne
fdb114b8a0 Wrap a long line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 11:07:28 +05:30
Madhura Jayaratne
359f7586df Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 11:06:20 +05:30
Madhura Jayaratne
f4438b1c70 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-06-16 11:03:10 +05:30
Weblate
f77e216b36 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-06-16 07:33:09 +02:00
Martin Lacina
c5510d0a7c Translated using Weblate (Slovak) 
Currently translated at 85.0% (2581 of 3035 strings)

[CI skip]
 2015-06-16 07:33:07 +02:00
Kurt Eilertsen
ffcc01c45f Translated using Weblate (Norwegian Bokmål) 
Currently translated at 63.8% (1937 of 3035 strings)

[CI skip]
 2015-06-16 07:33:04 +02:00
Madhura Jayaratne
7c236e1abd bug #4960 Table creation results in GET request with missing server parameter that invalidates the session 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-16 11:02:01 +05:30
Jozef Pistej
24ed972bb2 Translated using Weblate (Slovak) 
Currently translated at 84.9% (2578 of 3035 strings)

[CI skip]
 2015-06-16 07:09:13 +02:00
Marc Delisle
2e55cf1139 Doc for the MysqlMinVersion directive 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 15:31:15 -04:00
Marc Delisle
cebb2a5140 Merge pull request #1734 from sibprogrammer/feature-control-min-version 
Ability to contol the minimal MySQL version via config.
 2015-06-15 15:20:17 -04:00
Pedro Ribeiro
219b855036 Translated using Weblate (Portuguese) 
Currently translated at 59.2% (1797 of 3035 strings)

[CI skip]
 2015-06-15 18:44:42 +02:00
Marc Delisle
9acf48878d The "GENERAL" word was a keyword only between MySQL 5.5.3 and 5.5.8 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 11:11:03 -04:00
Atul Pratap Singh
ec43664014 Merge pull request #1733 from Tithugues/templateForLogo_master 
Manage logo display in navigation panel, with a template.
 2015-06-15 16:41:31 +05:30
Marc Delisle
175fb2f4b7 Match returned value with documented type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 06:49:01 -04:00
Marc Delisle
9bb7e9fea1 Clarify doc due to new verification introduced 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-15 06:23:57 -04:00
Marc Delisle
0345d572ed Merge pull request #1731 from sibprogrammer/master 
Prohibit the ability to check version if it was disabled.
 2015-06-15 06:17:01 -04:00
Madhura Jayaratne
a8fe40ab50 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-15 15:20:35 +05:30
Madhura Jayaratne
c2e91186d2 Allow specifying resize direction 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-15 15:19:27 +05:30
Michal Čihař
dd97bf650f Fix port for connecting to files server 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-06-15 08:18:50 +02:00
Madhura Jayaratne
e3449c9372 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-06-15 08:55:08 +05:30
Madhura Jayaratne
72cc1f9f51 bug #4958 Designer Javascript error with specially crafted table name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-15 08:53:16 +05:30
Alexei Yuzhakov
d384a6b432 Ability to contol the minimal MySQL version via config. 
Signed-off-by: Alexei Yuzhakov <sibprogrammer@gmail.com>
 2015-06-15 08:05:17 +06:00
Aputsiaĸ Niels Janussen
82f8042aaf Translated using Weblate (Danish) 
Currently translated at 99.5% (3020 of 3035 strings)

[CI skip]
 2015-06-15 00:44:10 +02:00
Hugues Peccatte
1a0005418b Manage logo display in navigation panel, with a template. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-15 00:41:27 +02:00
Marc Delisle
84fa181135 Bug #4933 INSERT validation issues with MySQL functions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-14 17:09:27 -04:00