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

95363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
dbf5533376 Refactor code duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-09 10:01:15 -04:00
Madhura Jayaratne
b71e7a0599 Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2014-10-09 12:29:54 +05:30
Madhura Jayaratne
f399b3f2ee Add a ChangeLog entry for bug #3165 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 12:27:42 +05:30
Weblate
bd9d791157 Merge remote-tracking branch 'origin/master' 2014-10-09 08:18:43 +02:00
Burak Yavuz
72a631235c Translated using Weblate (Turkish) 
Currently translated at 100.0% (2965 of 2965 strings)

[CI skip]
 2014-10-09 08:18:41 +02:00
Michael Koch
f09c4a3281 Translated using Weblate (German) 
Currently translated at 98.4% (2919 of 2965 strings)

[CI skip]
 2014-10-09 08:18:40 +02:00
josep constanti
181c54f436 Translated using Weblate (Catalan) 
Currently translated at 82.0% (2433 of 2965 strings)

[CI skip]
 2014-10-09 08:18:38 +02:00
Madhura Jayaratne
70994d4cce Merge branch 'QA_4_2' 2014-10-09 11:47:39 +05:30
Madhura Jayaratne
cbcacb0f0a Merge branch 'MAINT_4_2_9' into QA_4_2 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-10-09 11:44:22 +05:30
Weblate
5f8d081411 Merge remote-tracking branch 'origin/master' 2014-10-08 14:48:24 +02:00
Michael Koch
6a658f0410 Translated using Weblate (German) 
Currently translated at 90.2% (2677 of 2965 strings)

[CI skip]
 2014-10-08 14:48:23 +02:00
Marc Delisle
3ace78d638 Merge branch 'QA_4_2' 2014-10-08 08:46:48 -04:00
Marc Delisle
1795aece1a Merge commit '21032ab' 2014-10-08 08:46:41 -04:00
Marc Delisle
d189751262 Merge commit '536d4ef' 2014-10-08 08:45:54 -04:00
Marc Delisle
de12f8359a ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-10-08 08:45:05 -04:00
Weblate
21032ab3b1 Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2 2014-10-08 14:42:45 +02:00
Michael Koch
dc3cabd654 Translated using Weblate (German) 
Currently translated at 95.2% (2637 of 2768 strings)

[CI skip]
 2014-10-08 14:42:44 +02:00
Marc Delisle
92efd1f7e1 Merge pull request #1374 from ashutoshdhundhara/bug_4554 
bug #4554 Grid-editing timestamp column forces datepicker.
 2014-10-08 08:42:34 -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