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

86673 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
3ac97c59ef Merge branch 'QA_4_0' 2013-09-05 12:32:59 -04:00
Marc Delisle
edcf5a031c Fix merge conflict 2013-09-05 12:32:23 -04:00
Marc Delisle
e01419b473 Merge branch 'MAINT_4_0_6' into QA_4_0 2013-09-05 12:31:48 -04:00
Marc Delisle
21eda1c2c4 4.0.6 release 2013-09-05 12:31:23 -04:00
Isaac Bennetch
2666ee5023 Merge pull request #662 from kasunchathuranga/tablePrivs 
Privileges tab for table level
 2013-09-05 09:27:24 -07:00
Marc Delisle
a7278099ec Merge pull request #670 from xmujay/UT_table_printviews 
UTs for PMA_tbl_printview
 2013-09-05 04:44:13 -07:00
Marc Delisle
2b979badd2 This new code should be excluded from running under the test suite 2013-09-05 07:41:39 -04:00
Marc Delisle
44195d6231 Merge commit '633b23c' 2013-09-05 07:32:46 -04:00
Marc Delisle
50cb1928eb Merge commit '6693a9e' 2013-09-05 07:31:17 -04:00
Weblate
633b23cad7 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-09-05 13:30:41 +02:00
Tomasz Nowiński
ac47f12357 Translated using Weblate (Polish) 
Currently translated at 99.2% (2588 of 2609)
 2013-09-05 13:30:37 +02:00
Marc Delisle
6d5545f31a Merge pull request #668 from kasunchathuranga/navSelect 
Proceed only if the database is found
 2013-09-05 04:30:29 -07:00
Kasun Chathuranga
059d2e2d10 Rights tab should only be accessible to super users 2013-09-05 07:58:12 +05:30
xmujay
c1fbdc446c UTs for PMA_tbl_printview 2013-09-05 10:05:29 +08:00
Kasun Chathuranga
6693a9ebb3 Proceed only if the database is found 2013-09-05 07:24:50 +05:30
Rodrigo Souza
e641aa4dc0 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2720 of 2720)
 2013-09-04 22:24:14 +02:00
Mauricio Bastos
9c9de0caa1 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2719 of 2720)
 2013-09-04 22:24:07 +02:00
Weblate
3b2e2164b4 Merge remote-tracking branch 'origin/master' 2013-09-04 13:52:30 +02:00
Tomasz Nowiński
2593087a15 Translated using Weblate (Polish) 
Currently translated at 92.9% (2526 of 2720)
 2013-09-04 13:52:25 +02:00
Marc Delisle
252d067fc1 Fix codestyle 2013-09-04 07:52:07 -04:00
Weblate
169aa233e4 Merge remote-tracking branch 'origin/master' 2013-09-03 20:06:45 +02:00
Tomasz Nowiński
bca7c6ce1f Translated using Weblate (Polish) 
Currently translated at 92.8% (2524 of 2720)

Komunikat o liczbie wyników szukania tabel: zmiana kolejności, dopasowanie form do równania l. mn.
 2013-09-03 20:06:40 +02:00
Atul Pratap Singh
cb364d5458 Merge branch 'merge' of https://github.com/kasunchathuranga/phpmyadmin 
Conflicts:
	export.php
 2013-09-03 23:18:23 +05:30
Marc Delisle
6772b75d3b Merge pull request #666 from xmujay/refactor_tbl_print_view 
Refactor tbl print view
 2013-09-03 09:22:10 -07:00
xmujay
077b49d0d3 just render table print view 2013-09-03 20:18:48 +08:00
Marc Delisle
92f022caeb Fix merge conflicts 2013-09-03 08:16:10 -04:00
Kasun Chathuranga
8d70cd4dec Merge branch 'QA_4_0' into merge. Resolved conflicts. 2013-09-03 14:13:02 +05:30
Marc Delisle
57b241a45f Merge branch 'MAINT_4_0_6' into QA_4_0 2013-09-02 08:52:20 -04:00
Marc Delisle
f0a0ad5eaf Merge commit '2ca7932' into QA_4_0 2013-09-02 08:52:05 -04:00
xmujay
bdd64d50ee add function for render Space Usage 2013-09-02 20:09:46 +08:00
Marc Delisle
1bab8bfeea The rendering of "view output as text" should not be affected by the fix for the memory problems in export 2013-09-02 07:56:08 -04:00
Weblate
ee1529a144 Merge remote-tracking branch 'origin/master' 2013-09-02 00:42:44 +02:00
shanyan baishui
a9d06bfe3a Translated using Weblate (Simplified Chinese) 
Currently translated at 95.1% (2587 of 2720)
 2013-09-02 00:42:38 +02:00
Marc Delisle
930a024d02 Merge pull request #663 from scnakandala/refac_tbl_indexes 
Refactoring tbl_indexes.php
 2013-09-01 15:42:25 -07:00
Kasun Chathuranga
a884f3a9e8 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin into tablePrivs 2013-09-01 22:53:43 +05:30
xmujay
afe918e251 fix code style 2013-09-02 00:36:51 +08:00
xmujay
ecd6de0e02 refactor table print view 2013-09-02 00:25:36 +08:00
Weblate
72090405e9 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-09-01 16:01:19 +02:00
shanyan baishui
9c47057449 Translated using Weblate (Simplified Chinese) 
Currently translated at 99.0% (2583 of 2609)
 2013-09-01 16:00:49 +02:00
Atul Pratap Singh
87e63d0651 Merge pull request #659 from kasunchathuranga/navSelect 
Expand the navigation and highlight the current database or table/view
 2013-09-01 07:00:12 -07:00
Marc Delisle
dd268214c8 Merge pull request #661 from xmujay/UT_for_severprivileges_serverdatabases 
UTs for PMA_server_databases and PMA_server_privileges
 2013-08-31 06:23:23 -07:00
Marc Delisle
2ca79320ee 4.0.6-rc2 2013-08-31 08:04:23 -04:00
Weblate
17a7299c76 Merge remote-tracking branch 'origin/master' 2013-08-31 13:57:27 +02:00
shanyan baishui
8d372903d0 Translated using Weblate (Simplified Chinese) 
Currently translated at 95.1% (2586 of 2720)
 2013-08-31 13:57:23 +02:00
Dong-bum Kim
47f0cf5db9 Translated using Weblate (Korean) 
Currently translated at 70.3% (1912 of 2720)
 2013-08-31 13:57:20 +02:00
Marc Delisle
90d6596082 Merge commit 'e231569' 2013-08-31 07:57:02 -04:00
Marc Delisle
56a9031f4e Fix merge conflicts 2013-08-31 07:56:31 -04:00
Weblate
b1115ee504 Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0 2013-08-31 13:51:45 +02:00
Michal Čihař
b91e9d12cf Translated using Weblate (Telugu) 
Currently translated at 13.2% (345 of 2609)
 2013-08-31 13:51:41 +02:00
shanyan baishui
ee1e8f9264 Translated using Weblate (Simplified Chinese) 
Currently translated at 99.0% (2582 of 2609)
 2013-08-31 13:51:38 +02:00