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

88928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Pratap Singh
bdd53902f4 Merge commit 'ad415fe' 
Conflicts:
	js/navigation.js
 2014-01-10 00:01:18 +05:30
Marc Delisle
93d0174751 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-01-09 06:40:08 -05:00
Marc Delisle
4ad48947f7 Refactor: new PMA_getDescriptionAndTitle() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-09 06:39:40 -05:00
Weblate
ff3c4c0816 Merge remote-tracking branch 'origin/master' 2014-01-09 12:22:11 +01:00
Marc Delisle
20da1d306e Missing right title 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-09 06:19:18 -05:00
Domen
e19ffa78d1 Translated using Weblate (Slovenian) 
Currently translated at 96.3% (2652 of 2752)
 2014-01-09 12:12:20 +01:00
Marc Delisle
6894e6d7e8 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-09 05:58:44 -05:00
Weblate
993023de91 Merge remote-tracking branch 'origin/master' 2014-01-08 21:31:08 +01:00
Gyeongsu Han
0ff8e826fb Translated using Weblate (Korean) 
Currently translated at 66.6% (1835 of 2752)
 2014-01-08 21:29:24 +01:00
J.M
fd07580a3b Merge branch 'QA_4_1' 2014-01-08 21:24:36 +01:00
J.M
917c26703f Finish 4222-create-db-missing-collation-col 2014-01-08 21:22:50 +01:00
J.M
999c90368d Add ChangeLog entry for bug #4223 
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-01-08 21:22:09 +01:00
J.M
e1b34a538f Add missing collation column when creating a db 
Signed-off-by: J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-01-08 21:18:48 +01:00
Atul Pratap Singh
ad415feb09 Remove redundant code and simplify: auto-expand/highlight 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-08 22:45:11 +05:30
Matรญas Bellone
9c6b46fb0e Translated using Weblate (Spanish) 
Currently translated at 100.0% (2738 of 2738)
 2014-01-08 17:15:10 +01:00
Panagiotis Papazoglou
f561002b3f Translated using Weblate (Greek) 
Currently translated at 100.0% (2749 of 2749)
 2014-01-08 16:47:35 +01:00
Weblate
56af7a55ac Merge remote-tracking branch 'origin/master' 2014-01-08 15:30:38 +01:00
Marc Delisle
f405caa82a ChangeLog entry for rfe 1466 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-08 09:25:55 -05:00
Marc Delisle
77b2467193 Merge pull request #838 from sachith500/master 
(Feature Request 1466 : Refactoring)
 2014-01-08 06:24:17 -08:00
Weblate
7ee2a34c38 Merge remote-tracking branch 'origin/master' 2014-01-08 15:17:32 +01:00
Sachith Hasaranga Seneviratne
4e28aa1a81 (Feature Request 1466) 
Refactor PMA_Util::getLatestVersion() and PMA_sendErrorReport()
to further reuse curl_handle option setting code.

Signed-off-by: Sachith Seneviratne sachith500@gmail.com
 2014-01-08 19:08:18 +05:30
Madhura Jayaratne
89fb7bac4a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-01-08 18:57:21 +05:30
Madhura Jayaratne
3c9f6a6890 Space around . operator - mroe instances 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:56:30 +05:30
Weblate
10388da775 Merge remote-tracking branch 'origin/master' 2014-01-08 14:21:34 +01:00
Marc Delisle
1938454134 Improve variable names 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-08 08:19:23 -05:00
Weblate
7f6b72640c Merge remote-tracking branch 'origin/master' 2014-01-08 13:40:51 +01:00
Madhura Jayaratne
74aebe629b Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 18:06:02 +05:30
Weblate
339fde0a58 Merge remote-tracking branch 'origin/master' 2014-01-08 13:04:13 +01:00
Lakshmanan M
ba1f5e9301 Translated using Weblate (English (United Kingdom)) 
Currently translated at 93.2% (2565 of 2752)
 2014-01-08 12:59:15 +01:00
Madhura Jayaratne
84e9ce4946 Spaces around . operator 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 17:26:27 +05:30
Weblate
2965986bd1 Merge remote-tracking branch 'origin/master' 2014-01-08 10:07:48 +01:00
Lakshmanan M
8d6c22d059 Translated using Weblate (Tamil) 
Currently translated at 15.3% (418 of 2727)
 2014-01-08 10:07:39 +01:00
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Weblate
1b36d577ab Merge remote-tracking branch 'origin/master' 2014-01-08 06:42:48 +01:00
Madhura Jayaratne
f9474075a2 Add missing sub menu name 2014-01-08 10:49:15 +05:30
Madhura Jayaratne
8594491b12 Coding style fixes 2014-01-08 10:34:31 +05:30
Weblate
5f90b3f1df Merge remote-tracking branch 'origin/master' 2014-01-08 05:35:39 +01:00
Madhura Jayaratne
b079b18e79 Merge branch 'QA_4_1' 2014-01-08 10:02:37 +05:30
Madhura Jayaratne
0157919c5b ChangeLog entry for bug #3780 2014-01-08 09:57:58 +05:30
Madhura Jayaratne
9e32dddb93 Merge pull request #835 from zixtor/QA_4_1 
Fix bug#3780: Allow aborting ajax request if user clicks on new link in ...
 2014-01-07 20:24:41 -08:00
Weblate
522c15b5d9 Merge remote-tracking branch 'origin/master' 2014-01-07 22:54:59 +01:00
Hugues Peccatte
72bd0d259b Merge pull request #836 from Tithugues/phpcsConcatRule 
New phpcs rule for concatenation.
 2014-01-07 13:50:45 -08:00
Hugues Peccatte
97549678e3 Merge pull request #837 from Tithugues/fixPU 
Fix unit test.
 2014-01-07 13:49:48 -08:00
Nicolas Giraud
e8ce44761e Remove author. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-07 21:22:55 +01:00
Hugues Peccatte
33cc76d3c3 Fix unit test. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-07 21:16:18 +01:00
Nicolas Giraud
80448a1fd8 New phpcs rule for concatenation. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-01-07 19:03:20 +01:00
Atul Pratap Singh
43f250096e Fix bug#3780: Allow aborting ajax request if user clicks on new link in time 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-07 22:59:33 +05:30
Weblate
b7850748e6 Merge remote-tracking branch 'origin/master' 2014-01-07 16:16:29 +01:00
Marc Delisle
ca35186ea4 Remove 2013 entries 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-07 10:15:09 -05:00
Marc Delisle
501da983b1 Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-07 10:14:01 -05:00