gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,774 Commits 12 Branches 481 Tags 2.4 GiB
b69b481612
Commit Graph

99774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
b69b481612 Merge pull request #1679 from Tithugues/addReturns_master 
Add missing return.
 2015-05-18 07:48:34 -04:00
Madhura Jayaratne
6c52f2318c Merge branch 'QA_4_4' 2015-05-18 10:30:00 +05:30
Madhura Jayaratne
34f318e52d Allow accessing visual query builder when pmadb is not configured 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 10:28:57 +05:30
Madhura Jayaratne
f9a1590ab6 Organize table chart JavaScript code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 07:30:24 +05:30
Madhura Jayaratne
6a8e2ce9a1 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-18 07:26:39 +05:30
Madhura Jayaratne
6dc5ec5085 Fix indentation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-18 07:25:33 +05:30
Hugues Peccatte
8fc71be95c Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:31:55 +02:00
Hugues Peccatte
5130e854d5 Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:26:35 +02:00
Hugues Peccatte
071e78a64f Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-05-17 15:24:38 +02:00
Hugues Peccatte
3e1e67a19a Minor coding style modification. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:23:52 +02:00
Hugues Peccatte
f305c14d1d PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:12:32 +02:00
Hugues Peccatte
f0792503e9 Update to fix tests. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 14:24:31 +02:00
Hugues Peccatte
18625f3bbf Update PHPDoc and minor coding style modifications. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 13:15:08 +02:00
Hugues Peccatte
d3dd47217e Add missing return. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 12:54:37 +02:00
Marc Delisle
b4d432f7f3 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-17 06:44:38 -04:00
Marc Delisle
0f3d104d0f Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-17 06:17:34 -04:00
Marc Delisle
ecaf6fac75 4.4.7 release date 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-16 06:58:37 -04:00
Marc Delisle
8583e23fdd Merge branch 'QA_4_4' 2015-05-16 06:57:43 -04:00
Marc Delisle
95ac6b46dd 4.4.8-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-16 06:57:15 -04:00
Marc Delisle
857f8fce46 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 14:29:11 -04:00
Marc Delisle
bb8a420d8c Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 13:56:39 -04:00
Marc Delisle
2da56de847 Fix doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 12:18:20 -04:00
Marc Delisle
80e930eeb8 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 09:42:29 -04:00
Marc Delisle
4bdd483869 Refactor 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 09:37:00 -04:00
Marc Delisle
5efe4d06e3 Merge pull request #1676 from nisargjhaveri/fix_sett 
Fix incorrect text in Settings > Import/Export
 2015-05-15 09:20:14 -04:00
Nisarg Jhaveri
3fcd07ac19 Fix incorrect text in Settings > Import/Export 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-15 18:40:07 +05:30
Weblate
f25ce24c6b Merge remote-tracking branch 'origin/master' 2015-05-15 15:02:13 +02:00
Viktar Palstsiuk
7dac3be8b5 Translated using Weblate (Belarusian) 
Currently translated at 26.6% (821 of 3085 strings)

[CI skip]
 2015-05-15 15:02:09 +02:00
Marc Delisle
6d6ca8ebed Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-05-15 09:02:00 -04:00
Madhura Jayaratne
1f9d621a8c Fix notices when no servers are defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 15:30:00 +05:30
Madhura Jayaratne
c176487e2a Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 15:08:13 +05:30
Madhura Jayaratne
3920c52409 Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4 2015-05-15 15:05:21 +05:30
Madhura Jayaratne
279439b08a Include token in the error messages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 15:04:21 +05:30
Madhura Jayaratne
98d42b55dc Give preference to a page having same name as the db 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:28:33 +05:30
Madhura Jayaratne
d40dbefe23 Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:19:43 +05:30
Weblate
350f74aa93 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-05-15 07:47:48 +02:00
LNDDYL
71d2cff966 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 95.2% (2892 of 3035 strings)

[CI skip]
 2015-05-15 07:47:45 +02:00
Madhura Jayaratne
23341a3458 ChangeLog entry for bug #4906 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:17:21 +05:30
Madhura Jayaratne
fdfd9ea89c #4906 Designer: pages from all databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:16:09 +05:30
Madhura Jayaratne
d9ac59f8d1 #4906 Designer: pages from all databases 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 11:13:45 +05:30
Madhura Jayaratne
d5c1df3cd5 Hide selflink in designer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 10:41:04 +05:30
Madhura Jayaratne
a66261bbd7 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-15 10:32:25 +05:30
Madhura Jayaratne
cc9bd408bc Fix test failures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 10:31:25 +05:30
Atul Pratap Singh
2cc67d10b1 Merge pull request #1642 from gzzhanghao/oop-refactor 
Refactoring tbl_view.lib and add PMA\Template
 2015-05-15 10:22:36 +05:30
Madhura Jayaratne
d0f6784cb5 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-05-15 07:46:12 +05:30
Madhura Jayaratne
0f76d59e1e Quit using filter_input since they bypass token check 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:45:09 +05:30
Weblate
37cefd7a85 Merge remote-tracking branch 'origin/master' 2015-05-15 03:56:00 +02:00
LNDDYL
b137ccfd19 Translated using Weblate (Chinese (Taiwan)) 
Currently translated at 93.4% (2882 of 3085 strings)

[CI skip]
 2015-05-15 03:55:56 +02:00
Sevdimali İsa
d503d50231 Translated using Weblate (Azerbaijani) 
Currently translated at 57.2% (1766 of 3085 strings)

[CI skip]
 2015-05-15 03:55:54 +02:00
Madhura Jayaratne
31c21b070a Adding token would not harm 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-15 07:25:36 +05:30