gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,711 Commits 12 Branches 481 Tags 2.4 GiB
3fc8321624
Commit Graph

88711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
3fc8321624 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-03 06:00:53 -05:00
Marc Delisle
469d6242e7 Add ChangeLog entry for fix of bug #4184 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-03 05:59:47 -05:00
Michal Čihař
35e93ef92a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-01-03 10:43:31 +01:00
Michal Čihař
effa897aa2 Merge remote-tracking branch 'origin/QA_4_1' 
Conflicts:
	libraries/structure.lib.php
 2014-01-03 10:43:08 +01:00
Weblate
1ff31df92f Merge remote-tracking branch 'origin/master' 2014-01-03 10:40:30 +01:00
Michal Čihař
0ef64c9d17 Merge branch 'bug-#4184' of git://github.com/lakshit/phpmyadmin into integration 2014-01-03 10:38:27 +01:00
Denny Sandner
a1094d4752 Translated using Weblate (German) 
Currently translated at 94.2% (2592 of 2751)
 2014-01-03 10:38:26 +01:00
Michal Čihař
8a4bc309d8 Merge remote-tracking branch 'origin/QA_4_1' 2014-01-03 10:37:09 +01:00
Denny Sandner
4a9dd1b31a Translated using Weblate (German) 
Currently translated at 94.4% (2597 of 2749)
 2014-01-03 10:36:52 +01:00
Michal Čihař
361eafaa5f Translated using Weblate (Czech) 
Currently translated at 100.0% (2749 of 2749)
 2014-01-03 10:36:48 +01:00
Michal Čihař
6364632539 Translated using Weblate (Czech) 
Currently translated at 100.0% (2751 of 2751)
 2014-01-03 10:34:23 +01:00
Lakshit Arora
c86dec0378 Fixed Bug #4184 2014-01-03 02:16:26 +05:30
J.M
05d2d4839c Merge remote-tracking branch 'origin/master' 2014-01-02 20:54:28 +01:00
J.M
ee75a1c65d Use less subtle design for active user initial 
See comments for aa05823.

Signed-off-by: J.M <me@mynetx.net>
 2014-01-02 20:53:52 +01:00
Chanaka Indrajith
8b95c41cc4 Fixed code violations in ServerConfigChecks.class.php 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-01-02 23:51:49 +05:30
Madhura Jayaratne
89b57f6d87 Rename some functions to adhere to coding styles 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-02 22:47:08 +05:30
Marc Delisle
071e7ea3a5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-01-02 08:31:44 -05:00
Marc Delisle
a6926c4f43 Improve function names 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-02 08:31:37 -05:00
Madhura Jayaratne
698157e1ba Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-01-02 18:28:36 +05:30
Madhura Jayaratne
d711af9035 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-02 18:28:09 +05:30
Atul Pratap Singh
0dd1fa9f89 Merge pull request #816 from Chanaka/rfe_1462 
Added table comment tool tip for database structure page
 2014-01-02 03:55:25 -08:00
Chanaka Indrajith
45dd69d55b Added rfe to changlog 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-01-01 19:50:35 +05:30
Chanaka Indrajith
74e22e34bf Merge remote branch 'upstream/master' into rfe_1462 2014-01-01 19:35:35 +05:30
Weblate
7aa348c492 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-01 14:16:20 +01:00
Madhura Jayaratne
aecd5f7072 Merge branch 'QA_4_1' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-01 18:45:40 +05:30
Domen
422b5fc957 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2749 of 2749)
 2014-01-01 14:14:19 +01:00
Madhura Jayaratne
ca692d7f33 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-01 18:43:11 +05:30
Madhura Jayaratne
0ae77814a7 bug #4208 Can't browse tables after sorting on columns with fieldnames that have a '-' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-01 18:41:09 +05:30
Domen
213d673bb0 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2751 of 2751)
 2014-01-01 12:48:49 +01:00
Weblate
f1ebd1f512 Merge remote-tracking branch 'origin/master' 2014-01-01 12:34:53 +01:00
zz zz
55e3fed500 Translated using Weblate (Simplified Chinese) 
Currently translated at 93.3% (2569 of 2751)
 2014-01-01 12:32:54 +01:00
Marc Delisle
08fb2d3479 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-01 06:29:52 -05:00
Marc Delisle
d0f18871fd Merge commit '69c24b7' 2014-01-01 06:26:03 -05:00
Weblate
8677cf510c Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-01 12:24:30 +01:00
zz zz
4d13f69f6a Translated using Weblate (Simplified Chinese) 
Currently translated at 93.5% (2573 of 2749)
 2014-01-01 12:21:59 +01:00
Marc Delisle
69c24b78bb ChangeLog entry and fix explanation for bug #4209 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-01 06:19:39 -05:00
Jørgen Thomsen
685c1d3495 bug #4209 Missing compression in one case 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-01 06:18:19 -05:00
J.M
3f1672500d Resolve #1480 Enhance privileges initials table 2013-12-31 15:17:55 +01:00
J.M
eea7b800db Add ChangeLog entry for rfe #1480 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-31 15:16:55 +01:00
J.M
55ad62a0ac Fix hidden initials_table when reloading filtered mode 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-31 15:13:34 +01:00
J.M
3b8bfb97ac Prevent initials_table from ajax-appearing twice 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-31 15:11:34 +01:00
J.M
2ed160bbe1 Remove typo < in table id=initials_table tag 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-31 15:09:29 +01:00
J.M
ff7fdd0cfb Remove [] around Show all link in initials table 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-31 15:08:11 +01:00
J.M
aa05823d92 Visually highlight active initial in privs table 
Signed-off-by: J.M <me@mynetx.net>
 2013-12-31 15:07:09 +01:00
Marc Delisle
dd7ddbfd78 Merge branch 'QA_4_1' 2013-12-31 09:03:24 -05:00
Marc Delisle
eaaf074851 Merge commit 'd7c6aeb' 2013-12-31 09:03:15 -05:00
Jørgen Thomsen
ccd65816b8 bug #3840 (additional fix) When exporting to gzip format, the data is compresses 2 times 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-31 09:02:16 -05:00
Marc Delisle
0e71a3b02c Remove misleading comment 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-31 08:36:19 -05:00
Marc Delisle
deb2be02d1 Refactor: new PMA_exportTable() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-31 08:33:38 -05:00
Weblate
d7c6aeb9f6 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2013-12-31 11:50:00 +01:00