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

92766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
b853ce1df8 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-29 12:39:49 -04:00
Marc Delisle
f9a0e1e8e9 Unused code or parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-29 12:39:36 -04:00
Weblate
059a0b4aa4 Merge remote-tracking branch 'origin/master' 2014-05-29 18:24:55 +02:00
Dieter Adriaenssens
0f1811f11d Translated using Weblate (Dutch) 
Currently translated at 99.9% (2780 of 2782)
 2014-05-29 18:24:52 +02:00
Marc Delisle
93f49ab1f8 Unused code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-29 12:24:33 -04:00
Kristjan Räts
4e68b2beb0 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2782 of 2782)
 2014-05-29 16:20:52 +02:00
Domen
99e7f314a1 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2782 of 2782)
 2014-05-29 13:33:15 +02:00
Marc Delisle
9376bf580e Merge commit '785ad04' 2014-05-28 15:50:26 -04:00
Marc Delisle
cf5c337c78 Merge commit '6807d6b' 2014-05-28 15:50:18 -04:00
Marc Delisle
785ad04b38 bug #4405 Cannot import (open_basedir) 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 15:43:06 -04:00
Marc Delisle
acb348a4f6 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 12:54:41 -04:00
Marc Delisle
c7b4b1f95c Fix typos and adjust the release number for the central columns feature 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 12:47:46 -04:00
Marc Delisle
264736aa09 Merge commit '0b3ae76' 2014-05-28 12:44:39 -04:00
Weblate
6807d6b425 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-28 18:44:35 +02:00
Giovanni Sora
768a0be4c0 Translated using Weblate (Interlingua) 
Currently translated at 49.1% (1362 of 2770)
 2014-05-28 18:44:32 +02:00
Marc Delisle
252d83a632 Missing doc for savedsearches 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 12:44:07 -04:00
Marc Delisle
79a21f2eba Translated using Weblate (French) 
Currently translated at 100.0% (2782 of 2782)
 2014-05-28 18:31:49 +02:00
Weblate
ac86cb0cd3 Merge remote-tracking branch 'origin/master' 2014-05-28 18:27:06 +02:00
Giovanni Sora
160b1118ab Translated using Weblate (Interlingua) 
Currently translated at 49.2% (1371 of 2782)
 2014-05-28 18:27:02 +02:00
Michal Čihař
1e121ae7f7 Translated using Weblate (Czech) 
Currently translated at 99.6% (2772 of 2782)
 2014-05-28 18:27:00 +02:00
Marc Delisle
98bea451b4 Merge pull request #1196 from ibennetch/1528 
Feature request 1528: Documentation refers to .htaccess files that have ...
 2014-05-28 12:26:57 -04:00
Matías Bellone
7da4d58613 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2782 of 2782)
 2014-05-28 18:24:25 +02:00
Isaac Bennetch
26efcfd66a Feature request 1528: Documentation refers to .htaccess files that have been removed 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2014-05-28 10:18:30 -04:00
Burak Yavuz
6ddbfab662 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2782 of 2782)
 2014-05-28 15:08:32 +02:00
Marc Delisle
69be4d1720 Update po files 2014-05-28 08:21:29 -04:00
Marc Delisle
4627be8968 Clarify message 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-28 08:21:06 -04:00
Panagiotis Papazoglou
9a1f93bb56 Translated using Weblate (Greek) 
Currently translated at 100.0% (2783 of 2783)
 2014-05-28 13:44:21 +02:00
Michal Čihař
1fb2276e2b Fix if formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-28 10:43:33 +02:00
Madhura Jayaratne
6ef94bec20 Merge branch 'QA_4_2' 2014-05-28 14:06:44 +05:30
Weblate
0b3ae76853 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-05-28 10:36:03 +02:00
Giovanni Sora
b3d71b7669 Translated using Weblate (Interlingua) 
Currently translated at 48.3% (1338 of 2770)
 2014-05-28 10:36:00 +02:00
Kristjan Räts
832054afdb Translated using Weblate (Estonian) 
Currently translated at 100.0% (2770 of 2770)
 2014-05-28 10:35:58 +02:00
Madhura Jayaratne
511c105222 bug #4432 Error while displaying chart at server level 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-28 14:05:40 +05:30
Michal Čihař
d3fcfec4bb Consistent message strings and types for error submission 
We can share more strings on the failed error reporting and also the
messages should have same type regardless it was manual or automatic
submission.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-28 09:26:35 +02:00
Burak Yavuz
42a694db77 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2783 of 2783)
 2014-05-28 07:53:19 +02:00
Domen
82554b1cbc Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2783 of 2783)
 2014-05-27 18:50:34 +02:00
Weblate
1baaf957fa Merge remote-tracking branch 'origin/master' 2014-05-27 18:30:22 +02:00
Burak Yavuz
764153b165 Translated using Weblate (Turkish) 
Currently translated at 99.7% (2775 of 2783)
 2014-05-27 18:30:19 +02:00
Giovanni Sora
bf382181c6 Translated using Weblate (Interlingua) 
Currently translated at 48.4% (1347 of 2783)
 2014-05-27 18:30:16 +02:00
Panagiotis Papazoglou
a945e6e34b Translated using Weblate (Greek) 
Currently translated at 99.7% (2776 of 2783)
 2014-05-27 18:30:14 +02:00
Kristjan Räts
72bcb033fc Translated using Weblate (Estonian) 
Currently translated at 99.6% (2774 of 2783)
 2014-05-27 18:30:11 +02:00
Dieter Adriaenssens
448584d481 Translated using Weblate (Dutch) 
Currently translated at 99.6% (2774 of 2783)
 2014-05-27 18:30:09 +02:00
Marc Delisle
5f12a95d25 Fix undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-27 12:29:43 -04:00
Marc Delisle
bea184b6f4 Translated using Weblate (French) 
Currently translated at 100.0% (2783 of 2783)
 2014-05-27 17:07:43 +02:00
Matías Bellone
cb03160f5d Translated using Weblate (Spanish) 
Currently translated at 100.0% (2783 of 2783)
 2014-05-27 00:46:55 +02:00
Marc Delisle
cf3452b2d4 Update po files 2014-05-26 15:17:05 -04:00
Marc Delisle
1fb3ae27cf A TEXT column cannot have a default value 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-26 15:15:31 -04:00
Marc Delisle
93ce1a69de Merge pull request #1195 from smita786/gsoc_central_columns_list 
Gsoc central columns list
 2014-05-26 15:14:04 -04:00
Smita Kumari
200737bcce gsoc:central list of columns, added sync and remove column list on db_structure page 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixing indentation in mult_submits.inc.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

naming convention,typos, indentaion fix and removed unnecessory file db_sync_central_columns.php

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

check if central columns storage is configured, if not configured don't show the option to sync/remove

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove columns to central list of columns from tbl_structure page

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

added icon image for central columns add/delete

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

add/remove of columns option in tbl_structure page in columns rows depending upon if column is already present in central columns or not

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed php notices, apporiprate message when a non existing column is removed and when a existing column is added to cenral list

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

documentation added for central_columns configuration

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

regenerated sprite

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

changed central_columns table structure + modified functions to add to central column as per new tbl def

updated delete and other function as per new db structure

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

remove notices

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

sprintf for variable message

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fix unit test failure errors

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

fixed whitespace issues plus function definition

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>

refactoring code plus fixing coding style issues

Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-05-26 23:13:03 +05:30
Marc Delisle
95ab00dd76 Remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-26 10:18:34 -04:00