gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81,966 Commits 12 Branches 481 Tags 2.4 GiB
217abdf5d2
Commit Graph

81966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
217abdf5d2 Merge remote-tracking branch 'origin/master' 2013-03-29 11:44:27 +01:00
Yungu Kim
5d731c1877 Translated using Weblate (Korean) 
Currently translated at 49.2% (1281 of 2606)
 2013-03-29 11:44:23 +01:00
Rouslan Placella
67da3c14eb Merge pull request #221 from Rupreht/patch-1 
Update rte_triggers.lib.php
 2013-03-29 03:43:55 -07:00
Nikolay Ermolovich
5d40cb1af0 Update rte_triggers.lib.php 
Editing a trigger with special characters
 2013-03-29 16:29:14 +06:00
Madhura Jayaratne
cdb85e28cf Display the error returned by MySQL rather than the ambiguous "Error" message. 2013-03-28 18:56:37 +05:30
Madhura Jayaratne
b4d8e07a37 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Conflicts:
	libraries/Util.class.php
 2013-03-28 17:41:41 +05:30
Madhura Jayaratne
b3db1f0d6f Change mysqlDie() to return the error message when $exit parameter is false 2013-03-28 17:34:40 +05:30
Marc Delisle
a0e85f3cdc Incorrect comment 2013-03-28 07:47:12 -04:00
Michal Čihař
868cf1d8b3 Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (2606 of 2606)
 2013-03-28 12:20:31 +01:00
Madhura Jayaratne
71d5c80d6a Do not show table as tracked if request for deactivation has been submitted 2013-03-28 16:05:30 +05:30
Madhura Jayaratne
daab514238 Bug #3858 Incomplete error message when creating a foreign key constraint 2013-03-28 15:34:31 +05:30
Marc Delisle
51806056bd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-03-27 12:38:26 -04:00
Xavier Navarro
077cd492c2 Translated using Weblate (Catalan) 
Currently translated at 100.0% (2606 of 2606)
 2013-03-27 17:28:27 +01:00
Marc Delisle
b5c7c6f3a3 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-03-27 07:57:46 -04:00
Marc Delisle
f9497c9baf Bug #3863 The column name 'name' is a MySQL reserved keyword. 2013-03-27 07:57:29 -04:00
Weblate
727ef13df6 Merge remote-tracking branch 'origin/master' 2013-03-27 12:42:47 +01:00
Ahmad Zulhilmi Idris
e42c9fb68a Translated using Weblate (Malay) 
Currently translated at 13.8% (359 of 2606)
 2013-03-27 12:42:41 +01:00
Marc Delisle
786e569b4f 4.0.0-beta3 2013-03-27 07:42:21 -04:00
Madhura Jayaratne
3d5484736a Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-03-26 20:01:01 +05:30
Madhura Jayaratne
aebceda7ac #3861 Errors while editing foreign constraints 2013-03-26 19:59:48 +05:30
Weblate
8a6a36e1ee Merge remote-tracking branch 'origin/master' 2013-03-26 12:49:35 +01:00
Stian Berg
52599874bd Translated using Weblate (Norwegian Bokmål) 
Currently translated at 72.4% (1887 of 2606)
 2013-03-26 12:49:30 +01:00
Marc Delisle
6ec9b8336b Fix merge conflicts 2013-03-26 07:49:12 -04:00
Marc Delisle
b1c4c6efd7 Merge branch 'QA_3_5' 2013-03-26 07:48:45 -04:00
Marc Delisle
e7dbc50a19 Correctly detect older and newer Safari 2013-03-26 07:48:24 -04:00
Marc Delisle
c7d32bf649 Adjust tests for new Safari detection 2013-03-25 20:09:45 -04:00
Marc Delisle
7d2d883966 Fix merge conflicts 2013-03-25 19:57:27 -04:00
Weblate
bac24e611d Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-03-26 00:52:32 +01:00
Anders Jonsson
1c3044b23c Translated using Weblate (Swedish) 
Currently translated at 100.0% (2562 of 2562)
 2013-03-26 00:52:29 +01:00
Ahmad Zulhilmi Idris
4d651cae1a Translated using Weblate (Malay) 
Currently translated at 14.2% (363 of 2562)
 2013-03-26 00:52:26 +01:00
Marc Delisle
dcbba59bcc Merge branch 'QA_3_5' 2013-03-25 19:51:47 -04:00
Marc Delisle
f97b2ee8d2 Bug #3854 Incorrect header for Safari 6.0 2013-03-25 19:50:24 -04:00
Marc Delisle
a1344cffe2 Bug #3839 Index comment is supported only starting with MySQL 5.5 2013-03-25 19:43:29 -04:00
Madhura Jayaratne
8254d3eaf6 Check whether operands are identical. Otherwise 0 makes the condition true 2013-03-25 21:03:52 +05:30
Yungu Kim
c6b535880e Translated using Weblate (Korean) 
Currently translated at 51.2% (1312 of 2562)
 2013-03-25 15:22:05 +01:00
Weblate
4d829c9204 Merge remote-tracking branch 'origin/master' 2013-03-25 15:21:26 +01:00
Ahmad Zulhilmi Idris
34036e35ed Translated using Weblate (Malay) 
Currently translated at 13.5% (353 of 2606)
 2013-03-25 15:21:23 +01:00
Marc Delisle
e95268bced Bug #3856 Runs out of memory when changing fields 2013-03-25 10:20:43 -04:00
Marc Delisle
2d2732da42 Translated using Weblate (French) 
Currently translated at 100.0% (2562 of 2562)
 2013-03-25 12:22:05 +01:00
Dieter Adriaenssens
8c7c8cc3be Translated using Weblate (Dutch) 
Currently translated at 100.0% (2606 of 2606)
 2013-03-25 09:48:19 +01:00
Kristjan Räts
28acc5e897 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2606 of 2606)
 2013-03-24 19:37:28 +01:00
Madhura Jayaratne
67d9ff9e5e Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2013-03-24 22:53:55 +05:30
yondonjamts rentsendorj
9c7642c666 Translated using Weblate (Mongolian) 
Currently translated at 29.0% (743 of 2562)
 2013-03-24 18:22:12 +01:00
Madhura Jayaratne
8768dc7a18 3847 Renaming a table does not display the query 2013-03-24 22:51:17 +05:30
Weblate
bf92bfdf2a Merge remote-tracking branch 'origin/master' 2013-03-24 16:24:14 +01:00
Anders Jonsson
3d0b7cf813 Translated using Weblate (Swedish) 
Currently translated at 100.0% (2606 of 2606)
 2013-03-24 16:24:11 +01:00
Yungu Kim
c24b390446 Translated using Weblate (Korean) 
Currently translated at 48.8% (1273 of 2606)
 2013-03-24 16:24:08 +01:00
Aputsiaq Niels Janussen
3f698d5e3e Translated using Weblate (Danish) 
Currently translated at 100.0% (2605 of 2606)
 2013-03-24 16:24:03 +01:00
Madhura Jayaratne
9179139753 Remove extra spaces 2013-03-24 20:53:12 +05:30
Madhura Jayaratne
54623503e4 bug #3703 Incorrect updating of the list of users 2013-03-24 20:50:40 +05:30