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

500 Commits

Author SHA1 Message Date
Marc Delisle
bfd24b8a24 Typo 2012-02-14 12:43:01 -05:00
Marc Delisle
440c4cc6d0 TESTING branch is gone 2012-02-14 12:39:06 -05:00
Michal Čihař
752e3623d5 Remove testsuite setup from distributed tarballs as well 2012-02-14 16:19:58 +01:00
Michal Čihař
c748c3bf5a Compatibility with 3.4 branch 2012-02-14 16:15:18 +01:00
Michal Čihař
2ec471c13e Simplify code 2012-02-14 16:12:52 +01:00
Michal Čihař
987158fe8a We want to delete whole directory... 2012-02-14 16:11:50 +01:00
Michal Čihař
1e8f066a09 Remove whole scripts directory from release 
This is only useful for developers now (user content was moved to
examples) and thus is useless to ship.
 2012-02-14 16:07:46 +01:00
Michal Čihař
29b566d7d3 Drop php to gettext conversion script 
This was needed only for conversion from php based translation to
gettext.
 2012-02-14 16:05:32 +01:00
Michal Čihař
419948cc9e Remove semi-broken script for upgrading 2012-02-14 16:04:21 +01:00
Michal Čihař
57b3b48443 Remove ancient script for upgrading configuration 2012-02-14 16:04:03 +01:00
Michal Čihař
5d187f7222 Move SQL scripts to examples folder 2012-02-14 15:57:35 +01:00
Michal Čihař
850b202e82 Move signon and openid examples to examples folder 2012-02-13 13:29:31 +01:00
Michal Čihař
938208442a Avoid escaping double quote for po file 2011-12-01 15:38:46 +01:00
Marc Delisle
b82662961f Freshmeat.net renamed to freecode.com 2011-11-24 17:34:41 -05:00
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
Michal Čihař
a4ac8d6bec Merge branch 'QA_3_4' 2011-05-11 14:45:57 +02:00
Michal Čihař
072bc8de79 Also remove empty dirs when removing incomplete translations 2011-05-11 14:45:51 +02:00
Michal Čihař
8f49a1a642 Adjust STABLE/TESTING marking for new major release (in case there will ever be bugfix for 3.3). 2011-05-11 14:18:52 +02:00
Aris Feryanto
d5421a41f9 Recently used tables (add SQL in scripts/create_tables.sql) 2011-05-08 03:11:09 +07:00
Michal Čihař
5c38a10468 Write to temprorary file and rename when done. 
This avoids problems with demo server when somebody accesses page while
this file is being generated.
 2011-05-05 09:17:00 +02:00
Marc Delisle
c6be70e8a3 Use a variable for the generated file 2011-04-26 07:52:46 -04:00
Michal Čihař
6091d9b656 Override using LC_ALL, it overrides all LC_* variables. 2011-04-26 13:38:04 +02:00
Michal Čihař
864bf00d97 Fix typo 2011-04-06 15:13:29 +02:00
Michal Čihař
26a4a09c11 Display warning about incomplete translations 2011-04-06 09:48:20 +02:00
Michal Čihař
3289a49a6b Threshold configurable by parameter 2011-04-05 15:31:15 +02:00
Michal Čihař
e269e34a4f Do not fail on 0% 2011-04-05 15:23:49 +02:00
Michal Čihař
049e97e42a Make the script fail on error 2011-04-05 15:12:50 +02:00
Michal Čihař
297035b853 Do not include incomplete translations in release. 
Currently the threshold is set to 50%, but the discussion is still open
on mailing list and it might change.
 2011-04-05 12:05:15 +02:00
Dieter Adriaenssens
fecfe761f9 drop Devel: prefix in links to wiki 2011-03-29 10:02:02 +02:00
Michal Čihař
53ba93b02e Remove debug code. 
This should never be commited.
 2011-03-05 15:11:59 +01:00
