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

95342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
d189751262 Merge commit '536d4ef' 2014-10-08 08:45:54 -04:00
Ashutosh Dhundhara
536d4ef845 bug #4554 Grid-editing timestamp column forces datepicker. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-10-08 15:32:50 +05:30
Madhura Jayaratne
f8c1656aff Merge branch 'QA_4_2' 2014-10-07 19:36:13 +05:30
Madhura Jayaratne
01d6a06c52 Update Dummy DBI for tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:33:25 +05:30
Madhura Jayaratne
073f748e35 Merge branch 'QA_4_2' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:28:50 +05:30
Madhura Jayaratne
c77fafd0d1 Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:26:10 +05:30
Madhura Jayaratne
e93e128510 Port 'bug #3120 Events are not exported when using xml' to QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 19:23:39 +05:30
Madhura Jayaratne
795c6c6076 Update tests 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 18:50:45 +05:30
Madhura Jayaratne
a6a3ea745a This is a bug 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 18:44:17 +05:30
Madhura Jayaratne
c4001e8c62 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-07 18:33:01 +05:30
Madhura Jayaratne
3ea2e7d81f rfe #3120 Events are not exported when using xml 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 18:30:10 +05:30
Weblate
6a6ab41c60 Merge remote-tracking branch 'origin/master' 2014-10-07 14:20:56 +02:00
Michael Koch
041501487b Translated using Weblate (German) 
Currently translated at 89.4% (2651 of 2965 strings)

[CI skip]
 2014-10-07 14:20:55 +02:00
Marc Delisle
bb655d0c57 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin 2014-10-07 08:20:45 -04:00
Marc Delisle
a65ee6dac5 Merge commit 'd2b9979' 2014-10-07 08:19:40 -04:00
Marc Delisle
c94915ae92 Merge commit 'eefd44a' 2014-10-07 08:19:26 -04:00
Marc Delisle
39fe63500d Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-07 08:19:11 -04:00
Dieter Adriaenssens
b96fd99e0c Translated using Weblate (Dutch) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-07 14:19:02 +02:00
Weblate
465d672fb0 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-07 14:18:21 +02:00
Michael Koch
c1b4895f57 Translated using Weblate (German) 
Currently translated at 95.2% (2636 of 2768 strings)

[CI skip]
 2014-10-07 14:18:19 +02:00
Marc Delisle
d2b9979d03 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-07 08:17:27 -04:00
Madhura Jayaratne
8d8135893d Function name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 15:07:55 +05:30
Madhura Jayaratne
92da2c79ca Function names adhering to coding standards 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 14:33:50 +05:30
Madhura Jayaratne
9a3ac8db2f Fix function name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 14:28:37 +05:30
Madhura Jayaratne
2c8a3d21da Fix function name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 14:24:55 +05:30
Madhura Jayaratne
ce80a6a44d Add spaces around concat 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 14:06:26 +05:30
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
Weblate
eefd44a89b Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-07 07:15:35 +02:00
Alexey Rubinov
27ab463b9b Translated using Weblate (Russian) 
Currently translated at 100.0% (2768 of 2768 strings)

[CI skip]
 2014-10-07 07:15:34 +02:00
Xosé Calvo
3ffcbcb52b Translated using Weblate (Galician) 
Currently translated at 86.3% (2389 of 2768 strings)

[CI skip]
 2014-10-07 07:15:32 +02:00
josep constanti
718d02272b Translated using Weblate (Catalan) 
Currently translated at 86.0% (2381 of 2768 strings)

[CI skip]
 2014-10-07 07:15:31 +02:00
P
b240909757 Translated using Weblate (Bulgarian) 
Currently translated at 64.8% (1796 of 2768 strings)

[CI skip]
 2014-10-07 07:15:30 +02:00
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
Madhura Jayaratne
48b97ecd06 bug #4252 Database-level permission bug for db names containing underscores 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-07 08:03:39 +05:30
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