gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,549 Commits 12 Branches 481 Tags 2.4 GiB
2e800fc6a2
Commit Graph

103549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař
2e800fc6a2 Merge pull request #11624 from ruleant/patch-3 
add Buildtime Trend shield badge
 2015-10-30 15:53:34 +01:00
Marc Delisle
f90e9b44f9 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-30 07:53:22 -04:00
Marc Delisle
40c910d75f Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-30 07:12:22 -04:00
Dieter Adriaenssens
9dc4d07c28 add Buildtime Trend shield badge [skip ci] 
for other badges, see https://github.com/buildtimetrend/service#shield-badges

Signed-off-by: Dieter Adriaenssens <ruleant@users.sourceforge.net>
 2015-10-30 12:02:23 +01:00
Madhura Jayaratne
7f3fcfd1ca Fix #11622 Reloading privileges is not allowed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-30 21:26:38 +11:00
Madhura Jayaratne
d7611d65e8 Separate method to add tracking icon 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-30 19:32:44 +11:00
Madhura Jayaratne
d2f3c499f9 Move code related to approximate row counting to a separate method 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-30 19:16:33 +11:00
Madhura Jayaratne
f99c8c2905 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-30 18:54:13 +11:00
Madhura Jayaratne
8833d80697 Remove dead code. Already handled in addRemoveFavoriteTablesAction() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-30 18:52:15 +11:00
Weblate
0b714a2343 Merge remote-tracking branch 'origin/master' 2015-10-30 08:40:53 +01:00
disorderman
2d50eeeec5 Translated using Weblate (Chinese (China)) 
Currently translated at 88.4% (2856 of 3228 strings)

[CI skip]
 2015-10-30 08:40:49 +01:00
Madhura Jayaratne
2044f9fca6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-30 18:40:37 +11:00
Madhura Jayaratne
c4bd990ff6 Refactor and move our replication related section 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-30 18:39:27 +11:00
Marc Delisle
7a450a8604 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-29 09:44:22 -04:00
Benjamin Hodgetts
a1c5557430 Fixes #11619 TokuDB Tables Show Size as "unknown" 
Signed-off-by: Benjamin Hodgetts <ben@xnode.org>
 2015-10-29 09:42:10 -04:00
Madhura Jayaratne
7ae7ea459a Broadly refactor indexAction(). Furthre finer refactoring needs to be carried out 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 23:37:13 +11:00
Madhura Jayaratne
8e3c97920a Improve organization 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 23:26:39 +11:00
Madhura Jayaratne
cb6186bb9c Create new multi submit action 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 22:27:43 +11:00
Madhura Jayaratne
f4a8d4c305 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-29 21:52:20 +11:00
Madhura Jayaratne
54822b8fc8 Move ajax actions to the front 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 21:50:30 +11:00
Weblate
841048e3d0 Merge remote-tracking branch 'origin/master' 2015-10-29 11:48:40 +01:00
zz
deec9b0ca3 Translated using Weblate (Chinese (China)) 
Currently translated at 88.4% (2855 of 3228 strings)

[CI skip]
 2015-10-29 11:48:38 +01:00
Madhura Jayaratne
10de07bb1d Fix #11617 Getting real row count is not allowed for views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 21:48:14 +11:00
Madhura Jayaratne
88586bf419 Function declarations should not be placed in blocks. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 08:15:15 +11:00
Madhura Jayaratne
227b91617e Use dot notation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 08:07:49 +11:00
Madhura Jayaratne
ceb172e748 Make JSLint happy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 07:58:02 +11:00
Madhura Jayaratne
ca2eb9d738 Make PHPCS happy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-29 07:37:55 +11:00
Marc Delisle
0521553412 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-28 10:29:30 -04:00
Marc Delisle
ffd2a95519 Fix failing test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-28 10:28:41 -04:00
Marc Delisle
0e57191f0a Merge branch 'QA_4_5' 2015-10-28 08:44:19 -04:00
Marc Delisle
fd7612be92 Merge commit '3e1da79' 2015-10-28 08:44:11 -04:00
Marc Delisle
9fb7b9828d Merge pull request #11615 from devenbansod/fix_11605_2 
Fix issue 11605 - new
 2015-10-28 08:43:01 -04:00
Deven Bansod
d604a36135 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 22:18:38 +05:30
Marc Delisle
1fdc24ad24 Translated using Weblate (French) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-28 12:02:07 +01:00
Weblate
2e1b742386 Merge remote-tracking branch 'origin/master' 2015-10-28 10:28:09 +01:00
Domen
12002ad299 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-28 10:28:08 +01:00
Madhura Jayaratne
38ce691b70 Merge branch 'QA_4_5' 2015-10-28 20:27:53 +11:00
Weblate
3e1da7914e Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-10-28 08:44:42 +01:00
Παναγιώτης Παπάζογλου
85873bf1b5 Translated using Weblate (Greek) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-28 08:44:42 +01:00
Madhura Jayaratne
4fd5a3a0ad Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-10-28 18:44:31 +11:00
Madhura Jayaratne
4b4f032046 Fix #11614 Undefined variable: db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-28 18:42:34 +11:00
Domen
2936ecc418 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-10-28 00:33:43 +01:00
Παναγιώτης Παπάζογλου
3726fc201f Translated using Weblate (Greek) 
Currently translated at 100.0% (3228 of 3228 strings)

[CI skip]
 2015-10-27 19:00:00 +01:00
Marc Delisle
560b321d0c Merge branch 'QA_4_5' 2015-10-27 12:57:21 -04:00
Marc Delisle
c0b387acf2 Merge commit '1e6f128' 2015-10-27 12:57:10 -04:00
Deven Bansod
1e6f128202 Fix issue 11605 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-10-28 03:17:51 +05:30
Marc Delisle
d456a0f64d Merge commit '1b2cd3c' 2015-10-27 12:56:56 -04:00
Marc Delisle
2838f2505b ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-27 12:56:27 -04:00
Marc Delisle
d7ba4a5449 Merge pull request #11613 from devenbansod/fix_11605 
Fix issue #11605
 2015-10-27 12:55:37 -04:00
Marc Delisle
9bf888e222 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-27 10:22:37 -04:00