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

95288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Madhura Jayaratne
482fc39e5c Add missing quotes 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 21:03:14 +05:30
Weblate
72e7423eb2 Merge remote-tracking branch 'origin/master' 2014-10-03 17:01:23 +02:00
Xavier Navarro
360018e0f4 Translated using Weblate (Catalan) 
Currently translated at 81.2% (2409 of 2965 strings)

[CI skip]
 2014-10-03 17:01:22 +02:00
Atul Pratap Singh
54f4af1d88 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-03 20:31:00 +05:30
Smita Kumari
127a476be2 Merge pull request #1369 from smita786/master 
fix mousemove conflict:bug#4549
 2014-10-03 19:47:23 +05:30
Atul Pratap Singh
a28bfa948b Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-03 19:40:44 +05:30
Smita Kumari
2ee9898f20 fix mousemove conflict:bug#4549 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2014-10-03 19:35:17 +05:30
Madhura Jayaratne
3eda46b33e Warn about missing indexes on column 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 19:08:38 +05:30
Atul Pratap Singh
035e34021a Add licencing info to js/sprintf.js from https://github.com/kvz/phpjs/blob/master/LICENSE.txt 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 19:04:26 +05:30
Madhura Jayaratne
4518d667be Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 18:53:48 +05:30
Madhura Jayaratne
8a410119cd rfe #1542 Better error reporting in Designer 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 18:50:15 +05:30
Atul Pratap Singh
c70e109bd6 Feature#1546 Replace js sprintf library with a better one 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2014-10-03 17:08:25 +05:30
Madhura Jayaratne
db2c928f12 Scroll to the top when sub menus are created 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 10:24:54 +05:30
Madhura Jayaratne
7027bcf3d1 Cleanup edit privilege functionality 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 09:48:15 +05:30
Madhura Jayaratne
6355df8f3b Cleanup add user functionality 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-03 07:04:03 +05:30
Domen
92f774216a Translated using Weblate (Slovenian) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-03 02:20:18 +02:00
Weblate
3871608889 Merge remote-tracking branch 'origin/master' 2014-10-02 18:59:43 +02:00
Burak Yavuz
547e193ac3 Translated using Weblate (Turkish) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-02 18:59:42 +02:00
Xavier Navarro
bcc8df3182 Translated using Weblate (Catalan) 
Currently translated at 78.4% (2327 of 2965 strings)

[CI skip]
 2014-10-02 18:59:41 +02:00
Marc Delisle
c937d2a9eb Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-02 12:59:30 -04:00