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

95310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
2e8bb9d0ef CodeSniffer doesn't like this comment 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 14:04:53 +05:30
Madhura Jayaratne
53fda78de4 Remove extra variables form doc 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 14:02:53 +05:30
Madhura Jayaratne
8476800900 Align docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 14:00:15 +05:30
Michal Čihař
2224e00c84 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-10-07 09:45:57 +02:00
Weblate
ce09ec1f0f Merge remote-tracking branch 'origin/master' 2014-10-07 07:46:54 +02:00
Alexey Rubinov
a12e352916 Translated using Weblate (Russian) 
Currently translated at 99.9% (2963 of 2965 strings)

[CI skip]
 2014-10-07 07:46:52 +02:00
Madhura Jayaratne
792224b92e Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 11:16:23 +05:30
Madhura Jayaratne
a82cb7aeae Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 2014-10-07 10:45:00 +05:30
Madhura Jayaratne
2936feaad2 #4548 Inline editing a field converts tab to spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 10:44:09 +05:30
Alexey Rubinov
5db5f2a6d3 Translated using Weblate (Russian) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-07 05:35:41 +02:00
Weblate
84e531b7b4 Merge remote-tracking branch 'origin/master' 2014-10-07 02:59:36 +02:00
Alexey Rubinov
9e816eba5d Translated using Weblate (Russian) 
Currently translated at 99.6% (2955 of 2965 strings)

[CI skip]
 2014-10-07 02:59:34 +02:00
Xosé Calvo
dd72db3c89 Translated using Weblate (Galician) 
Currently translated at 79.3% (2352 of 2965 strings)

[CI skip]
 2014-10-07 02:59:33 +02:00
P
5c467a3de0 Translated using Weblate (Bulgarian) 
Currently translated at 59.7% (1773 of 2965 strings)

[CI skip]
 2014-10-07 02:59:32 +02:00
Madhura Jayaratne
adf2b0d78d Fix more failing tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 06:24:33 +05:30
Burak Yavuz
2079e9cd9a Translated using Weblate (Turkish) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-06 21:44:32 +02:00
Madhura Jayaratne
6f9381101d Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-06 23:22:11 +05:30
Madhura Jayaratne
8fa9f576fd Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-06 23:07:59 +05:30
Marc Delisle
7f99c14f5d ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-06 12:45:03 -04:00
Nisarg Jhaveri
bf63a462cc Basic autocomplete in SQL Query editor 
- Autocomplete SQL keywords using CodeMirror hint addon
- Inline, footer SQL editors are not included
- Table/Database names completion is not implemented
- Added autocompletion to console, inline SQL editor, create view dialogue
- Autocomplete on `inputRead` instead of `change` event.

Signed-off-by: Nisarg Jhaveri <nisarg.jhaveri@research.iiit.ac.in>
 2014-10-06 12:37:14 -04:00
Purodha
ebcac5adeb Translated using Weblate (Colognian) 
Currently translated at 1.0% (30 of 2768 strings)

[CI skip]
 2014-10-06 15:44:11 +02:00
Madhura Jayaratne
e7cd2a11cd Add index dialog does not open on choosing index from create table page 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-06 19:00:13 +05:30
Madhura Jayaratne
2e05422b1a Merge pull request #1368 from madhuracj/Bug4537 
bug #4537 BLOB inline-view JPG column transformation does not work for anything except simple queries
 2014-10-06 14:27:04 +05:30
Madhura Jayaratne
13155b65a2 Merge branch 'master' into Bug4537 
Conflicts:
	ChangeLog
 2014-10-06 14:25:17 +05:30
Chanaka Dharmarathna
a0f6c46292 Remove dead codes 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-06 10:42:50 +05:30
Madhura Jayaratne
65f360b33f bug #4551 Wrong test in source code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-06 10:20:47 +05:30
Marc Delisle
ba7e57196b Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-05 17:38:36 -04:00
Marc Delisle
a8d948895e Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-05 17:38:23 -04:00
Weblate
a10e64fecd Merge remote-tracking branch 'origin/master' 2014-10-05 23:32:08 +02:00
josep constanti
4749ee4e73 Translated using Weblate (Catalan) 
Currently translated at 81.6% (2420 of 2965 strings)

[CI skip]
 2014-10-05 23:32:07 +02:00
Marc Delisle
66be2f7699 Fix code execution path warning 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-05 17:31:56 -04:00
Xavier Navarro
0677cc1347 Translated using Weblate (Catalan) 
Currently translated at 85.9% (2378 of 2768 strings)

[CI skip]
 2014-10-05 19:40:47 +02:00
Xavier Navarro
043aae9dba Translated using Weblate (Catalan) 
Currently translated at 81.5% (2417 of 2965 strings)

[CI skip]
 2014-10-05 19:39:51 +02:00
Madhura Jayaratne
efa06c360b Function does not handle null values even if it was documented to handle them 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 19:13:34 +05:30
Madhura Jayaratne
69cb461454 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-04 18:49:15 +05:30
Madhura Jayaratne
d274064d54 Avoid bad line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 18:40:26 +05:30
Madhura Jayaratne
92ca4abe59 Fix bad line breaks 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 18:36:26 +05:30
Madhura Jayaratne
241aa4767a Define $sql_query in all paths 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 18:24:43 +05:30
Madhura Jayaratne
29bf47e49b Define $message in all paths 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 18:22:51 +05:30
Madhura Jayaratne
9ea91627cf 'same' and 'new' are the only choices here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 18:18:17 +05:30
Marc Delisle
03debd0a6e Refactor: we had three similar functions, refactored into just one. 
Also, these functions returned false, or a string containing the type,
but the string was only used to indirectly mean a true value; now
we explicitely return true in this case.

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-04 08:27:50 -04:00
Chanaka Dharmarathna
4e68ada908 Remove dead codes 
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
 2014-10-04 11:40:39 +05:30
Madhura Jayaratne
432790c0d9 Merge branch 'master' into Bug4537 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-04 07:17:55 +05:30
Peter Dave Hello
65791f5ecb Translated using Weblate (Traditional Chinese) 
Currently translated at 98.5% (2922 of 2965 strings)

[CI skip]
 2014-10-03 21:19:16 +02:00
Peter Dave Hello
408462c53b Translated using Weblate (Traditional Chinese) 
Currently translated at 99.9% (2766 of 2768 strings)

[CI skip]
 2014-10-03 21:18:55 +02:00
Marc Delisle
6b75bf42b0 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-03 12:32:50 -04:00
Marc Delisle
9cf0be189c Merge pull request #1367 from madhuracj/Bug4547 
Fix for bug #4547
 2014-10-03 12:30:27 -04:00
Weblate
2fedcb2280 Merge remote-tracking branch 'origin/master' 2014-10-03 17:36:35 +02:00
Xavier Navarro
6eebc21466 Translated using Weblate (Catalan) 
Currently translated at 81.5% (2417 of 2965 strings)

[CI skip]
 2014-10-03 17:36:33 +02:00
Madhura Jayaratne
c461ca6c20 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-03 21:06:10 +05:30