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

92539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Marc Delisle
cf743642a8 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-14 08:18:21 -04:00
Weblate
0d4c91ba33 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-14 14:16:23 +02:00
Dieter Adriaenssens
3ba9fef03c Translated using Weblate (Dutch) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-14 14:16:20 +02:00
Marc Delisle
3d98d33037 Merge pull request #1167 from D-storm/bug-4388 
Bug-4388 Disable database expansion when enabled throws Error 500
 2014-05-14 08:16:06 -04:00
Chirayu Chiripal
c3f2abe873 FR #1487: Browse Foreign Values should be modal dialog 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-05-14 17:30:11 +05:30
Burak Yavuz
f334b61242 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-14 13:58:27 +02:00
Marc Delisle
558ae8dca5 Update po files 2014-05-14 07:15:14 -04:00
Marc Delisle
0adcec8663 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-14 07:14:41 -04:00
Weblate
dfd7d3567d Merge remote-tracking branch 'origin/master' 2014-05-14 13:08:54 +02:00
Dieter Adriaenssens
3ca66bdc58 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2768 of 2768)
 2014-05-14 13:08:50 +02:00
Marc Delisle
d9a1da1237 Merge pull request #1173 from ashutoshdhundhara/rfe_1448 
RFE: #1448 Allow clicking an approximate row count to get a correct one.
 2014-05-14 07:08:45 -04:00
Michal Čihař
0d1e903386 Merge pull request #1179 from EagleErwin/patch-1 
Update config.rst
 2014-05-13 20:54:43 +02:00
Marc Delisle
6f738d5834 Merge commit '9f9d85c' 2014-05-13 12:25:32 -04:00
Weblate
78c2022199 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-13 18:25:26 +02:00
Júlio Sebastião
06c57c4820 Translated using Weblate (Portuguese) 
Currently translated at 63.2% (1751 of 2768)
 2014-05-13 18:25:23 +02:00
Marc Delisle
922cbac956 Merge commit 'f23ae33' 2014-05-13 12:25:21 -04:00