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

97943 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Masahiko HISAKAWA
ddd387b51f Translated using Weblate (Japanese) 
Currently translated at 73.0% (2199 of 3012 strings)

[CI skip]
 2015-02-21 13:17:19 +01:00
Marc Delisle
9f4a2b15a4 4.3.10 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-20 07:46:04 -05:00
Marc Delisle
03c2333cf4 Merge branch 'QA_4_3' 2015-02-20 07:45:25 -05:00
Marc Delisle
06d6158104 4.3.11-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-20 07:44:57 -05:00
Madhura Jayaratne
a54da2052b Preserve tab order 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 18:06:17 +05:30
Madhura Jayaratne
c35373e8aa Track view link 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 17:53:49 +05:30
Madhura Jayaratne
7a95986644 Show milliseconds as well 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 17:17:39 +05:30
Madhura Jayaratne
2970056de6 Display actual datetime and pad the value with zeros when using calendar 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 16:20:05 +05:30
Madhura Jayaratne
1a13a5e48d Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:57:52 +05:30
Madhura Jayaratne
85aa480be7 Remove transformation related code from makegrid.js and functions.js 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:53:54 +05:30
Madhura Jayaratne
805679626a rfe #685 Editor for HTML content 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 12:41:56 +05:30
Madhura Jayaratne
de8da9da5f More sub package corrections 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:16:47 +05:30
Madhura Jayaratne
e262ca22a2 Use proper sub packages 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 11:15:18 +05:30
Madhura Jayaratne
06a95a425c Escape special chars 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:56:55 +05:30
Madhura Jayaratne
a3e3508e42 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-20 10:42:42 +05:30
Madhura Jayaratne
b7b865a248 Simplify editors 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-20 10:41:49 +05:30
Atul Pratap Singh
9f04b27b51 Merge pull request #1513 from smita786/master 
fix bug #4772 and other similar issues
 2015-02-20 00:48:41 +05:30
Smita Kumari
daf6d1e7d8 fix bug #4772 and other similar issues 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-02-20 00:23:07 +05:30
Weblate
c1da27fe74 Merge remote-tracking branch 'origin/master' 2015-02-19 19:47:42 +01:00
Sevdimali ฤฐsa
49d37bfc8c Translated using Weblate (Azerbaijani) 
Currently translated at 52.9% (1595 of 3012 strings)

[CI skip]
 2015-02-19 19:47:37 +01:00
Smita Kumari
0feeebf98c Merge pull request #1512 from smita786/master 
enum editor and pick from central column dialogues were going out of screen
 2015-02-20 00:17:33 +05:30
Marc Delisle
0ea06dc2b5 Merge branch 'QA_4_3' 2015-02-19 08:00:25 -05:00
Marc Delisle
88d3aafef1 bug #4771 Central Columns not working, showing error 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-19 07:59:46 -05:00
Smita Kumari
6413bbbb6d fix bug:enum editor and pick from central column dialogues were going out of screen 
Signed-off-by: Smita Kumari <kumarismita62@gmail.com>
 2015-02-19 18:00:12 +05:30
Madhura Jayaratne
6a9b787320 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 14:14:45 +05:30
Madhura Jayaratne
f334064cc4 Add javascript mode file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:58:49 +05:30
Madhura Jayaratne
3d3c672545 rfe #1275 CodeMirror based JSON editor as an input transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:54:57 +05:30
Madhura Jayaratne
6ee59b7eec rfe CodeMirror based SQL editor as an input transformation 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-19 13:20:32 +05:30
Weblate
c6cb3f0698 Merge remote-tracking branch 'origin/master' 2015-02-18 14:04:42 +01:00
Yohanes Edwin
810b7f4310 Translated using Weblate (Indonesian) 
Currently translated at 74.1% (2233 of 3012 strings)

[CI skip]
 2015-02-18 14:04:39 +01:00
Marc Delisle
c79aa27ca5 Merge branch 'QA_4_3' 2015-02-18 08:03:49 -05:00
Marc Delisle
e7f9076af7 Merge commit 'a1d9749' 2015-02-18 08:03:32 -05:00
Marc Delisle
07845c145e Merge commit '7ff93c1' 2015-02-18 08:03:23 -05:00
Marc Delisle
0b7db0453c Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-18 08:03:04 -05:00
Marc Delisle
a482011492 Merge commit 'e9987d8' 2015-02-18 07:58:19 -05:00
Marc Delisle
7737f8834b Merge commit '12558e7' 2015-02-18 07:57:59 -05:00
Marc Delisle
073513f879 Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3 2015-02-18 07:57:17 -05:00
Marc Delisle
a1d97497b8 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-18 07:57:07 -05:00
Weblate
7ff93c1bd2 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-02-18 13:55:39 +01:00
Yohanes Edwin
fea0c097c7 Translated using Weblate (Indonesian) 
Currently translated at 75.2% (2244 of 2982 strings)

[CI skip]
 2015-02-18 13:55:36 +01:00
Marc Delisle
d554a08c85 Merge pull request #1510 from vanarpsharma/bg4752 
Fixed bug: - Redirect to table structure page on creation of new table
 2015-02-18 07:55:23 -05:00
Pranav Sharma
a2a2c7ad29 Fixed bug: - Redirect to table structure page on creation of new table 
Signed-off-by: Pranav Sharma <vanarpsharma@gmail.com>
 2015-02-18 02:04:33 +05:30
Marc Delisle
4d425e8cf8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-17 12:48:00 -05:00
Marc Delisle
8ab8ccd786 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-17 07:57:00 -05:00
Marc Delisle
bd588112a1 Merge pull request #1504 from D-storm/bug-fkcheck 
bugfix 4770: Multiple delete on table browse ignoring foreign key checkbox
 2015-02-17 07:55:10 -05:00
Chirayu Chiripal
8de1f89922 bugfix 4770: Multiple delete on table browse ignoring foreign key checkbox 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2015-02-17 01:46:19 +05:30
Marc Delisle
3a34d0e2e8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-02-16 14:27:16 -05:00
Marc Delisle
a065320fa4 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2015-02-16 11:55:50 -05:00
Madhura Jayaratne
dd8e7d6417 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-02-16 19:05:25 +05:30
Madhura Jayaratne
e9c9bcc72a Fix persisting column visibility to permanent storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-02-16 19:04:11 +05:30