Michal Čihař
614838a4e5 Update po files 2011-03-03 07:17:58 +01:00
Michal Čihař
659ab6eb52 Drop not needed requires 2011-03-02 13:59:43 +01:00
Michal Čihař
8149492cbe rfe #1640812 [auth] Add example for OpenID authentication using signon method. 2011-03-02 13:46:43 +01:00
Michal Čihař
c7abc97556 Fix typo 2011-03-02 13:39:17 +01:00
Michal Čihař
d0d236fd62 rfe #2936155 [auth] Allow to pass additional parameters using signon method. 2011-03-02 11:44:57 +01:00
Michal Čihař
6bba56bc71 Exclude new scripts from release as well 2011-02-24 16:02:11 +01:00
Michal Čihař
ea9189cdc2 Add scripts for merging suggestions from pootle 2011-02-24 15:51:13 +01:00
Michal Čihař
4c1ee06bb3 Fill in link to PHP doc 2011-02-17 10:42:12 +01:00
Michal Čihař
b200ed0e18 Make it possible to generate only single language 2011-02-09 22:03:25 +01:00
Michal Čihař
715b0b86b5 Do not mark anything from 3.3 branch as testing 2011-02-08 16:25:40 +01:00
Michal Čihař
70bc1761c3 Drop translators.html and all references to it. 
The list is absolutely not up to date and it makes no sense in
maintaining it in addition to history of po files in git.
 2010-12-31 15:51:34 +01:00
Marc Delisle
af6ef14673 Improve message 2010-12-11 06:36:08 -05:00
Marc Delisle
4645bd5475 Remove reference to an older script 2010-12-11 06:28:16 -05:00
Michal Čihař
21469844a5 Avoid creating tarball multiple times. 2010-12-07 14:44:42 +01:00
Michal Čihař
f4bedb04a9 Remove some unneded scripts when creating a release. 2010-12-07 14:38:45 +01:00
Michal Čihař
b1f939ef58 This file is no longer needed with gettext. 2010-12-07 14:32:14 +01:00
Michal Čihař
ffebaad757 Do not include javascript sources from release. 2010-12-07 14:30:14 +01:00
Michal Čihař
f60afa01e4 Upload .tar.xz files as well 2010-12-02 16:53:00 +01:00
Michal Čihař
fd9187e8cc Enable generating of tar.xz 2010-12-02 16:52:45 +01:00
Michal Čihař
267c8fe735 Preprare for xz support. 2010-12-02 16:40:51 +01:00
Marc Delisle
7342b35e9f no need to include .po files in the releases 2010-11-24 12:57:47 -05:00
Michal Čihař
2d9f2796d1 Update javascript compiler. 2010-11-23 10:33:15 +01:00
Michal Čihař
0985f7dfb9 Fail on error, disable advanced optimalisations. 2010-11-23 10:22:02 +01:00
Michal Čihař
2793c5d7c5 Fail on exit. 2010-10-26 11:51:01 +02:00
Michal Čihař
0431042bd0 Drop $Id$ expansion, nobody complained so far it not working. 2010-09-07 15:00:44 +02:00
Michal Čihař
d17fba309c Fix permissions. 
Most files were made executable somewhere in ninadsp tree, reverting
this.
 2010-08-30 09:53:37 +02:00
Michal Čihař
2e8e9642a7 Remove .gitignore files on release. 2010-08-29 11:17:52 +02:00
ninadsp
9c34a0eec9 Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches 2010-08-28 01:53:52 +05:30
ninadsp
c9253c0a0e Merge conflict resolved for Lori's tree merge to main 2010-08-22 12:42:54 +05:30
Marc Delisle
82acbb2ba3 fix merge conflicts 2010-08-21 07:46:57 -04:00
Michal Čihař
272c57cdba Change back to master after merging to STABLE/TESTING. 2010-08-20 13:56:28 +02:00
Michal Čihař
86baee8d4e Do not apply TESTING/STABLE update to 2.11 branch. 2010-08-20 13:53:01 +02:00
ninadsp
a2f78a6d38 Resolve merge conflicts for upstream merge 2010-07-29 19:17:25 +05:30
Crack
7db978de3f Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/config.values.php
 2010-07-26 20:24:57 +02:00
Marc Delisle
0a05b396b3 Merge branch 'MAINT_3_3_5' 2010-07-25 07:54:43 -04:00
Marc Delisle
58021a8e6c bug [scripts] MySQL 5.5.5 does not accept TIMESTAMP(14) in create_tables.sql 2010-07-25 07:53:07 -04:00
Crack
2d67cb58c4 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 
Conflicts:
	libraries/relation.lib.php
 2010-07-24 18:34:52 +02:00
