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

90455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atul Pratap Singh
c5dc4419ef Merge branch 'QA_4_1' 2014-03-04 17:58:00 +05:30
Atul Pratap Singh
1101b21568 changelog entry for 4307 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-04 17:50:12 +05:30
Atul Pratap Singh
fb070815b2 Merge pull request #997 from smita786/bugfix-4307 
bug fix #4307
 2014-03-04 12:15:07 +05:30
Smita Kumari
5e2023ce77 Fix bug#4307 Nav: "Columns" wont expand with specific schema 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-04 12:10:24 +05:30
Marc Delisle
ef959d182f ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 15:04:24 -05:00
Marc Delisle
239c1b3296 Merge pull request #993 from omerjerk/QA_4_1 
#4308 Stop edit routine form being submitted with enter
 2014-03-03 15:03:10 -05:00
Burak Yavuz
8d36d4c2c1 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2753 of 2753)
 2014-03-03 19:42:47 +01:00
Umair Khan
a0429a872c #4308 Stop edit routine form being submitted with enter 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2014-03-03 23:41:41 +05:30
Marc Delisle
4c3b3f4879 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-03-03 12:40:43 -05:00
Chanaka Indrajith
d1a5409280 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-03-03 23:08:58 +05:30
Chanaka Indrajith
c85426e343 Added some space between database lavel tabs and content 
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
 2014-03-03 23:03:52 +05:30
Matías Bellone
f895eeddc0 Translated using Weblate (Spanish) 
Currently translated at 100.0% (2753 of 2753)
 2014-03-03 17:40:11 +01:00
Michal Čihař
43fd87e28a Update po files 2014-03-03 16:13:45 +01:00
Michal Čihař
33d36ae694 Update year in documentation copyright 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 16:13:04 +01:00
Michal Čihař
21bf9c12e9 Upgrade tcpdf to 6.0.062 
Changes:

6.0.062 (2014-03-02)
	- The method startLayer() now accepts the NULL value for the $print parameter to not set the print layer option.

6.0.061 (2014-02-18)
	- Bug #893 "Parsing error on streamed xref for secured pdf" was fixed.

6.0.060 (2014-02-16)
	- Bug #891 "Error on parsing hexa fields" was fixed.
	- Bug #892 "Parsing pdf with trailing space at start" was fixed.

6.0.059 (2014-02-03)
	- SVG 'use' support was imporved.

6.0.058 (2014-01-31)
	- Bug #886 "Bugs with SVG using <defs> and <use>" was fixed.

6.0.057 (2014-01-26)
	- Bug #883 "Parsing error" was fixed.

6.0.056 (2014-01-25)
	- The automatic cache folder selection now works also with some restricted hosting environments.
	- CSS text-transform property is now supported (requires the multibyte string library for php) - see examle n. 061 (Thanks to Walter Ferraz).
	- Bug #884 "Parsing error prev tag looking for" was fixed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 16:11:03 +01:00
Marc Delisle
bf9a8c4265 Merge branch 'QA_4_1' 2014-03-03 08:26:52 -05:00
Marc Delisle
834dab485e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 08:26:28 -05:00
Marc Delisle
1340c61090 Merge commit 'be06786' 2014-03-03 08:22:19 -05:00
Marc Delisle
17c017a5cd Merge commit '54220a3' 2014-03-03 08:22:10 -05:00
Marc Delisle
d555558709 Merge commit 'cc7f1bf' 2014-03-03 08:22:01 -05:00
Marc Delisle
58c12fe876 Merge commit '908df2a' 2014-03-03 08:21:52 -05:00
Marc Delisle
c8e5fc5f8c Merge commit '3e5fb52' 2014-03-03 08:21:41 -05:00
Marc Delisle
be06786420 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 08:19:04 -05:00
Marc Delisle
54220a34b3 Merge pull request #992 from smita786/QA_4_1 
bug fix #4040
 2014-03-03 08:18:15 -05:00
