Commit Graph

386 Commits

Author SHA1 Message Date
Michal Čihař
e56949f160 Use package name PhpMyAdmin
Needed to match phpdoc rules as package name must begin with upper case.
2011-10-25 10:13:17 +02:00
Rouslan Placella
137a70e671 Checkstyle fixes 2011-10-13 19:25:07 +01:00
Rouslan Placella
2f889c0bba Removed sprite regeneration from create-release.sh as it may interfere with releases for stable branches 2011-09-30 21:32:47 +01:00
Rouslan Placella
1431d02c8f Made PMA aware of the presence of sprites + added a script for generating sprites from icons 2011-09-26 20:46:28 +01:00
Piotr Przybylski
1aa438539a Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/common.lib.php
	libraries/config.default.php
	server_synchronize.php
2011-08-17 16:39:43 +02:00
Dieter Adriaenssens
3e342bceac fix typo 2011-08-16 23:05:22 +02:00
Piotr Przybylski
a502f95af4 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-16 16:11:43 +02:00
Piotr Przybylski
df9b8c2729 Fix comments for functions with missing @return tag 2011-08-16 14:31:52 +02:00
Michal Čihař
3538fd83c2 Safer compression
Always have working file in js/
2011-08-15 17:17:34 +02:00
Piotr Przybylski
970262c435 Merge remote-tracking branch 'origin/master' into drizzle 2011-08-15 12:03:04 +02:00
Michal Čihař
aec113c7b7 Rename file to match standards 2011-08-15 10:36:01 +02:00
Michal Čihař
e7cc67a5f6 Always escape % for gettext
Otherwise it is treated like format string.
2011-08-15 09:18:18 +02:00
Piotr Przybylski
2cd6de4648 Update create_tables_drizzle.sql 2011-08-12 22:08:07 +02:00
Piotr Przybylski
a7c0c55c7f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/common.lib.php
	tbl_printview.php
	tbl_select.php
	tbl_structure.php
2011-08-12 22:02:40 +02:00
Aris Feryanto
3f10465d71 Fix merge conflict with origin/master 2011-08-12 15:56:26 +08:00
Aris Feryanto
fe7eadab72 Add configuration for maximum tbl_uiprefs records, as suggested by Piotr 2011-08-12 15:49:53 +08:00
Michal Čihař
7166723120 Update po generating scripts to include advisor rules 2011-08-11 13:48:07 +02:00
Michal Čihař
06bb1d9e9e Convertor of advisor rules to PHP for gettext use 2011-08-11 11:57:46 +02:00
Piotr Przybylski
7f1fa1bab0 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	js/server_status.js
	libraries/database_interface.lib.php
	libraries/mysql_charsets.lib.php
2011-08-05 17:17:47 +02:00
Michal Čihař
1ec0b69e6b Coding style, function definitions 2011-08-05 14:49:23 +02:00
Piotr Przybylski
3586bb992f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	db_structure.php
	libraries/database_interface.lib.php
	libraries/server_synchronize.lib.php
	server_status.php
	sql.php
2011-07-22 11:07:04 +02:00
Michal Čihař
d55306252b Replace tabs with spaces, cleanup identation 2011-07-22 10:15:08 +02:00
Piotr Przybylski
a28beb9c1f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	libraries/server_synchronize.lib.php
	server_status.php
2011-07-21 15:25:52 +02:00
Michal Čihař
b13d2a33ed Fix indentation 2011-07-21 11:41:31 +02:00
Michal Čihař
aa270ae62b Better title 2011-07-21 11:40:35 +02:00
Piotr Przybylski
3bde595666 Merge remote-tracking branch 'origin/master' into drizzle 2011-06-27 23:55:32 +02:00
Michal Čihař
6b06041f34 Merge remote-tracking branch 'origin/QA_3_4' 2011-06-27 13:41:38 +02:00
Michal Čihař
4bec3b3bee Lower threshold for translations
It looks like incomplete translations do attract new translators, so
let's include few more.
2011-06-27 13:40:15 +02:00
Michal Čihař
86906773f1 LC_ALL is the right one to override 2011-06-27 10:29:25 +02:00
Piotr Przybylski
ae42913629 Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	server_status.php
2011-06-17 20:41:42 +02:00
Michal Čihař
cc28728cc3 Really use C locale in all cases 2011-06-17 15:01:49 +02:00
Michal Čihař
35385e307f Do not generate messages for tests 2011-06-17 15:01:06 +02:00
Piotr Przybylski
b35cd1b40f Merge remote-tracking branch 'origin/master' into drizzle
Conflicts:
	tbl_structure.php
2011-06-08 00:47:17 +02:00
Michal Čihař
675dee3761 Add forgotted example for signon script 2011-06-07 13:28:13 +02:00
Michal Čihař
cf6312f527 Clarify documentation 2011-06-06 17:13:16 +02:00
Piotr Przybylski
1df2a890e1 Add 'COLLATE utf8_bin' to configuration storage tables (Drizzle) 2011-06-02 16:07:59 +02:00
Piotr Przybylski
121cd6263b Merge remote-tracking branch 'origin/master' into drizzle 2011-06-02 15:43:28 +02:00
Piotr Przybylski
12f1bb773e Restore 'DEFAULT CHARACTER SET utf8 COLLATE utf8_bin' for configuration storage tables 2011-06-02 15:37:34 +02:00
Piotr Przybylski
10c7353c3c Add phpMyAdmin configuration storage schema for Drizzle 2011-06-02 01:11:01 +02:00
Piotr Przybylski
d489272845 Changed BLOB to TEXT in create_tables.sql (pma_recent, pma_table_uiprefs) 2011-06-02 00:55:51 +02:00
Piotr Przybylski
8cfc52c362 Remove unnecessary CHARSET/COLLATE declarations from create_tables.sql 2011-06-02 00:54:46 +02:00
Piotr Przybylski
a2f4717e0c SQL formatting in create_tables.sql 2011-06-01 19:23:44 +02:00
Aris Feryanto
e4ba1dc066 Add table pma_ui_prefs for remembering table sorting persistently 2011-05-27 18:52:00 +07:00
Aris Feryanto
8f99ac7a28 Merge remote-tracking branch 'origin/master' into browsemode 2011-05-24 08:42:32 +07:00
Michal Čihař
181705cbd1 Merge remote-tracking branch 'origin/QA_3_4' 2011-05-23 10:39:33 +02:00
Michal Čihař
adc6de0685 [auth] Fixed error handling for signon auth method.
The message is now stored in caller session data and properly displayed
in example script.
2011-05-23 10:33:14 +02:00
Michal Čihař
c95116a941 Merge branch 'QA_3_4' 2011-05-16 10:41:29 +02:00
Michal Čihař
aba316155b Do not use localised docs here 2011-05-16 10:38:52 +02:00
Michal Čihař
db48100cd1 Check for existence of a file 2011-05-16 10:37:59 +02:00
Michal Čihař
92d139d5f8 Add script for merging translations 2011-05-16 10:37:04 +02:00