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

94917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
0ce81cfcea Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-27 08:23:39 -04:00
Marc Delisle
f87d02177e Merge pull request #1343 from Chanaka/RFE-1502 
rfe-1502 : Smart sorting for int keys
 2014-08-27 08:21:31 -04:00
Weblate
2fcba195ec Merge remote-tracking branch 'origin/master' 2014-08-26 18:45:09 +02:00
Nabin Ghimire
bd38f699e0 Translated using Weblate (Nepali) 
Currently translated at 1.8% (54 of 2962)

[ci skip]
 2014-08-26 18:45:07 +02:00
Marc Delisle
531dac4784 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-26 12:44:55 -04:00
Chanaka Dharmarathna
7969336d04 rfe-1502 : Smart sorting for int keys 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-08-26 21:44:05 +05:30
Madhura Jayaratne
8d95c4ec4f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-26 17:43:53 +05:30
Madhura Jayaratne
03f3ad8144 Hide PDF page related icon in visual builder 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-26 17:43:18 +05:30
Marc Delisle
72a9acd469 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-08-26 08:05:57 -04:00
Marc Delisle
b520496b5c Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-26 08:03:25 -04:00
Weblate
1c3ce48692 Merge remote-tracking branch 'origin/master' 2014-08-26 13:59:16 +02:00
Alex Smirnov
c814159c9c Translated using Weblate (Russian) 
Currently translated at 99.7% (2954 of 2962)

[ci skip]
 2014-08-26 13:59:13 +02:00
Nabin Ghimire
0c7777733e Translated using Weblate (Nepali) 
Currently translated at 1.4% (42 of 2962)

[ci skip]
 2014-08-26 13:59:11 +02:00
Marc Delisle
ab46427606 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-26 07:58:58 -04:00
Marc Delisle
3e891622d2 Merge commit '5b749b8' 2014-08-26 07:57:29 -04:00
Marc Delisle
0241cba09b Merge commit 'ae88c8d' 2014-08-26 07:57:11 -04:00
Marc Delisle
2e37de57ca Fix undefined variable notice; fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-26 07:54:38 -04:00
Madhura Jayaratne
94961e8e5c Remove spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-26 17:18:58 +05:30
Madhura Jayaratne
17a56337c5 Value of the passed parameter is 'editPage' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-26 17:09:29 +05:30
Kristjan Räts
042fc65a9d Translated using Weblate (Estonian) 
Currently translated at 100.0% (2962 of 2962)

[ci skip]
 2014-08-26 09:16:24 +02:00
Matías Bellone
4406e045b4 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2962 of 2962)

[ci skip]
 2014-08-26 00:55:49 +02:00
Domen
8ada670235 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2962 of 2962)

[ci skip]
 2014-08-26 00:13:29 +02:00
Weblate
ff88073755 Merge remote-tracking branch 'origin/master' 2014-08-25 18:43:48 +02:00
Giovanni Sora
e039d3dbd3 Translated using Weblate (Interlingua) 
Currently translated at 61.4% (1820 of 2962)

[ci skip]
 2014-08-25 18:43:44 +02:00
Weblate
5b749b8c4c Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-08-25 18:42:20 +02:00
Marc Delisle
407c0493d8 Merge branch 'QA_4_2' 2014-08-25 12:42:19 -04:00
கணேஷ் குமார்
ae88c8daad Translated using Weblate (Tamil) 
Currently translated at 37.3% (1033 of 2768)

[ci skip]
 2014-08-25 18:42:16 +02:00
Marc Delisle
ac7a6cee32 bug #4522 Duplicate column names while assigning index 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-25 12:41:51 -04:00
Dieter Adriaenssens
db229c0aa8 Translated using Weblate (Dutch) 
Currently translated at 98.4% (2915 of 2962)

[ci skip]
 2014-08-25 18:23:17 +02:00
Marc Delisle
33c23aeb5b Translated using Weblate (French) 
Currently translated at 100.0% (2962 of 2962)

[ci skip]
 2014-08-25 18:22:59 +02:00
Burak Yavuz
9cedf0a58f Translated using Weblate (Turkish) 
Currently translated at 100.0% (2962 of 2962)

[ci skip]
 2014-08-25 14:46:26 +02:00
Marc Delisle
0494644aa4 Update po files 2014-08-25 08:08:12 -04:00
Marc Delisle
6cadd6ef31 Improve messages 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-25 08:07:42 -04:00
Michal Čihař
6c6a25ea69 Merge remote-tracking branch 'weblate-master/master' 
Conflicts:
	test/classes/schema/Pdf_Relation_Schema_test.php
 2014-08-25 12:28:37 +02:00
Michal Čihař
4e13d22703 Add Nepali language 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-08-25 12:25:44 +02:00
Marc Delisle
12ceeed2d0 Refactoring db print view 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-24 17:04:46 -04:00
Marc Delisle
7ee56a7d60 Add test before using htmlspecialchars() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-24 14:02:35 -04:00
Madhura Jayaratne
a908121b59 Fix more failing tests 2014-08-24 21:56:35 +05:30
Madhura Jayaratne
ef3da7a79e Fix more failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 21:52:34 +05:30
Madhura Jayaratne
bd378db70d Fix db fast filters 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 21:37:13 +05:30
Madhura Jayaratne
c33374e243 Fix failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 21:31:05 +05:30
Marc Delisle
8c234c1b49 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-24 07:55:29 -04:00
Madhura Jayaratne
dc8f2c5606 Properly mark saved status for new pages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:58:13 +05:30
Madhura Jayaratne
b5e87c6281 Use page number in filename 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:36:39 +05:30
Madhura Jayaratne
86ba7a95c0 Append page number to file name only if it is set 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:32:38 +05:30
Madhura Jayaratne
36f7b18ee1 Align docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:20:05 +05:30
Madhura Jayaratne
59f93153c5 Change confusing variable name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 08:18:55 +05:30
Madhura Jayaratne
681bca3560 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-08-24 07:36:53 +05:30
Madhura Jayaratne
e5f1c6d8bf Simplify schema exporting 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-08-24 07:36:10 +05:30
Marc Delisle
ec98368ec7 Avoid warning from PHP Analyzer 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-08-23 09:13:37 -04:00