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

95216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chirayu Chiripal
b9996c5657 Give credits to GSoC 2014 students 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-10-01 23:23:32 +05:30
Marc Delisle
ebf59b62b8 Merge commit '9cb2f3e' 2014-10-01 12:26:13 -04:00
Weblate
1814c53e5f Merge remote-tracking branch 'origin/master' 2014-10-01 17:13:59 +02:00
Kristjan Räts
b5bceca386 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2964 of 2964)

[ci skip]
 2014-10-01 17:13:55 +02:00
Atul Pratap Singh
7d23ba3439 Merge commit '01c7f4e3f1433fb7365413f4e8dc5fea57e8fd76' 2014-10-01 20:43:20 +05:30
Atul Pratap Singh
6c83a2f2e3 Merge commit 'a020eac11a26977295cf2439ddd2e5b4af2c88fe' 
Conflicts:
	js/config.js
	js/db_search.js
	js/functions.js
	js/makegrid.js
	js/server_privileges.js
	js/tbl_structure.js
 2014-10-01 20:42:21 +05:30
Marc Delisle
ff4be7ee5a Bug 4544: additional fix for 4.2.x 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:31:41 -04:00
Marc Delisle
f152146abe [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php
 2014-10-01 08:31:07 -04:00
Marc Delisle
7ff7929a8e Merge commit 'dbdd905' 2014-10-01 08:22:38 -04:00
Marc Delisle
9cb2f3e29e Bug 4544: additional fix for 4.2.x 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:20:37 -04:00
Marc Delisle
6c9c0b5dbf [security] XSS with malicious ENUM values 
Signed-off-by: Marc Delisle <marc@infomarc.info>

Conflicts:
	libraries/Util.class.php

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-01 08:20:23 -04:00
Madhura Jayaratne
5bc5382e05 Pass table to check privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 17:12:58 +05:30
Madhura Jayaratne
dcf2750796 Enable Execute link based on EXECUTE privilege 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 17:02:52 +05:30
Madhura Jayaratne
6e63321db9 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-01 17:01:19 +05:30
Madhura Jayaratne
ebf2d25ea0 Avoid notices due to lack of privileges 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 14:15:16 +05:30
Weblate
08ee730250 Merge remote-tracking branch 'origin/master' 2014-10-01 10:34:58 +02:00
Robert Readman
b00f88f073 Translated using Weblate (English (United Kingdom)) 
Currently translated at 91.4% (2711 of 2964)

[ci skip]
 2014-10-01 10:34:55 +02:00
Madhura Jayaratne
ca59b4910b Since editing a procedure involved dropping and recreating, check also for CREATE ROUTINE privilege to avoid lost procedures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 14:04:30 +05:30
Madhura Jayaratne
2f46112f24 Disable new link when there is no privilege to create procedure 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-01 13:52:12 +05:30
Weblate
01c7f4e3f1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-01 06:31:13 +02:00
Robert Readman
ba37e2641a Translated using Weblate (English (United Kingdom)) 
Currently translated at 100.0% (2768 of 2768)

[ci skip]
 2014-10-01 06:31:11 +02:00
Atul Pratap Singh
a020eac11a Add js checks in multiple files if data is undefined 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-01 10:00:54 +05:30
Robert Readman
dbdd90511b Translated using Weblate (English (United Kingdom)) 
Currently translated at 90.1% (2494 of 2768)

[ci skip]
 2014-10-01 06:09:20 +02:00
Robert Readman
1122ed52ec Translated using Weblate (English (United Kingdom)) 
Currently translated at 82.6% (2449 of 2964)

[ci skip]
 2014-10-01 06:07:21 +02:00
Smita Kumari
fd6e7cf4e1 resolve merge conflict 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-01 01:04:19 +05:30
Smita Kumari
34682045bd Merge pull request #1364 from smita786/QA_4_2 
Fix bug #4545
 2014-10-01 00:39:56 +05:30
Smita Kumari
179285bb61 bug fix #4545 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-01 00:16:14 +05:30
Marc Delisle
45d234f638 Adapt to PMA_String 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-30 13:20:19 -04:00
Marc Delisle
faafea0bd1 Merge branch 'QA_4_2' 2014-09-30 13:14:14 -04:00
Marc Delisle
6aab860fd6 Merge commit 'd21b4c0' 2014-09-30 13:14:06 -04:00
Marc Delisle
58cc1e5ae2 bug #4543 Changing column name can break saved "order by" clause 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-30 13:13:21 -04:00
Chirayu Chiripal
5c67267a11 Merge pull request #1363 from D-storm/export 
fix export with more than 1000 input fields (db/table/column alias)
 2014-09-29 22:35:08 +05:30
Marc Delisle
c326107d13 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-29 12:40:10 -04:00
Chirayu Chiripal
aae1b30d62 fix export with more than 1000 input fields (db/table/column alias) 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-09-29 18:50:12 +05:30
Michal Čihař
8ad314d1f0 Do not pretend that sprintf in javascript supports ordering 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-09-29 11:19:35 +02:00
Marc Delisle
cbb03aea4a Add the --stable option to explicitely mark a version as stable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-28 07:53:28 -04:00
Marc Delisle
7a83b16df9 Fix test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-27 12:47:01 -04:00
Marc Delisle
4314444675 Refactor duplicate code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-27 12:42:55 -04:00
Weblate
74709bb48e Merge remote-tracking branch 'origin/master' 2014-09-27 15:46:22 +02:00
Internationalization Ro
3cda5c959c Translated using Weblate (Romanian) 
Currently translated at 60.9% (1808 of 2964)

[ci skip]
 2014-09-27 15:46:18 +02:00
Marc Delisle
cd2225c997 Merge branch 'QA_4_2' 2014-09-27 09:14:31 -04:00
Marc Delisle
b9faa2a2e2 Merge commit '911d852' 2014-09-27 09:14:23 -04:00
Weblate
d21b4c03fd Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-09-27 15:13:27 +02:00
Internationalization Ro
834f8ec51f Translated using Weblate (Romanian) 
Currently translated at 62.4% (1729 of 2768)

[ci skip]
 2014-09-27 15:13:24 +02:00
Marc Delisle
deea8c6946 bug in PDF export: title not present in PDF 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-27 08:39:00 -04:00
Marc Delisle
127e014930 Fix parameter type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-26 12:46:27 -04:00
Marc Delisle
b92a156739 Fix parameter type; remove unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-26 08:13:47 -04:00
Marc Delisle
6fd724cb24 Refactor duplicate code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-09-25 11:57:28 -04:00
Marc Delisle
ac08019ef4 Merge branch 'QA_4_2' 2014-09-25 08:18:43 -04:00
Marc Delisle
e54fe41bea Merge commit '91a919e' 2014-09-25 08:18:34 -04:00