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

97023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Madhura Jayaratne
fac655454f Merge branch 'master' of github.com:phpmyadmin/phpmyadmin 2015-01-06 14:47:51 +05:30
Madhura Jayaratne
e0baf5fb5f Access only the elements in the array 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 14:46:41 +05:30
Weblate
fe77111053 Merge remote-tracking branch 'origin/master' 2015-01-06 10:00:20 +01:00
Martin Lacina
c36d347b9d Translated using Weblate (Slovak) 
Currently translated at 76.4% (2287 of 2990 strings)

[CI skip]
 2015-01-06 10:00:17 +01:00
Madhura Jayaratne
b9b42270a5 Merge branch 'QA_4_3' 2015-01-06 14:29:44 +05:30
Madhura Jayaratne
6f771f20bb Merge branch 'QA_4_3' of github.com:phpmyadmin/phpmyadmin into QA_4_3 2015-01-06 14:28:08 +05:30
Madhura Jayaratne
ba4dd00f88 bug #4687 Designer breaks without configuration storage 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 14:26:54 +05:30
Weblate
62763a4b88 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-06 08:59:06 +01:00
Martin Lacina
d682ca8c36 Translated using Weblate (Slovak) 
Currently translated at 76.5% (2280 of 2979 strings)

[CI skip]
 2015-01-06 08:59:04 +01:00
Madhura Jayaratne
a65e7fb0fc Undefined index notices while configuring recent and favorite tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-06 13:14:46 +05:30
Marc Delisle
5f815f4844 4.3.5 release 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:16:52 -05:00
Marc Delisle
968e723693 Merge commit '7562aad' 2015-01-05 10:16:00 -05:00
Marc Delisle
7562aadc40 4.3.6-dev 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:15:22 -05:00
Marc Delisle
0f3e58bf2e Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:08:05 -05:00
Marc Delisle
c6bf4d61bc Clarifications 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:04:09 -05:00
Isaac Bennetch
7e3309fc2a User documentation for Zero Configuration 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-05 10:00:37 -05:00
Marc Delisle
495250f8cb Merge branch 'QA_4_3' 2015-01-04 15:34:42 -05:00
Marc Delisle
d18c1e25f5 Merge commit '3777e0a' 2015-01-04 15:34:36 -05:00
Marc Delisle
89de2f6227 Merge commit 'cf4d945' 2015-01-04 15:34:24 -05:00
Marc Delisle
440afe2423 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 15:33:45 -05:00
Weblate
3777e0a198 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-04 21:32:48 +01:00
Ann + J.M
760c61d78c Translated using Weblate (German) 
Currently translated at 100.0% (2979 of 2979 strings)

[CI skip]
 2015-01-04 21:32:45 +01:00
Marc Delisle
63bf881f26 Merge pull request #1447 from Tithugues/b4416_qa43 
Fix #4416 New lines are removed when grid editing
 2015-01-04 15:32:41 -05:00
Hugues Peccatte
763707a72e Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-04 15:19:09 +01:00
Ann + J.M
db0327cd59 Translated using Weblate (German) 
Currently translated at 100.0% (2992 of 2992 strings)

[CI skip]
 2015-01-04 15:11:11 +01:00
Marc Delisle
56baec6160 Merge branch 'QA_4_3' 2015-01-04 07:35:26 -05:00
Marc Delisle
459f1a6c16 ChangeLog entry 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-04 07:34:46 -05:00
Marc Delisle
964881b40d Merge remote-tracking branch 'madhuracj/zeroconf' into QA_4_3 2015-01-04 07:32:31 -05:00
Weblate
fb4cd93fde Merge remote-tracking branch 'origin/master' 2015-01-04 13:14:05 +01:00
Yong Kim
a331e33bc8 Translated using Weblate (Korean) 
Currently translated at 82.5% (2472 of 2993 strings)

[CI skip]
 2015-01-04 13:14:02 +01:00
Balázs Úr
f7d397e01a Translated using Weblate (Hungarian) 
Currently translated at 99.3% (2975 of 2993 strings)

[CI skip]
 2015-01-04 13:14:00 +01:00
Marc Delisle
1ca21634a8 Merge commit '741c4ab' 2015-01-04 07:13:30 -05:00
Marc Delisle
6eb92ff103 Merge commit 'fc6be4a' 2015-01-04 07:11:47 -05:00
Marc Delisle
bfea12fcaf Merge commit 'a29ee38' 2015-01-04 07:11:21 -05:00
Weblate
741c4ab958 Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-04 13:10:07 +01:00
Yong Kim
489c378318 Translated using Weblate (Korean) 
Currently translated at 82.8% (2471 of 2982 strings)

[CI skip]
 2015-01-04 13:10:04 +01:00
Balázs Úr
8033864970 Translated using Weblate (Hungarian) 
Currently translated at 99.3% (2964 of 2982 strings)

[CI skip]
 2015-01-04 13:10:02 +01:00
Marc Delisle
c99765a098 Merge pull request #1446 from Tithugues/b4645_2_qa43 
Fix #4645 and #4682
 2015-01-04 07:09:52 -05:00
Madhura Jayaratne
9c097139ef This note does not make sense anymore since tables are no longer created automatically without asked by the user. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-04 16:09:58 +05:30
Madhura Jayaratne
9beef68341 Do not unset configuration storage details here 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-01-04 16:05:45 +05:30
Hugues Peccatte
cf4d94527c Fix #4416 New lines are removed when grid editing 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 22:40:54 +01:00
Hugues Peccatte
fc6be4a7bd Update ChangeLog. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:42:32 +01:00
Hugues Peccatte
561ec7ea30 Remove code to ignore commit. 
Fix comment.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 21:39:56 +01:00
Hugues Peccatte
4330110c90 Revert "Fix #4645 Import of export created with mysqldump" 
This reverts commit 2dcb1c9b0a.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-01-03 19:53:09 +01:00
Marc Delisle
a824169cbd Fix param doc 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-03 10:09:38 -05:00
Marc Delisle
7cefae4d5c Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-03 10:06:14 -05:00
Marc Delisle
aae2bcf6e6 Remove unnecessary display mode 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-01-03 09:35:09 -05:00
Marc Delisle
eb37dccbb2 Merge branch 'QA_4_3' 2015-01-03 07:31:41 -05:00
Marc Delisle
6f02c1b308 Merge commit '0be22a8' 2015-01-03 07:31:32 -05:00
Weblate
a29ee3897a Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3 2015-01-03 13:31:26 +01:00