gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,003 Commits 12 Branches 481 Tags 2.4 GiB
58a8e37de4
Commit Graph

82003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
58a8e37de4 Comment about the best place to include CodeMirror 2013-04-01 07:44:03 -04:00
Marc Delisle
f29d9bccbf Merge pull request #223 from kasunchathuranga/Bug3835 
Fix bug #3835 Disabling CodeMirror in GUI settings does not actually dis...
 2013-04-01 04:37:14 -07:00
Weblate
08e5a81805 Merge remote-tracking branch 'origin/master' 2013-04-01 13:06:04 +02:00
Burak Yavuz
eb874c3851 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2606 of 2606)
 2013-04-01 13:05:56 +02:00
Marc Delisle
29b297f41f Fix bug "#3853 Blowfish implementation might be broken" by replacing the 
library with phpseclib

I could not make PMA_blowfish_test.php work with the new library.
 2013-04-01 07:04:25 -04:00
Marc Delisle
7b7abce116 Clarify the logic 2013-04-01 06:44:42 -04:00
Kasun Chathuranga
71e96e7590 Fix bug #3835 Disabling CodeMirror in GUI settings does not actually disable it 2013-03-31 16:30:48 +05:30
Weblate
f412fa7a02 Merge remote-tracking branch 'origin/master' 2013-03-30 14:46:04 +01:00
Hamlet Muradyan
6d74f50426 Translated using Weblate (Armenian) 
Currently translated at 4.3% (112 of 2606)
 2013-03-30 14:45:59 +01:00
Chanaka Indrajith
4c59ac5dd9 Merge pull request #218 from phpfaber/master 
Fix favicon disappearing in Firefox when setting location.hash
 2013-03-30 06:45:52 -07:00
PHP Faber
ed11f037d8 Renamed function to fit camel case methods naming. 2013-03-30 12:44:02 +02:00
Marc Delisle
a746469e97 Unnecessary loop 2013-03-30 06:10:59 -04:00
Aputsiaq Niels Janussen
1e5d225bba Translated using Weblate (Danish) 
Currently translated at 100.0% (2606 of 2606)
 2013-03-30 01:34:29 +01:00
Marc Delisle
118c0e2195 English improvement 2013-03-29 13:18:49 -04:00
Marc Delisle
79ebabd607 English improvement 2013-03-29 13:18:12 -04:00
Marc Delisle
321c96269c English improvement 2013-03-29 13:17:49 -04:00
Marc Delisle
a64455da57 English improvement 2013-03-29 13:17:11 -04:00
Marc Delisle
9c0d1a20af English improvement 2013-03-29 13:15:55 -04:00
Marc Delisle
d0a7dd7b3a English improvement 2013-03-29 13:14:00 -04:00
Marc Delisle
857631f92f Fix merge conflict 2013-03-29 10:42:07 -04:00
Marc Delisle
71d5dab030 Merge branch 'QA_3_5' 2013-03-29 10:41:34 -04:00
Marc Delisle
93070c081c Use HTML5 DOCTYPE 2013-03-29 10:41:05 -04:00
Marc Delisle
7f16f91b3b Fix merge conflicts 2013-03-29 08:18:12 -04:00
Marc Delisle
e7257bbce1 Merge branch 'QA_3_5' 2013-03-29 08:17:19 -04:00
Marc Delisle
b6d2403339 ChangeLog entry for bug #3705 Attempt to open trigger for edit gives NULL 2013-03-29 08:15:30 -04:00
Weblate
398d1415cd Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 2013-03-29 13:06:28 +01:00
Yungu Kim
1a0480dbe8 Translated using Weblate (Korean) 
Currently translated at 51.4% (1318 of 2562)
 2013-03-29 13:06:25 +01:00
Xavier Navarro
ca59b5965d Translated using Weblate (Catalan) 
Currently translated at 100.0% (2562 of 2562)
 2013-03-29 13:06:22 +01:00
Rouslan Placella
b177571c24 Merge branch 'QA_3_5' 
Conflicts:
	po/ca.po
	po/ms.po
	po/nb.po
 2013-03-29 12:05:01 +00:00
Nikolay Ermolovich
45af9e1869 Update rte_triggers.lib.php 
Editing a trigger with special characters
 2013-03-29 12:03:59 +00:00
Marc Delisle
808b66ec95 Merge pull request #222 from hisamith/missing_error_message_add_existing_column_3857 
Fixed #3857 Missing error message when adding an existing column
 2013-03-29 04:41:36 -07:00
Samith Dassanayake
f838877819 Fixed #3857 Missing error message when adding an existing column 2013-03-29 16:45:12 +05:30
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
Ahmad Zulhilmi Idris
a776aa5743 Translated using Weblate (Malay) 
Currently translated at 14.5% (371 of 2562)
 2013-03-29 09:22:04 +01: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
Xavier Navarro
9ce300ef7b Translated using Weblate (Catalan) 
Currently translated at 100.0% (2562 of 2562)
 2013-03-27 14:44:52 +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