ninadsp
e646a2760c Fixed conflict due to upstream merge 2010-07-23 21:59:15 +05:30
Michal Čihař
5908ab72bc Clarify database upgrade instructions. 
We don't want to maintain all new tables in upgrade script as well.
 2010-07-21 09:07:59 +02:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
Crack
93d49e8ca8 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin 2010-07-05 19:37:03 +02:00
Crack
9dc47ecc41 rename $strSetup* variables to $strConfig* 2010-07-04 00:04:55 +02:00
ninadsp
bcbf327139 Merge remote branch 'origin/master' 2010-06-29 23:54:01 +05:30
Dieter Adriaenssens
16ed06531a remove author names 2010-06-28 20:36:12 +02:00
Michal Čihař
4f56db9d93 Fixup of language update script. 2010-06-20 16:15:38 +02:00
Crack
b2e232b582 Added pmadb table for preferences storage 
Removed some messages from messages.inc.php
 2010-06-18 17:53:53 +02:00
Michal Čihař
2ff0e610fc Fix some unicode problems with the script. 2010-06-03 14:46:59 +02:00
Michal Čihař
1067a1c2ee Add script for merging back translations from gettext. 2010-05-25 15:17:51 +02:00
ninadsp
38ac78e3ba merging changes from origin 2010-05-24 18:32:42 +05:30
Michal Čihař
cc06b6df97 Adjust to work better with current master. 2010-05-24 11:08:43 +02:00
ninadsp
bed1948d04 testing git setup - no major change made in code yet 
only added a few comments
 2010-05-23 01:22:01 +05:30
Michal Čihař
f85249062f Always use locale insensitive search to avoid reordering the file every time. 2010-05-10 09:36:08 +02:00
Michal Čihař
5cb5afedbb Merge branch 'QA_3_3' 2010-04-26 14:20:51 +02:00
Michal Čihař
f97fafea3d Add spaces after -- to avoid problems in strict mode. 2010-04-26 14:20:32 +02:00
Marc Delisle
a9bfc2cd5b Merge branch 'QA_3_3' 2010-04-26 07:42:25 -04:00
Marc Delisle
6393fff59d bug #2975408 Data too long for column data_sql 2010-04-26 07:41:36 -04:00
Michal Čihař
13332150cd Fix script to make it actually work. 2010-04-19 14:24:20 +02:00
Michal Čihař
81d20f15b3 Add script for finding unused messages 
Taken from QA_3_3 and slightly modified. This just checks
libraries/messages.inc.php and could be removed once this file is gone.
 2010-04-19 14:08:54 +02:00
Michal Čihař
a384bef30b Let's remove mootools. 
There still might be some uses of it, but I'm not aware of anything
right now and it's better to break things earlier so that somebody
notices and it can be fixed.
 2010-04-15 10:47:50 +02:00
Michal Čihař
176583f4ae Add javascript compressor. 
It uses http://code.google.com/closure/compiler/ for now.
 2010-04-13 11:41:00 +02:00
Michal Čihař
0ea3a3ea26 Use merge strategy that wil always prefer branch we're marking as STABLE/TESTING. 
The problem is in fact that not all branches are merged together and it
usually causes conflicts on version string (documentation, config,
changelog,...). By simply using branch we're merging to STABLE/TESTING
we will get the correct merge.
 2010-04-07 09:30:53 +02:00
Michal Čihař
5e68c366ef Proper support for ngettext. 2010-03-30 14:29:23 +02:00
Michal Čihař
e2cb413331 This is not needed with gettext. 2010-03-30 14:00:19 +02:00
Michal Čihař
b068e5d7b5 Fix typo. 2010-03-30 13:59:40 +02:00
Michal Čihař
ee01556641 Add quiet mode. 2010-03-30 11:23:00 +02:00
Michal Čihař
e9909a2441 Consistent naming. 2010-03-30 10:44:58 +02:00
Michal Čihař
5588c4e75e Not needed anymore. 2010-03-30 10:43:30 +02:00
Michal Čihař
a069d4f4af Merge branch 'master' into gettext 2010-03-24 10:50:11 +01:00
Michal Čihař
f9e1592958 Avoid messing up with working copy more than needed. 2010-03-24 10:35:27 +01:00
Michal Čihař
e438f0ce70 Switch to using branch for STABLE/TESTING. 2010-03-24 10:10:56 +01:00
Michal Čihař
a1beb0fb3f Merge branch 'master' into gettext 2010-03-19 00:28:20 +01:00