gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,990 Commits 12 Branches 481 Tags 2.4 GiB
7f7e45de6b
Commit Graph

100990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
7f7e45de6b Merge branch 'QA_4_4' 2015-07-13 06:54:21 -04:00
Marc Delisle
9bffc176fe ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-13 06:53:44 -04:00
Jack Smith
e88f290d44 Remove confusing second inline edit window (bug #4826) 
When a long truncated text field is being inline edited it pops up a second edit window which could be confusing. Removed it.

Signed-off-by: Jack Smith <devjacksmith@gmail.com>
 2015-07-13 06:52:07 -04:00
Madhura Jayaratne
f09a583368 Fix tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 16:18:00 +05:30
Madhura Jayaratne
d37fed64b6 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 16:11:12 +05:30
Madhura Jayaratne
91397b24ec Add ChangeLog entry for MySQL virtual columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 16:07:59 +05:30
Marc Delisle
da47bab407 Translated using Weblate (French) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-13 12:36:34 +02:00
Madhura Jayaratne
cb8a75b719 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-07-13 15:59:25 +05:30
Atul Pratap Singh
904a4ce9f3 html5 history improvements: check if popstate fired on load, fix token mismatch, make use of selflink 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-13 15:40:22 +05:30
Madhura Jayaratne
a3285a7cd3 Support MySQL 5.7.5 virtual columns 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-13 15:14:15 +05:30
Weblate
4f361e41fa Merge remote-tracking branch 'origin/master' 2015-07-13 10:12:02 +02:00
Smart Kid
d242b60b76 Translated using Weblate (Serbian) 
Currently translated at 23.8% (754 of 3155 strings)

[CI skip]
 2015-07-13 10:11:58 +02:00
Helder Santana
4ec1de74e6 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 95.6% (3019 of 3155 strings)

[CI skip]
 2015-07-13 10:11:54 +02:00
Giovanni Sora
a05d278527 Translated using Weblate (Interlingua) 
Currently translated at 70.2% (2215 of 3155 strings)

[CI skip]
 2015-07-13 10:11:50 +02:00
Atul Pratap Singh
8e3dc532e5 Merge branch 'QA_4_4' 2015-07-13 13:40:57 +05:30
Atul Pratap Singh
4fa27d43a6 Merge commit 'd141619' 
Conflicts:
	libraries/server_status_processes.lib.php

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-13 13:40:20 +05:30
Atul Pratap Singh
fc70a568a5 Merge commit 'b1aa8f9' 2015-07-13 13:38:05 +05:30
Weblate
6edbf61c22 Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4 2015-07-13 10:03:58 +02:00
Smart Kid
5f037b89e5 Translated using Weblate (Serbian) 
Currently translated at 25.5% (775 of 3038 strings)

[CI skip]
 2015-07-13 10:03:53 +02:00
ddrmoscow
2c6e64c49b Translated using Weblate (Russian) 
Currently translated at 97.7% (2971 of 3038 strings)

[CI skip]
 2015-07-13 10:03:49 +02:00
Helder Santana
bcffca8135 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 99.9% (3035 of 3038 strings)

[CI skip]
 2015-07-13 10:03:44 +02:00
Atul Pratap Singh
d141619c89 Merge pull request #1783 from devenbansod/1606Correction 
Fixed a small error
 2015-07-13 13:33:01 +05:30
Domen
8634d9d086 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-12 20:53:42 +02:00
Burak Yavuz
76f66363cb Translated using Weblate (Turkish) 
Currently translated at 100.0% (3155 of 3155 strings)

[CI skip]
 2015-07-12 20:15:16 +02:00
Marc Delisle
f1ef0d53a4 Update po files 
[CI skip]

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-12 11:07:30 -04:00
Marc Delisle
e9c6cb2f03 Merge pull request #1785 from nisargjhaveri/improve_debug 
Format backtrace when required, debug console
 2015-07-12 11:06:43 -04:00
Nisarg Jhaveri
01aee84315 Format backtrace when required, debug console 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-12 18:24:30 +05:30
Marc Delisle
746afa6c64 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-12 06:55:55 -04:00
Marc Delisle
0e1fcdd5bb Merge pull request #1728 from udan11/new-parser 
[WIP] Implementing sql-parser
 2015-07-12 06:54:13 -04:00
Marc Delisle
87b451b7b4 Merge pull request #1784 from nisargjhaveri/back_msg 
Show loading message on back action with html5 history API
 2015-07-12 05:59:01 -04:00
Deven Bansod
66ea438245 Fixed a small error 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-07-12 14:43:17 +05:30
Nisarg Jhaveri
0eebab6bef Show loading message on back action with html5 history API 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-07-12 14:35:46 +05:30
Dan Ungureanu
053f7fc2e9 Fixed test. 2015-07-12 00:49:49 +03:00
Atul Pratap Singh
79f7f5c9fc Changelog entry 
Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
 2015-07-12 02:58:58 +05:30
Dan Ungureanu
deada65601 Fixed exporting issues related to views. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 19:14:22 +03:00
Isaac Bennetch
384a04bf2a Changelog for pull request 1774 
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
 2015-07-11 11:48:25 -04:00
Dan Ungureanu
8d04cd5db8 Improved context detection. 
Use the delimiter specified by user.
 2015-07-11 18:10:03 +03:00
Isaac Bennetch
447a66be95 Merge pull request #1774 from devenbansod/disable_edit_for_readonly_var 
Edit link should be active only for non read-only system variables
 2015-07-11 10:51:23 -04:00
ddrmoscow
7409dec7ca Translated using Weblate (Russian) 
Currently translated at 94.0% (2976 of 3163 strings)

[CI skip]
 2015-07-11 13:08:34 +02:00
Marc Delisle
5cde4267d5 Translated using Weblate (French) 
Currently translated at 100.0% (3163 of 3163 strings)

[CI skip]
 2015-07-11 13:08:21 +02:00
Balázs Úr
b71be2cf04 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (3163 of 3163 strings)

[CI skip]
 2015-07-11 08:37:59 +02:00
Dan Ungureanu
fd1dc6d6ec Fixed wrong variable name. 
Updated sql-parser library to udan11/sql-parser@140040f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 03:37:25 +03:00
Олег Карпов
eeea1ca4a2 Translated using Weblate (Russian) 
Currently translated at 94.0% (2976 of 3163 strings)

[CI skip]
 2015-07-11 01:41:58 +02:00
ddrmoscow
84ab959f6c Translated using Weblate (Russian) 
Currently translated at 93.9% (2973 of 3163 strings)

[CI skip]
 2015-07-11 01:39:42 +02:00
Олег Карпов
06adadba23 Translated using Weblate (Russian) 
Currently translated at 93.8% (2970 of 3163 strings)

[CI skip]
 2015-07-11 01:29:39 +02:00
ddrmoscow
4fca8f97c8 Translated using Weblate (Russian) 
Currently translated at 93.8% (2967 of 3163 strings)

[CI skip]
 2015-07-11 01:25:00 +02:00
Олег Карпов
b1aa8f981e Translated using Weblate (Russian) 
Currently translated at 97.5% (2963 of 3038 strings)

[CI skip]
 2015-07-11 00:45:49 +02:00
ddrmoscow
c626ae482a Translated using Weblate (Russian) 
Currently translated at 97.4% (2962 of 3038 strings)

[CI skip]
 2015-07-11 00:44:12 +02:00
Dan Ungureanu
5fa3bdf0d1 Restore SQL mode after export with certain configuration has finished. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 00:42:16 +03:00
Domen
2442378e98 Translated using Weblate (Slovenian) 
Currently translated at 100.0% (3163 of 3163 strings)

[CI skip]
 2015-07-10 23:39:09 +02:00