Commit Graph

381 Commits

Author SHA1 Message Date
Dieter Adriaenssens
1c582e4cb9 improve users/user groups table description 2014-02-03 13:32:57 +01:00
Michal Čihař
619dc110d0 Use official name for configuration storage in a message
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 12:13:38 +01:00
Michal Čihař
085b51dba8 Correct punctuation for sentences
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:44:58 +01:00
Michal Čihař
767fc8c997 Correct punctuation for sentences
Signed-off-by: Michal Čihař <michal@cihar.com>
2014-02-02 11:38:49 +01:00
Michal Čihař
e3e880f1fc Punctuation at the end of validation error messages 2014-02-02 11:19:15 +01:00
Michal Čihař
8eaaad4826 Do not use HTML entities for quotes inside translatable messages
First of all there is no reason to HTML encode them, if the string
should be encoded, it has to be done after getting the translation from
gettext as they can contain something to quote as well.

Also using HTML entities is sometimes confusing for translators.
2014-02-02 10:06:23 +01:00
Marc Delisle
a8277b944f Merge pull request #881 from Chanaka/rfe-1483
rfe-1483 : Export database without triggers
2014-01-29 09:46:57 -08:00
Michal Čihař
e227e70af6 Do not talk explicitely about server type
The connection can be as well to MariaDB, Drizzle or MySQL, so lets make
the message generic.
2014-01-29 15:23:29 +01:00
Chanaka Indrajith
2988aebc86 rfe-1483 : Export database without triggers
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-28 23:09:59 +05:30
Marc Delisle
379f8b6704 Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:53:00 -05:00
Marc Delisle
144e00e5da bug #4221 Bzip2 export cannot be directly imported (so withdraw bz2 export)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-15 08:39:42 -05:00
Dieter Adriaenssens
76da7895ff improve message
Signed-off-by: Dieter Adriaenssens <ruleant@users.sourceforge.net>
2014-01-14 16:22:22 +01:00
Marc Delisle
16cc2550ce Improve message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-01-10 10:34:50 -05:00
Hugues Peccatte
7dd23a47b7 Reduce nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-01-04 18:04:40 +01:00
Michal Čihař
6102a559d0 Consistently end long descriptions with full stop
Otherwise it looks mixed up in the interface and translators tend to add
them in translations.

Signed-off-by: Michal Čihař <mcihar@suse.cz>
2014-01-03 14:31:55 +01:00
Chanaka Indrajith
8b95c41cc4 Fixed code violations in ServerConfigChecks.class.php
Signed-off-by: Chanaka Indrajith <pe.chanaka.ck@gmail.com>
2014-01-02 23:51:49 +05:30
Marc Delisle
652b351c4a Merge branch 'QA_4_1' 2013-12-23 13:48:34 -05:00
Marc Delisle
a8b2e4cee1 bug #3938 PDFDefaultPageSize doc and easy configurability
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-23 13:41:14 -05:00
Madhura Jayaratne
a10ac8859f Minimize using static methods
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2013-12-23 12:55:39 +05:30
Hugues Peccatte
291c4246b8 Replace function PMA_performConfigChecks by a class.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-22 21:32:05 +01:00
Hugues Peccatte
d428db6641 Reduce nested levels.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-20 23:35:53 +01:00
Hugues Peccatte
207466d59c Don't use function in for loop test.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-18 22:18:02 +01:00
Marc Delisle
b2305dcefc Fix merge conflicts
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-18 12:45:03 -05:00
Marc Delisle
9876aeb550 Finish removing the gather suboption of the error handler
Signed-off-by: Marc Delisle <marc@infomarc.info>
2013-12-18 12:37:01 -05:00
Hugues Peccatte
ab42fd2ac9 PHPCS update.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-17 18:53:14 +01:00
Marc Delisle
2a8962aa95 Signed-off-by: Marc Delisle <marc@infomarc.info>
Added warning about the mysql extension being deprecated
and removed the extension directive
2013-12-14 14:26:12 -05:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-11 22:13:10 +01:00
Hugues Peccatte
9763791380 Fix new PHPCS errors.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-11 19:02:05 +01:00
Hugues Peccatte
20ab7112bb Fix PHPCS errors/warnings from Jenkins.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2013-12-10 21:57:17 +01:00
Marc Delisle
ebc5e9a5c7 We do not need a separate ErrorReporting directive 2013-11-20 06:14:53 -05:00
Marc Delisle
2f1176d27c Fix merge conflicts 2013-11-10 08:14:19 -05:00
Hugues Peccatte
d3601abf96 Global PHPDoc update. 2013-11-10 12:29:55 +01:00
Madhura Jayaratne
afada9b377 Add some missing doc comments 2013-11-10 07:37:12 +05:30
Marc Delisle
85ea82a409 Remove the ShowDatabasesCommand directive 2013-11-06 12:47:27 -05:00
Marc Delisle
d8fd82a9f5 The DisableIS directive is removed 2013-11-05 12:44:04 -05:00
Madhura Jayaratne
184316d891 Coding style fixes 2013-11-03 19:00:41 +05:30
Piotr Przybylski
858b20d26d Removed wiki links from setup script and user preferences 2013-11-03 13:07:22 +01:00
Piotr Przybylski
a67e41a646 Refactored ConfigFile class so that it is no longer a singleton
Fixes bug #4123 Double config including
2013-11-03 12:54:20 +01:00
Madhura Jayaratne
20608589c3 Remove trailing white spaces 2013-10-19 14:29:05 +05:30
Mohamed Ashraf
a2659d7ba5 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
2013-09-29 23:13:05 +02:00
Alicja Cwierz
e748b7cd60 Replace wiki info icon #1457 2013-09-28 18:57:53 +10:00
Dieter Adriaenssens
1c56884996 improve DocBlock 2013-09-25 14:46:24 +02:00
Dieter Adriaenssens
7e262be851 wrap long lines 2013-09-25 14:37:39 +02:00
Mohamed Ashraf
d90126ebd7 Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into error_reporting
Conflicts:
	ChangeLog
	scripts/create-release.sh
2013-09-21 00:49:01 +02:00
Mohamed Ashraf
7fb6a44c1a Fixed missing comma 2013-09-10 11:57:26 +02:00
Marc Delisle
830de1ff03 Fix codestyle 2013-09-07 08:20:26 -04:00
Mohamed Ashraf
b9a0851f11 Fixed the extra new line in the messages.inc.php 2013-09-05 20:05:28 +02:00
Mohamed Ashraf
088166f0a3 Merge remote-tracking branch 'origin/master' into error_reporting
Conflicts:
	ChangeLog
2013-09-01 13:07:52 +02:00
Marc Delisle
e25db4a004 Fix merge conflicts 2013-08-27 10:54:59 -04:00
Michal Čihař
1084e4dfdd Do not show tooltip in table navigation
Most tables don't have any comment set and this causes serious slow down
of a navigation.
2013-08-27 11:08:28 +02:00