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

103574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
17317e013d Merge remote-tracking branch 'origin/master' 2015-11-01 21:55:12 +01:00
Jerry Gullstrand
9adb0b91ec Translated using Weblate (Swedish) 
Currently translated at 98.5% (3181 of 3228 strings)

[CI skip]
 2015-11-01 21:55:11 +01:00
Madhura Jayaratne
ebf4955eb3 Merge branch 'QA_4_5' 2015-11-02 07:54:32 +11:00
Madhura Jayaratne
2fa2d12cb1 Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5 
Conflicts:
	ChangeLog
 2015-11-02 07:48:51 +11:00
Madhura Jayaratne
1698c5db44 Fix #11630 Warning: mysqli_fetch_array() expects parameter 1 to be mysqli_result, boolean given 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-11-02 07:46:39 +11:00
Weblate
34b17f61e5 Merge remote-tracking branch 'origin/master' 2015-11-01 11:55:59 +01:00
Jerry Gullstrand
c72427b596 Translated using Weblate (Swedish) 
Currently translated at 98.4% (3177 of 3228 strings)

[CI skip]
 2015-11-01 11:55:59 +01:00
Kelvin Lee
c8664255ac Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 98.7% (3189 of 3228 strings)

[CI skip]
 2015-11-01 11:55:56 +01:00
Marc Delisle
c26430bca5 Merge branch 'QA_4_5' 2015-11-01 05:54:43 -05:00
Marc Delisle
b34f9f1c12 Merge commit 'b4044bb' 2015-11-01 05:54:15 -05:00
Marc Delisle
f904180af8 Merge commit '7c5de12' 2015-11-01 05:54:05 -05:00
Weblate
51e6ba48a8 Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5 2015-11-01 11:53:07 +01:00
Jerry Gullstrand
4093031470 Translated using Weblate (Swedish) 
Currently translated at 99.6% (3199 of 3211 strings)

[CI skip]
 2015-11-01 11:53:07 +01:00
Kelvin Lee
187eb58279 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 100.0% (3211 of 3211 strings)

[CI skip]
 2015-11-01 11:53:05 +01:00
disorderman
59adc96f56 Translated using Weblate (Chinese (China)) 
Currently translated at 89.4% (2872 of 3211 strings)

[CI skip]
 2015-11-01 11:53:05 +01:00
Marc Delisle
90224e23c7 Merge pull request #11629 from nisargjhaveri/issue_11627 
fix #11627, CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
 2015-11-01 05:52:59 -05:00
Nisarg Jhaveri
b4044bb770 fix #11627, CREATE TABLE/INSERT INTO executed twice (ctrl+enter) 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-11-01 03:51:45 +05:30
Marc Delisle
0a935b5965 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-31 07:02:02 -04:00
Marc Delisle
a238f4fd94 Add param comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-31 07:01:51 -04:00
Weblate
7f3c53b7f8 Merge remote-tracking branch 'origin/master' 2015-10-31 11:48:21 +01:00
Jerry Gullstrand
bec2a9d7e7 Translated using Weblate (Swedish) 
Currently translated at 84.7% (2736 of 3228 strings)

[CI skip]
 2015-10-31 11:48:21 +01:00
Marc Delisle
3fad231f37 Refactor some duplicated code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-31 06:47:47 -04:00
Marc Delisle
4c8d5dee0b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-10-30 11:00:01 -04:00
Marc Delisle
4ce9a18b63 Refactor long method 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-30 10:59:57 -04:00
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
zz
7c5de12faf Translated using Weblate (Chinese (China)) 
Currently translated at 89.4% (2871 of 3211 strings)

[CI skip]
 2015-10-30 08:33:27 +01: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