gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,405 Commits 12 Branches 481 Tags 2.4 GiB
609c0acaf3
Commit Graph

91405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Delisle
609c0acaf3 Merge commit 'b82fe09' 2014-04-12 07:28:17 -04:00
Marc Delisle
be7f34d546 Merge commit '5d9bcd3' 2014-04-12 07:28:08 -04:00
Marc Delisle
d6592b5eb2 Fix merge conflicts 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:27:53 -04:00
Marc Delisle
8ef8fbfbc8 Merge commit '2df8cdb' 2014-04-12 07:18:39 -04:00
Marc Delisle
b82fe0977e ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-12 07:10:26 -04:00
Marc Delisle
5d9bcd360c Merge pull request #1136 from ashutoshdhundhara/bugfix_4357 
Bug Fix: #4357 JS Form is sumitted on "enter" even if focus is inside a select field.
 2014-04-12 07:08:26 -04:00
Michal Čihař
e82c1b2e09 Add CSPAllow to script-src as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-12 11:43:06 +02:00
Ashutosh Dhundhara
6e241b8411 Bug Fix: #4357 JS Form is sumitted on "enter" even if focus is inside a select field. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Removed TODO tag from comment in rte.js

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-12 10:40:04 +05:30
Weblate
2df8cdb207 Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-04-11 19:18:44 +02:00
Kai-Ove Finvold
16f9cd7761 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 66.9% (1842 of 2750)
 2014-04-11 19:18:41 +02:00
Michal Čihař
39d04a9057 Translated using Weblate (German) 
Currently translated at 99.9% (2749 of 2750)
 2014-04-11 19:18:39 +02:00
Marc Delisle
9a1099eaee Merge commit 'd542180' 2014-04-11 13:17:46 -04:00
Marc Delisle
2129098824 Merge commit '1842f13' 2014-04-11 13:17:37 -04:00
Marc Delisle
26e33dd4f2 Merge commit '2e5f178' 2014-04-11 13:17:27 -04:00
Marc Delisle
72f0507841 Merge commit 'f220ef2' 2014-04-11 13:17:15 -04:00
Marc Delisle
d542180fb1 Remove unneeded test 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 13:16:28 -04:00
Marc Delisle
1842f13488 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 13:02:57 -04:00
Marc Delisle
2e5f178024 Merge pull request #1135 from ashutoshdhundhara/bug_4356 
Bug Fix: #4356 GROUPed selects show number of rows as if not grouped.
 2014-04-11 13:00:01 -04:00
Ashutosh Dhundhara
f220ef2c72 Bug Fix: #4356 GROUPed selects show number of rows as if not grouped. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Minor fix for group_by_clause condition.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-11 22:08:31 +05:30
Marc Delisle
f46865c660 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-11 09:34:51 -04:00
Marc Delisle
cccddfe80b 4.2.0-alpha2 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-10 19:10:37 -04:00
Ann + J.M
06a6fc627d Update menu item translation for consistency 
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
 2014-04-10 22:20:54 +02:00
Weblate
03f943ed38 Merge remote-tracking branch 'origin/master' 2014-04-10 20:01:01 +02:00
Kai-Ove Finvold
31030630e0 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 59.2% (1638 of 2765)
 2014-04-10 20:00:58 +02:00
Marc Delisle
7662b5459b Merge pull request #1134 from ashutoshdhundhara/create_table_notices 
Bug Fix: Notices on table create page.
 2014-04-10 14:00:55 -04:00
Ashutosh Dhundhara
acbdaecf00 Bug Fix: Notices on table create page. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-10 22:53:32 +05:30
Weblate
26d49eb959 Merge remote-tracking branch 'origin/master' 2014-04-10 17:30:23 +02:00
Michal Čihař
4ac57f42ad Translated using Weblate (Swedish) 
Currently translated at 98.0% (2710 of 2765)
 2014-04-10 17:30:21 +02:00
Michal Čihař
957b09ae2a Translated using Weblate (Korean) 
Currently translated at 74.7% (2067 of 2765)
 2014-04-10 17:30:18 +02:00
Michal Čihař
d4301c1537 Translated using Weblate (Indonesian) 
Currently translated at 76.6% (2120 of 2765)
 2014-04-10 17:30:17 +02:00
Michal Čihař
274cc71673 Translated using Weblate (Hungarian) 
Currently translated at 87.4% (2417 of 2765)
 2014-04-10 17:30:15 +02:00
Marc Delisle
fb96545044 Merge commit '5fb647c' 2014-04-10 11:29:37 -04:00
Marc Delisle
d73ce2f52f Merge commit 'a2fa1aa' 2014-04-10 11:29:24 -04:00
Marc Delisle
b4b0ee5b68 Merge commit '2558b3b' 2014-04-10 11:29:12 -04:00
Marc Delisle
5fb647cb83 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-04-10 11:27:54 -04:00
Weblate
a2fa1aa1ef Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1 2014-04-10 17:18:54 +02:00
Michal Čihař
e1acfb1203 Translated using Weblate (Swedish) 
Currently translated at 99.8% (2747 of 2750)
 2014-04-10 17:18:52 +02:00
Michal Čihař
f17c814361 Translated using Weblate (Korean) 
Currently translated at 78.5% (2161 of 2750)
 2014-04-10 17:18:49 +02:00
Michal Čihař
e9a01ad655 Translated using Weblate (Indonesian) 
Currently translated at 79.9% (2198 of 2750)
 2014-04-10 17:18:47 +02:00
Michal Čihař
3a58c1ec70 Translated using Weblate (Hungarian) 
Currently translated at 98.0% (2697 of 2750)
 2014-04-10 17:18:46 +02:00
Marc Delisle
ac4ca3f3a5 Merge pull request #1132 from ashutoshdhundhara/bug_4359 
Bug Fix: #4359 Notices on create table page.
 2014-04-10 11:18:44 -04:00
Marc Delisle
5b8f6ba18e Translated using Weblate (French) 
Currently translated at 100.0% (2765 of 2765)
 2014-04-10 16:48:52 +02:00
Michal Čihař
295e688eaf Try to fix wrong stripping of request variables 
- the list of walked array keys can not be static as this can prevent of
  processing of some elements
- we need to flag all processed elements as after reordering they can
  come again
 2014-04-10 13:31:55 +02:00
Michal Čihař
a3e05a32ef Add test for double call of PMA_arrayWalkRecursive 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-10 13:30:44 +02:00
Michal Čihař
2fa4a0084c Simplify condition for running stripslashes 
- get_magic_quotes_gpc is always present in supported PHP versions
- get_magic_quotes_gpc returns false since PHP 5.4.0 where related
  setting has been removed

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-04-10 13:30:44 +02:00
Ashutosh Dhundhara
2558b3b044 Bug Fix: #4359 Notices on create table page. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-04-10 16:13:54 +05:30
Weblate
65e592757c Merge remote-tracking branch 'origin/master' 2014-04-10 12:13:22 +02:00
Kristjan Räts
e2a6cc09aa Translated using Weblate (Estonian) 
Currently translated at 100.0% (2765 of 2765)
 2014-04-10 12:13:19 +02:00
Marc Delisle
f895eedaa6 Merge commit 'f7c1399' 2014-04-10 06:12:32 -04:00
Marc Delisle
9115548f00 Merge commit 'abe4702' 2014-04-10 06:12:01 -04:00