nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,753 Commits 1 Branch 0 Tags
2f8d67cd6e85fb14c5c2ac7c1a6ac9190800bff5
Commit Graph

297 Commits

Author SHA1 Message Date
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
Marc Delisle
b7bbb967ba no branch exist in the cloned directory; advice for changes before validation 2010-03-16 08:10:49 -04:00
Michal Čihař
81eee5b45c Add missing cleanup. 2010-03-15 13:48:20 +01:00
Michal Čihař
dcf52474a3 Update translations 
Another update for strings already translated in php code and were
missing in gettext.
 2010-03-15 13:47:26 +01:00