Marc Delisle
b809e36836 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-03 08:10:24 -05:00
Smita Kumari
cc7f1bf1f9 bug fix #4040:Since we are not reseting theme on reset settings, so removed the block that were unsetting theme in seesion 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-03 18:38:36 +05:30
Michal Čihař
bff6f471a9 Expand More menu here as well 
It can happend that Operations tab is hidden in the menu.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 10:02:30 +01:00
Michal Čihař
5a7bf6e001 Show default value for number of fields 
We fall back to this value when it's not filled in, so it's better to
show it in the form as well.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 09:55:10 +01:00
Michal Čihař
908df2a243 Merge pull request #986 from omerjerk/QA_4_1 
BugFix #4305
 2014-03-03 09:33:51 +01:00
Michal Čihař
cb8daa44d7 Merge remote-tracking branch 'origin/QA_4_1' 2014-03-03 09:31:27 +01:00
Michal Čihař
f319824b54 Fix regexp to match 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 09:30:51 +01:00
Michal Čihař
6cbde74c25 Test encoded binary output 
Otherwise PHP sometimes refuses to match binary content using PCRE.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-03 09:30:44 +01:00
Michal Čihař
3f9c963abe Merge remote-tracking branch 'origin/QA_4_1' 2014-03-03 09:28:55 +01:00
Michal Čihař
f95010d9c2 Merge pull request #981 from mebjas/QA_4_1 
Testcases for PMA_ConfigTest modified
 2014-03-03 09:28:00 +01:00
Michal Čihař
a4b179f2d7 Merge pull request #989 from dhananjay92/minor_improvements 
Display session expiry msg after auto-redirect.
 2014-03-03 09:26:14 +01:00
Dhananjay Nakrani
76c57710f0 Display session expiry msg after auto-redirect. 
Signed-off-by: Dhananjay Nakrani <dhananjaynakrani@gmail.com>
 2014-03-03 11:49:17 +05:30
Umair Khan
3e5fb52959 BugFix #4305 
Signed-off-by: Umair Khan <omerjerk@gmail.com>
 2014-03-02 22:22:58 +05:30
Marc Delisle
17dea6dda9 Merge branch 'QA_4_1' 2014-03-02 09:41:34 -05:00
Marc Delisle
51a981c4b4 Merge commit '1c481a5' 2014-03-02 09:41:25 -05:00
Marc Delisle
93db7fac2d Merge commit 'd2dbe10' 2014-03-02 09:41:13 -05:00
Marc Delisle
b50ed1aac4 Merge commit '65e24c0' 2014-03-02 09:41:02 -05:00
Marc Delisle
8c795aede7 Merge commit '089b382' 2014-03-02 09:40:49 -05:00
Atul Pratap Singh
872e4d039b Merge branch 'QA_4_1' 2014-03-03 01:33:29 +05:30
Atul Pratap Singh
15539d4d7d Fix bugs#4302: Some params are being omitted from microhistory 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-03-02 23:48:37 +05:30
Atul Pratap Singh
c98b4a1d17 Merge pull request #985 from vpowerrc/master 
fixed #4300 Grid edit textfield: can't place cursor or select text with ...
 2014-03-02 19:57:46 +05:30
Marc Delisle
44cb913b40 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-02 09:26:06 -05:00
Marc Delisle
1c481a54ae Merge pull request #966 from smita786/QA_4_1 
bug fix #4298:ImportCSV options UI validation includes "Columns separate...
 2014-03-02 09:25:53 -05:00
Smita Kumari
d2dbe10b5a unbinding keyup event 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-03-02 18:44:05 +05:30
Weblate
043a007c66 Merge remote-tracking branch 'origin/master' 2014-03-02 13:42:46 +01:00
Anders Jonsson
79cdc9ebe1 Translated using Weblate (Swedish) 
Currently translated at 99.5% (2739 of 2752)
 2014-03-02 13:42:42 +01:00