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

88749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sachith Hasaranga Seneviratne
45b30c130f Refactor PMA_Util::getLatestVersion() and PMA_sendErrorReport() (Feature Request 1466) 
Signed-off-by: Sachith Seneviratne sachith500@gmail.com
 2014-01-05 09:11:04 +05:30
Madhura Jayaratne
53c72f42cb Merge branch 'QA_4_1' 2014-01-04 15:10:39 +05:30
Madhura Jayaratne
8bab3325b3 Size = Data_length + Index_length 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-04 15:00:01 +05:30
Madhura Jayaratne
e792ff9288 Merge branch 'QA_4_1' 2014-01-04 13:14:55 +05:30
Madhura Jayaratne
4dda8970d1 Preserve table_type and table_group parameters when sorting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-04 13:11:30 +05:30
Madhura Jayaratne
5c0329034b Merge branch 'QA_4_1' 2014-01-04 12:32:08 +05:30
Atul Pratap Singh
f258c1fc3f Merge branch 'QA_4_1' 2014-01-04 17:51:14 +05:30
Atul Pratap Singh
e499344194 Enable hovering, marking of columns via sticky header also 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 17:45:40 +05:30
Atul Pratap Singh
2850e9f484 On resizing and rearranging columns, update sticky header 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 17:22:08 +05:30
Atul Pratap Singh
7b8dff2550 [Backporting to QA_4_1 from master] Turn off user select while rearranging columns 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-01-04 16:58:22 +05:30
Madhura Jayaratne
52376ce3dc Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-04 12:24:56 +05:30
Madhura Jayaratne
022c5b8685 No regex search is needed 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-04 12:23:43 +05:30
Madhura Jayaratne
3b5043da39 Merge branch 'QA_4_1' 2014-01-04 08:21:02 +05:30
Weblate
62481f3e31 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-04 03:45:37 +01:00
Madhura Jayaratne
d579fcee97 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-01-04 08:13:44 +05:30
sand wedge
d833b401a8 Translated using Weblate (Kazakh) 
Currently translated at 12.9% (355 of 2749)
 2014-01-04 03:42:15 +01:00
Madhura Jayaratne
cc38e422dc Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1 2014-01-04 08:08:46 +05:30
Madhura Jayaratne
ab693b3c5d bug #4212 Table "disappears" if it has the same name as its tablegroup 2014-01-04 07:59:42 +05:30
Berikbol Zharylkassyn
062437dfbe Translated using Weblate (Kazakh) 
Currently translated at 12.5% (345 of 2749)
 2014-01-03 21:14:01 +01:00
Weblate
a6b849b1b0 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-01-03 19:08:03 +01:00
Michal Čihař
3a66ea7735 Translated using Weblate (Telugu) 
Currently translated at 12.1% (335 of 2749)
 2014-01-03 19:07:09 +01:00
Michal Čihař
d2714f4fa5 Translated using Weblate (Malay) 
Currently translated at 13.7% (378 of 2749)
 2014-01-03 19:04:11 +01:00
Marc Delisle
870561686d Merge branch 'QA_4_1' 2014-01-03 13:02:14 -05:00
Michal Čihař
9f94fe1701 Translated using Weblate (Kurdish Sorani) 
Currently translated at 19.2% (530 of 2749)
 2014-01-03 19:01:49 +01:00
Michal Čihař
dac0097226 Translated using Weblate (Bengali) 
Currently translated at 90.6% (2492 of 2749)
 2014-01-03 19:01:01 +01:00
Michal Čihař
4279871e8e Translated using Weblate (Afrikaans) 
Currently translated at 12.0% (331 of 2749)
 2014-01-03 19:00:21 +01:00
Marc Delisle
157154f20d bug #3885 Additional fix for this bug 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-03 13:00:02 -05:00
Madhura Jayaratne
ee398a1de0 Doc comment improvements 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-03 21:25:52 +05:30
Michal Čihař
83ec30c3e0 Update po files 2014-01-03 14:52:09 +01:00
Weblate
fbdc165525 Merge remote-tracking branch 'origin/master' 2014-01-03 14:40:15 +01:00
Michal Čihař
9cf54519e5 Translated using Weblate (Telugu) 
Currently translated at 12.1% (335 of 2750)
 2014-01-03 14:37:48 +01:00
Michal Čihař
0572b0dc58 Translated using Weblate (Malay) 
Currently translated at 13.7% (377 of 2751)
 2014-01-03 14:35:35 +01:00
Michal Čihař
35c00bf010 Translated using Weblate (Kurdish Sorani) 
Currently translated at 19.2% (529 of 2751)
 2014-01-03 14:34:54 +01:00
Michal Čihař
45c97dde48 Translated using Weblate (Dutch) 
Currently translated at 99.9% (2749 of 2751)
 2014-01-03 14:34:18 +01:00
Michal Čihař
1e2d09468c Translated using Weblate (Bengali) 
Currently translated at 90.4% (2487 of 2751)
 2014-01-03 14:33:18 +01:00
Michal Čihař
fc59a6faea Translated using Weblate (Afrikaans) 
Currently translated at 11.9% (330 of 2751)
 2014-01-03 14:32:46 +01:00
Michal Čihař
04b6181bf0 Better error message on renaming table 
Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-01-03 14:32:02 +01:00
Michal Čihař
6102a559d0 Consistently end long descriptions with full stop 
Otherwise it looks mixed up in the interface and translators tend to add
them in translations.

Signed-off-by: Michal Čihař <mcihar@suse.cz>
 2014-01-03 14:31:55 +01:00
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