gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
98,675 Commits 12 Branches 481 Tags 2.4 GiB
90da8d0c12
Commit Graph

98675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
90da8d0c12 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-25 14:11:06 +05:30
Madhura Jayaratne
7663dea459 rfe #1619 Show databases as list instead of as dropdown when no database is selected 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-25 11:49:31 +05:30
Marc Delisle
f72eabf3b9 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 15:38:16 -04:00
Marc Delisle
8e3668044c bug #4818 MySQL 5.7.6 and changing the password for another user 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 15:23:52 -04:00
Marc Delisle
96c627101c Remove extraneous code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 13:29:06 -04:00
Marc Delisle
103d226016 Merge branch 'QA_4_4' 2015-03-24 13:28:08 -04:00
Marc Delisle
40406c5e7e bug #4813 MySQL 5.7.6 and the Users menu tab 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 13:26:51 -04:00
Marc Delisle
96a98e9035 Adapt translations to colon removal 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 12:07:28 -04:00
Marc Delisle
561233b91d Streamline message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 12:00:43 -04:00
Marc Delisle
bd75433c5f Remove extraneous colons 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-24 11:54:23 -04:00
Madhura Jayaratne
c74b37a5f5 Unit tests for PMA_resultSetHasJustOneTable() 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 20:41:18 +05:30
Madhura Jayaratne
0a89ee137f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-24 20:14:03 +05:30
Madhura Jayaratne
ccca280ea6 rfe #947 Show edit/delete also when there is calculated column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 20:13:01 +05:30
Marc Delisle
f0d4454cf0 Merge pull request #1610 from Anshu-xLR/Bug4816 
Fixed localization issue in <database> --> Operations window
 2015-03-24 07:55:45 -04:00
Madhura Jayaratne
42877d8b35 Use timeouts here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:36:31 +05:30
Madhura Jayaratne
efa4cdc1d3 Merge branch 'QA_4_4' 2015-03-24 08:22:26 +05:30
Madhura Jayaratne
c5eb730041 Merge branch 'QA_4_3' into QA_4_4 2015-03-24 08:21:35 +05:30
Madhura Jayaratne
f4ddd75bfc Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:19:33 +05:30
Madhura Jayaratne
eb73dee7c9 Fix tests; auth_type might not be defined 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 08:16:49 +05:30
Madhura Jayaratne
1001a39e4f Merge branch 'QA_4_4' 2015-03-24 08:05:31 +05:30
Madhura Jayaratne
c560f47f8d Merge branch 'QA_4_3' into QA_4_4 2015-03-24 08:02:15 +05:30
Madhura Jayaratne
db738687c6 bug #4815 Infinite calls to index.php 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-24 07:58:28 +05:30
Domen
8157ea77ee Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-03-24 02:29:36 +01:00
Marc Delisle
fffe0b9134 4.4.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-23 12:34:24 -04:00
Marc Delisle
b4ba934ac8 Merge branch 'QA_4_4' 2015-03-23 12:33:52 -04:00
Marc Delisle
624562a9c9 4.4.1-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-23 12:33:13 -04:00
Anshuman 'xLR' Verma
258af1ae55 Fixed localization issue in <database> --> Operations window 
As pointed out in Bug #4816, fixed a tiny localization issue in <database> --> Operations window

Signed-off-by: Anshuman Verma <anshuman@shuffleconnect.com>
 2015-03-23 22:00:08 +05:30
Atul Pratap Singh
35be80ca88 Merge branch 'QA_4_4' 2015-03-23 18:48:19 +05:30
Atul Pratap Singh
d86c511ed0 Merge commit '5f2d1f2' 2015-03-23 18:48:09 +05:30
Weblate
4fc71718b1 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-03-23 14:14:28 +01:00
Thiago Casotti
757cf546de Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-23 14:14:25 +01:00
Kushagra Pandey
8847df101a Handling failed AJAX requests 
Signed-off-by: Kushagra Pandey <kushagra4296@gmail.com>
 2015-03-23 18:42:23 +05:30
Marc Delisle
7d15a2a61e Translated using Weblate (French) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-03-23 12:43:55 +01:00
Madhura Jayaratne
adbd176250 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-23 15:39:22 +05:30
Madhura Jayaratne
b48f1ea52f rfe #933 Manage multiple variable in bookmarked query 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-23 15:15:28 +05:30
Smita Kumari
960834ebb1 Merge pull request #1603 from smita786/master 
added unit tests for multi-edit on central colums page plus fix coding style
 2015-03-23 13:23:55 +05:30
Kristjan Räts
76ec1d8b33 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-03-23 08:17:42 +01:00
Weblate
322947ca30 Merge remote-tracking branch 'origin/master' 2015-03-23 07:39:15 +01:00
Thiago Casotti
7305217fb6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.6% (3029 of 3040 strings)

[CI skip]
 2015-03-23 07:39:12 +01:00
Giovanni Sora
321cfdb5c1 Translated using Weblate (Interlingua) 
Currently translated at 68.8% (2093 of 3040 strings)

[CI skip]
 2015-03-23 07:39:09 +01:00
Balázs Úr
6a416b76af Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-03-23 07:39:07 +01:00
Madhura Jayaratne
856b984aec Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-03-23 12:08:12 +05:30
Madhura Jayaratne
d455d20b03 Simplify the bookmark retrieving 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-03-23 10:46:46 +05:30
Smita Kumari
2a0c5f2082 added unit tests for multi-edit on central colums page plus coding style fix 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-03-23 10:14:49 +05:30
Balázs Úr
5f2d1f2f36 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3032 of 3032 strings)

[CI skip]
 2015-03-22 21:19:58 +01:00
Παναγιώτης Παπάζογλου
e4a80bb529 Translated using Weblate (Greek) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-03-22 19:14:50 +01:00
Burak Yavuz
25d7d23d2b Translated using Weblate (Turkish) 
Currently translated at 100.0% (3040 of 3040 strings)

[CI skip]
 2015-03-22 14:26:23 +01:00
Marc Delisle
f158d80f50 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-22 07:35:51 -04:00
Marc Delisle
bb1a5bdc1b Fix caps 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-22 07:35:08 -04:00
Marc Delisle
d67fe28e3d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-22 07:31:18 -04:00