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

92556 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
ffe8277a2e Merge commit '0dbbab8' 2014-05-16 12:20:38 -04:00
Marc Delisle
152ed86bad Merge commit '0d4d696' 2014-05-16 12:20:25 -04:00
Domen
0da801575e Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2771 of 2771)
 2014-05-16 17:17:55 +02:00
Isaac Bennetch
0dbbab8fdc Merge pull request #1169 from D-storm/bug-4392 
Bug #4392: Cannot see databases in nav panel on databases grouping when ...
 2014-05-16 09:54:43 -04:00
Isaac Bennetch
5789c674a4 Merge pull request #1184 from D-storm/bug-4417 
Bug Fix #4417,#4403: Single-clicking a foreign key causes JS error
 2014-05-16 08:47:21 -04:00
Marc Delisle
1a5292e081 Merge commit '453178b' 2014-05-16 07:54:08 -04:00
Marc Delisle
a2978c43d6 Merge commit 'fa1a290' 2014-05-16 07:54:00 -04:00
Marc Delisle
b9b06845ff Merge commit '7f445f9' 2014-05-16 07:53:38 -04:00
Marc Delisle
453178b9cd ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 07:53:05 -04:00
Marc Delisle
fa1a290948 Merge pull request #1183 from D-storm/bug-4411 
Bug fix #4411 : Fixed ProtectBinary behaviour on insert operation
 2014-05-16 07:51:16 -04:00
Marc Delisle
ebb14cb085 Another case of notice 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 07:43:57 -04:00
Marc Delisle
afc755f31c Avoid notice of undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-16 07:33:24 -04:00
Chirayu Chiripal
e9a9f442a8 Bug Fix #4417,#4403: Single-clicking a foreign key causes JavaScript error 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-16 10:52:48 +05:30
Marc Delisle
9a81facf41 Merge commit '1365435' 2014-05-15 12:50:16 -04:00
Marc Delisle
62533b7ae9 Merge commit '1fd2567' 2014-05-15 12:50:04 -04:00
Marc Delisle
06d0e5c5dd Merge commit '1a3c958' 2014-05-15 12:49:50 -04:00
Atul Pratap Singh
1a3c958f39 Add datepicker to monmitor log analyzer 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-05-16 02:29:14 +05:30
Marc Delisle
66d1284b0a Merge commit 'fcd437c' 2014-05-15 12:49:37 -04:00
Marc Delisle
3031996acf Merge commit 'aa2c9cd' 2014-05-15 12:47:50 -04:00
Marc Delisle
13654357ff ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-15 12:47:06 -04:00
Marc Delisle
1fd2567e23 Merge remote-tracking branch 'D-storm/Bug-4414' into QA_4_2 2014-05-15 12:42:45 -04:00
Isaac Bennetch
572032bc1f ChangeLog entry for https://github.com/phpmyadmin/phpmyadmin/pull/1180 2014-05-15 12:14:36 -04:00
Weblate
ebad795ac5 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-15 17:35:31 +02:00
Anders Jonsson
fcd437cd21 Translated using Weblate (Swedish) 
Currently translated at 99.9% (2767 of 2768)
 2014-05-15 17:35:28 +02:00
Edie Johnny
95aab308e9 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-15 17:35:26 +02:00
Chirayu Chiripal
7f445f99e3 Bug fix #4411 Protect Binary when set to no in settings still does not allow insert binary data 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>

test case fix

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-15 20:05:52 +05:30
Isaac Bennetch
7cb14af8f3 Merge pull request #1180 from D-storm/FR-1487 
FR #1487: Browse Foreign Values should be modal dialog
 2014-05-15 09:29:19 -04:00
Marc Delisle
e114f7d4ea Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-15 08:17:48 -04:00
Marc Delisle
665423047a Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-15 08:17:00 -04:00
Marc Delisle
86f6fb71ac Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-15 06:19:01 -04:00
Marc Delisle
5fe99023d7 Add explanation for CSS load order 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-15 06:18:42 -04:00
Weblate
30d4cd3302 Merge remote-tracking branch 'origin/master' 2014-05-15 12:15:31 +02:00
Anders Jonsson
9450527860 Translated using Weblate (Swedish) 
Currently translated at 99.8% (2767 of 2772)
 2014-05-15 12:15:28 +02:00
Domen
dec5b44f4d Translated using Weblate (Slovenian) 
Currently translated at 99.9% (2769 of 2771)
 2014-05-15 12:15:25 +02:00
Edie Johnny
0074765411 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-15 12:15:22 +02:00
Giovanni Sora
4237469878 Translated using Weblate (Interlingua) 
Currently translated at 47.7% (1322 of 2771)
 2014-05-15 12:15:19 +02:00
Kristjan Räts
c910207524 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2771 of 2771)
 2014-05-15 12:15:16 +02:00
Marc Delisle
0db0ef0e0d Merge pull request #1176 from D-storm/custom-css 
jquery-ui css should have low priority over phpmyadmin.css.php
 2014-05-15 06:15:09 -04:00
Chirayu Chiripal
aa2c9cd5d6 Bug fix #4414 table display of performance_schema DB structure 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-15 15:09:26 +05:30
Claus Svalekjaer
b467318b07 Translated using Weblate (Danish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-15 01:16:22 +02:00
Edie Johnny
3925da9660 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-14 20:17:11 +02:00
Marc Delisle
01f5dfa3f3 Translated using Weblate (French) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-14 18:18:47 +02:00
Dieter Adriaenssens
60663173ff Translated using Weblate (Dutch) 
Currently translated at 100.0% (2771 of 2771)
 2014-05-14 16:45:48 +02:00
Kristjan Räts
a348ef7135 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2771 of 2771)
 2014-05-14 15:56:21 +02:00
Panagiotis Papazoglou
a16dc3cba0 Translated using Weblate (Greek) 
Currently translated at 100.0% (2771 of 2771)
 2014-05-14 15:15:44 +02:00
Marc Delisle
ba2ebe2d6c Merge commit '1deac8f' 2014-05-14 08:21:18 -04:00
Marc Delisle
0e339dcb64 Merge commit 'cf74364' 2014-05-14 08:20:55 -04:00
Marc Delisle
095f6ad235 Merge commit '0d4c91b' 2014-05-14 08:20:44 -04:00
Marc Delisle
c8294ac3d4 Merge commit 'dac3175' 2014-05-14 08:19:59 -04:00
Marc Delisle
1deac8fa43 Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2 2014-05-14 08:18:30 -04:00