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

92735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
6ef94bec20 Merge branch 'QA_4_2' 2014-05-28 14:06:44 +05:30
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
Marc Delisle
7aa5dfdb6b Define variable for one possible execution path 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-26 10:09:55 -04:00
Kristjan Räts
079e1e505d Translated using Weblate (Estonian) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-26 13:37:37 +02:00
Ann + J.M
ddf78c212b Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-05-26 10:39:50 +02:00
Michal Čihař
5c79b97de8 Merge remote-tracking branch 'origin/QA_4_2' 2014-05-26 10:12:35 +02:00
Michal Čihař
7d1120b82f Translated using Weblate (Greek) 
Currently translated at 99.9% (2770 of 2772)
 2014-05-26 10:12:10 +02:00
Burak Yavuz
dccd7e2a4e Translated using Weblate (Turkish) 
Currently translated at 100.0% (2770 of 2770)
 2014-05-26 10:12:05 +02:00
Matías Bellone
8befb95c3f Translated using Weblate (Spanish) 
Currently translated at 100.0% (2770 of 2770)
 2014-05-26 10:12:01 +02:00
Giovanni Sora
f3d6d5522d Translated using Weblate (Interlingua) 
Currently translated at 48.0% (1330 of 2770)
 2014-05-26 10:11:57 +02:00
Michal Čihař
0868e06c62 Translated using Weblate (Czech) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-26 10:11:10 +02:00
Michal Čihař
a8ee0c2e8d Translated using Weblate (Czech) 
Currently translated at 100.0% (2770 of 2770)
 2014-05-26 10:09:24 +02:00
Michal Čihař
5e3994cb05 Merge remote-tracking branch 'origin/QA_4_2' 2014-05-26 09:36:16 +02:00
Weblate
d73c3410ef Merge remote-tracking branch 'origin/master' 2014-05-26 09:33:37 +02:00
Matías Bellone
86eb826eef Translated using Weblate (Spanish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-26 09:33:34 +02:00
Giovanni Sora
24519f1b6a Translated using Weblate (Interlingua) 
Currently translated at 48.0% (1331 of 2772)
 2014-05-26 09:33:31 +02:00
Michal Čihař
1b2ea7215f Don't let coverage upload failure fail the tests 
Uploading code coverage is not critical task, so it should not fail the
test.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-26 09:32:56 +02:00
Domen
1f425e7809 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 17:53:01 +02:00
Hugues Peccatte
7578978629 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-25 16:55:14 +02:00
Hugues Peccatte
aa2bb1ce9d Add possibility to add new line with shift + enter. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:54:49 +02:00
Hugues Peccatte
df0d48ec6c Fix replace of all new lines. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:54:18 +02:00
Marc Delisle
1380cf15f2 Merge pull request #1194 from ashutoshdhundhara/rfe_706 
RFE#706: Multi-db privileges adding.
 2014-05-25 10:38:16 -04:00
Weblate
c662d6cebf Merge remote-tracking branch 'origin/master' 2014-05-25 16:33:20 +02:00
Burak Yavuz
d19c34e774 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 16:33:17 +02:00
Hugues Peccatte
64926a82d2 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-05-25 16:33:03 +02:00
Hugues Peccatte
dec3e0df15 Fix datepicker issue in grid edition. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-25 16:32:28 +02:00
Burak Yavuz
f96d850202 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 16:10:24 +02:00
Ashutosh Dhundhara
51b6fc08f3 Fix merge conflict. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Conflicts:
	ChangeLog
 2014-05-25 19:27:10 +05:30
Ashutosh Dhundhara
d8134c9116 RFE#706: Multi-db privileges adding. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-05-25 19:25:36 +05:30
Claus Svalekjaer
d8dbbfeae5 Translated using Weblate (Danish) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 15:22:35 +02:00
Marc Delisle
9810813411 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-25 08:20:15 -04:00
Marc Delisle
6efaa9e166 Merge pull request #1193 from Tithugues/b4416 
Fix #4416: new lines are removed when editing
 2014-05-25 08:17:16 -04:00
Marc Delisle
14b5c6151b Translated using Weblate (French) 
Currently translated at 100.0% (2772 of 2772)
 2014-05-25 14:06:03 +02:00