Git March 2010

git@phpmyadmin.net

4 participants
212 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-209-g56404c5

by Michal Čihař

The branch, master has been updated via 56404c562bdbba7dad59b30177b7bf6670273b8f (commit) via 8fb7ecae3f0691790dfde205d9e25fc9f205a1b7 (commit) from 6d5a1c3c29d9825ec596894c4aa5f589d20badeb (commit) - Log ----------------------------------------------------------------- commit 56404c562bdbba7dad59b30177b7bf6670273b8f Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:58:28 2010 +0100 Upload also release notes. commit 8fb7ecae3f0691790dfde205d9e25fc9f205a1b7 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:57:54 2010 +0100 Link to wiki. ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 3 +++ scripts/upload-release | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 547dd1d..fe19d09 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -4,6 +4,9 @@ # vim: expandtab sw=4 ts=4 sts=4: # +# More documentation about making a release is available at: +# http://wiki.phpmyadmin.net/pma/Devel:Releasing + # Fail on undefined variables set -u # Fail on failure diff --git a/scripts/upload-release b/scripts/upload-release index 4bcfa5e..3fbaf5c 100755 --- a/scripts/upload-release +++ b/scripts/upload-release @@ -27,5 +27,6 @@ put phpMyAdmin-$REL-all-languages.zip put phpMyAdmin-$REL-english.zip put phpMyAdmin-$REL-all-languages.7z put phpMyAdmin-$REL-english.7z +put phpMyAdmin-$REL-notes.html EOT hooks/post-receive -- phpMyAdmin

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-207-g6d5a1c3

by Michal Čihař

The branch, master has been updated via 6d5a1c3c29d9825ec596894c4aa5f589d20badeb (commit) via 93b19bded89932b51c2102e11b79111bef925bdb (commit) via 17147737eb8fa366d17ab85f52cf3ba2bf875841 (commit) via 39c0280bf3c68bf49b390b6d9e282d8643e1dfb8 (commit) via f61b39fd2f5cd6d181780992cd1580bfb0101609 (commit) from aebacd260f911b8d8261883493c4b111d8969c10 (commit) - Log ----------------------------------------------------------------- commit 6d5a1c3c29d9825ec596894c4aa5f589d20badeb Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:50:15 2010 +0100 Add script for automatically uploading a release. commit 93b19bded89932b51c2102e11b79111bef925bdb Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:49:58 2010 +0100 Proper path to release notes. commit 17147737eb8fa366d17ab85f52cf3ba2bf875841 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:40:06 2010 +0100 Add support for tagging a release. commit 39c0280bf3c68bf49b390b6d9e282d8643e1dfb8 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:32:37 2010 +0100 Update script for creating releases to work with Git. commit f61b39fd2f5cd6d181780992cd1580bfb0101609 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:15:50 2010 +0100 Remove snapshot mode. It is not used anyway and just complicates the script. ----------------------------------------------------------------------- Summary of changes: scripts/create-release.sh | 159 +++++++++++++++++++++++++++------------------ scripts/upload-release | 31 +++++++++ 2 files changed, 126 insertions(+), 64 deletions(-) create mode 100755 scripts/upload-release diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 2c42b95..547dd1d 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -4,42 +4,74 @@ # vim: expandtab sw=4 ts=4 sts=4: # +# Fail on undefined variables +set -u +# Fail on failure +set -e + KITS="all-languages english" COMPRESSIONS="zip-7z tbz tgz 7z" -if [ $# = 0 ] +if [ $# -lt 2 ] then echo "Usages:" - echo " create-release.sh <version> [from_branch]" - echo " create-release.sh snapshot [sf]" - echo " (no spaces allowed!)" + echo " create-release.sh <version> <from_branch> [--tag]" + echo "" + echo "If --tag is specified, relase tag is automatically created" echo "" echo "Examples:" - echo " create-release.sh 2.9.0-rc1 branches/QA_2_9" - echo " create-release.sh 2.9.0 tags/RELEASE_2_9_0" + echo " create-release.sh 2.9.0-rc1 QA_2_9" + echo " create-release.sh 2.9.0 MAINT_2_9_0 --tag" exit 65 fi -branch='trunk' -if [ "$1" = "snapshot" ] ; then - mode="snapshot" - date_snapshot=`date +%Y%m%d-%H%M%S` - target=$date_snapshot -else - if [ "$#" -ge 2 ] ; then - branch="$2" - fi - target="$1" - cat <<END +# Read required parameters +version=$1 +shift +branch=$1 +shift + +# Create working copy +mkdir -p release +workdir=release/phpMyAdmin-$version +if [ -d $workdir ] ; then + echo "Working directory '$workdir' already exists, please move it out of way" + exit 1 +fi +git clone --local . $workdir +cd $workdir + +# Checkout branch +git checkout $branch + +# Check release version +if ! grep -q "'PMA_VERSION', '$version'" libraries/Config.class.php ; then + echo "There seems to be wrong version in libraries/Config.class.php!" + exit 2 +fi +if ! grep -q "phpMyAdmin $version - Documentation" Documentation.html ; then + echo "There seems to be wrong version in Documentation.html" + exit 2 +fi +if ! grep -q "phpMyAdmin $version - Official translators" translators.html ; then + echo "There seems to be wrong version in translators.html" + exit 2 +fi +if ! grep -q "Version $version\$" README ; then + echo "There seems to be wrong version in README" + exit 2 +fi + +cat <<END Please ensure you have: 1. incremented rc count or version in subversion : - in libraries/Config.class.php PMA_Config::__constructor() the line - " \$this->set( 'PMA_VERSION', '$1' ); " + " \$this->set( 'PMA_VERSION', '$version' ); " - in Documentation.html the 2 lines - " <title>phpMyAdmin $1 - Documentation</title> " - " <h1>phpMyAdmin $1 Documentation</h1> " + " <title>phpMyAdmin $version - Documentation</title> " + " <h1>phpMyAdmin $version Documentation</h1> " - in translators.html - in README 2. checked that all language files are valid (use @@ -47,58 +79,36 @@ Please ensure you have: Continue (y/n)? END - read do_release +read do_release - if [ "$do_release" != 'y' ]; then - exit - fi +if [ "$do_release" != 'y' ]; then + exit 100 fi -if [ "$mode" = "snapshot" -a "$2" = "sf" ] ; then - # Goto project dir - cd /home/groups/p/ph/phpmyadmin/htdocs - - # Keep one previous version of the cvs directory - if [ -e svn-prev ] ; then - rm -rf svn-prev - fi - mv svn svn-prev -fi - -# Do SVNcheckout -mkdir -p ./svn -cd svn - -echo "Exporting repository from subversion" - -svn export -q https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/$branch/phpMyAdmin - -if [ $? -ne 0 ] ; then - echo "Subversion checkout failed, bailing out" - exit 2 -fi # Cleanup release dir -LC_ALL=C date -u > phpMyAdmin/RELEASE-DATE-${target} +LC_ALL=C date -u > RELEASE-DATE-${version} # Building Documentation.txt -LC_ALL=C w3m -dump phpMyAdmin/Documentation.html > phpMyAdmin/Documentation.txt +LC_ALL=C w3m -dump Documentation.html > Documentation.txt # Remove test directory from package to avoid Path disclosure messages # if someone runs /test/wui.php and there are test failures -rm -rf phpMyAdmin/test +rm -rf test + +# Remove git metadata +rm -rf .git -# Renaming directory -mv phpMyAdmin phpMyAdmin-$target +cd .. # Prepare all kits for kit in $KITS ; do # Copy all files - name=phpMyAdmin-$target-$kit - cp -r phpMyAdmin-$target $name + name=phpMyAdmin-$version-$kit + cp -r phpMyAdmin-$version $name # Cleanup translations - cd phpMyAdmin-$target-$kit + cd phpMyAdmin-$version-$kit scripts/lang-cleanup.sh $kit cd .. @@ -141,10 +151,7 @@ for kit in $KITS ; do done # Cleanup -rm -rf phpMyAdmin-${target} - -if [ "$mode" != "snapshot" ] -then +rm -rf phpMyAdmin-${version} echo "" @@ -155,19 +162,45 @@ echo "------" ls -la *.gz *.zip *.bz2 *.7z +cd .. + + +if [ $# -gt 0 ] ; then + echo + echo "Additional tasks:" + while [ $# -gt 0 ] ; do + param=$1 + case $1 in + --tag) + tagname=RELEASE_`echo $version | tr . _ | tr '[:lower:]' '[:upper:]' | tr -d -` + echo "* Tagging release as $tagname" + git tag -a -m "Released $version" $tagname $branch + ;; + *) + echo "Unknown parameter: $1!" + exit 1 + esac + shift + done + echo +fi + cat <<END Todo now: --------- + 1. tag the subversion tree with the new revision number for a plain release or a release candidate: version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING - 2. prepare a phpMyAdmin-xxx-notes.html explaining in short the goal of + 2. prepare a release/phpMyAdmin-$version-notes.html explaining in short the goal of this release and paste into it the ChangeLog for this release - 3. upload the files and the notes file to SF (procedure explained on the sf.net Project Admin/File Manager help page) + 3. upload the files to SF, you can use scripts/upload-release, eg.: + + ./scripts/upload-release \$USER $version release 4. add SF news item to phpMyAdmin project 5. announce release on freshmeat (http://freshmeat.net/projects/phpmyadmin/) 6. send a short mail (with list of major changes) to @@ -180,7 +213,7 @@ Todo now: 7. increment rc count or version in subversion : - in libraries/Config.class.php PMA_Config::__constructor() the line - " $this->set( 'PMA_VERSION', '2.7.1-dev' ); " + " \$this->set( 'PMA_VERSION', '2.7.1-dev' ); " - in Documentation.html the 2 lines " <title>phpMyAdmin 2.2.2-rc1 - Documentation</title> " " <h1>phpMyAdmin 2.2.2-rc1 Documentation</h1> " @@ -192,5 +225,3 @@ Todo now: 9. the end :-) END - -fi diff --git a/scripts/upload-release b/scripts/upload-release new file mode 100755 index 0000000..4bcfa5e --- /dev/null +++ b/scripts/upload-release @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e +set -u + +if [ $# -lt 2 ] ; then + echo 'Usage: upload-release USERNAME VERSION [DIR]' + echo 'Must be called in directory with binaries or with path' + exit 1 +fi +USER=$1 +REL=$2 + +if [ $# -gt 2 ] ; then + cd "$3" +fi + +sftp $USER,phpmyadmin(a)frs.sourceforge.net <<EOT +cd /home/frs/project/p/ph/phpmyadmin/phpMyAdmin +mkdir $REL +cd $REL +put phpMyAdmin-$REL-all-languages.tar.bz2 +put phpMyAdmin-$REL-english.tar.bz2 +put phpMyAdmin-$REL-all-languages.tar.gz +put phpMyAdmin-$REL-english.tar.gz +put phpMyAdmin-$REL-all-languages.zip +put phpMyAdmin-$REL-english.zip +put phpMyAdmin-$REL-all-languages.7z +put phpMyAdmin-$REL-english.7z +EOT + hooks/post-receive -- phpMyAdmin

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. bbee78c1104146f36d1145dcface82563391eb1b

by Michal Čihař

The branch, master has been updated via bbee78c1104146f36d1145dcface82563391eb1b (commit) via 83511e004f43bb10df5d070d10f155f81c301276 (commit) from 289aa8e4ec467ddc107ad550291ca00df17b9c63 (commit) - Log ----------------------------------------------------------------- commit bbee78c1104146f36d1145dcface82563391eb1b Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:05:56 2010 +0100 Ignore git cache. commit 83511e004f43bb10df5d070d10f155f81c301276 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 16:05:20 2010 +0100 Generate translation stats from Git. ----------------------------------------------------------------------- Summary of changes: README | 4 +- cache/.gitignore | 1 + helper/cache.py | 119 +++++------------------------------------------------- render.py | 29 +++++++------ 4 files changed, 29 insertions(+), 124 deletions(-) diff --git a/README b/README index 887bfee..12c4747 100644 --- a/README +++ b/README @@ -14,8 +14,8 @@ Genshi - http://genshi.edgewall.org/ (0.5.0 tested) python-feedparser - http://www.feedparser.org (4.1 tested) -pysvn - http://pysvn.tigris.org/ -(1.6.1 tested) +GitPython - http://gitorious.org/projects/git-python/ +(0.1.6 tested) Security announcements diff --git a/cache/.gitignore b/cache/.gitignore index 2232829..775d8a0 100644 --- a/cache/.gitignore +++ b/cache/.gitignore @@ -1 +1,2 @@ *.dump +git* diff --git a/helper/cache.py b/helper/cache.py index e59e341..28c288d 100644 --- a/helper/cache.py +++ b/helper/cache.py @@ -23,10 +23,10 @@ import cPickle import feedparser import os import time -import pysvn import glob import traceback import urllib +import git from xml.dom import minidom @@ -35,8 +35,6 @@ import helper.date # How long is cache valid (in seconds) CACHE_TIME = 60 * 60 -# How long is svn cache valid (in seconds) -SVN_CACHE_TIME = 60 * 60 * 24 class NoCache(Exception): pass @@ -181,108 +179,13 @@ class FeedCache(URLCache): self.set(cache, result) return result -class SimpleSVNCache(Cache): - def __init__(self, url, timeout = SVN_CACHE_TIME): - super(SimpleSVNCache, self).__init__(timeout) - self._svn = pysvn.Client() - self._url = url - - def cat(self, name): - ''' - Performs cached svn cat, returns string with file content. - ''' - fullname = '%s/%s' % (self._url, name) - cachename = 'svn-log-%s' % fullname - - try: - data = self.get(cachename) - return data - except NoCache: - data = self._svn.cat(fullname) - self.set(cachename, data) - return data - - def log(self, name): - ''' - Performs cached svn log, returs list of revisions as dict with - message, date, author and revision fields. - - 1. If cache is up to date, use cache. - 2. If cache exists, use it as base, request only remaining logs. - 3. Request missing logs. - 4. Save log to cache and return it. - ''' - fullname = '%s/%s' % (self._url, name) - cachename = 'svn-log-%s' % fullname - - try: - list = self.get(cachename) - return list - except NoCache: - pass - - try: - list = self.force_get(cachename) - base = list[0]['revision'] - except NoCache: - list = [] - base = 0 - - try: - base_rev = pysvn.Revision(pysvn.opt_revision_kind.number, base) - self.dbg('svn log -r %d %s' % (base, fullname)) - svnlog = self._svn.log(fullname, revision_end = base_rev) - newlog = [{ - 'message': x['message'], - 'revision': x['revision'].number, - 'date': helper.date.fmtdate.fromtimestamp(x['date']), - 'author': x['author'], - } for x in svnlog] - list.extend(newlog) - list.sort(key = lambda x: x['revision'], reverse = True) - self.set(cachename, list) - except pysvn.ClientError: - traceback.print_exc() - return list - -class SVNCache(SimpleSVNCache): - def __init__(self, url, timeout = SVN_CACHE_TIME): - super(SVNCache, self).__init__(timeout) - self._svn = pysvn.Client() - self._url = url - self._updated = False - self._wc = self.get_name('svn-%s' % self._url, '%s') - - def ls(self): - ''' - Performs cached svn ls, returs list of URLs. - ''' - self.update_wc() - files = glob.glob(os.path.join(self._wc, '*')) - files.sort() - return [os.path.basename(x) for x in files] - - def cat(self, name): - ''' - Performs cached svn cat, returns string with file content. - ''' - self.update_wc() - return open(os.path.join(self._wc, name), 'r').read() - - def update_wc(self): - ''' - Updates working copy of repository. - ''' - if self._updated: - return - if not os.path.exists(self._wc): - self.dbg('svn co %s' % self._url) - self._svn.checkout(self._url, self._wc) - self._updated = True - elif not self.check_timeout(self._wc): - try: - self.dbg('svn up %s' % self._url) - self._svn.update(self._wc) - except pysvn.ClientError: - traceback.print_exc() - self._updated = True +class GitCache(Cache): + def __init__(self, url): + self.dirname = self.get_name(url, '%s') + if not os.path.exists(self.dirname): + os.system('git clone %s %s' % (url, self.dirname)) + else: + os.system('cd %s ; git pull' % self.dirname) + self.repo = git.Repo(self.dirname) + self.tree = self.repo.tree() + self.langtree = self.tree['lang'] diff --git a/render.py b/render.py index de7fb1f..faf85cc 100755 --- a/render.py +++ b/render.py @@ -86,8 +86,7 @@ PROJECT_SUMMARY_RSS = 'https://sourceforge.net/export/rss2_projsummary.php?group DONATIONS_RSS = 'https://sourceforge.net/export/rss2_projdonors.php?group_id=%d&limit=20' % PROJECT_ID PROJECT_VCS_RSS = 'http://cia.vc/stats/project/phpmyadmin/.rss' PROJECT_DL = 'http://prdownloads.sourceforge.net/%s/%%s' % PROJECT_NAME -PROJECT_SVN = 'https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/' -TRANSLATIONS_SVN = '%slang/' % PROJECT_SVN +PROJECT_GIT = 'git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin' PLANET_RSS = 'http://planet.phpmyadmin.net/rss20.xml' RSS_CZ = 'http://phpmyadmin.cz/rss.xml' RSS_RU = 'http://php-myadmin.ru/rss/news.xml' @@ -125,7 +124,7 @@ def copytree(src, dst): names = os.listdir(src) errors = [] for name in names: - if name == '.svn' or name.find('.swp') != -1 or name[0] == '_': + if name == '.git' or name == '.svn' or name.find('.swp') != -1 or name[0] == '_': continue srcname = os.path.join(src, name) dstname = os.path.join(dst, name) @@ -196,8 +195,7 @@ class SFGenerator: self.feeds = helper.cache.FeedCache() self.xmls = helper.cache.XMLCache() self.urls = helper.cache.URLCache() - self.svn = helper.cache.SVNCache(TRANSLATIONS_SVN) - self.simplesvn = helper.cache.SimpleSVNCache(PROJECT_SVN) + self.git = helper.cache.GitCache(PROJECT_GIT) def get_outname(self, page): ''' @@ -867,6 +865,8 @@ class SFGenerator: for root, dirs, files in os.walk(TEMPLATES): if '.svn' in dirs: dirs.remove('.svn') # don't visit .svn directories + if '.git' in dirs: + dirs.remove('.git') # don't visit .git directories files.sort() dir = root[len(TEMPLATES):].strip('/') if len(dir) > 0: @@ -911,9 +911,10 @@ class SFGenerator: ''' helper.log.dbg('Processing translation stats...') self.data['translations'] = [] - list = self.svn.ls() - translators = XML(self.simplesvn.cat('translators.html')) - english = self.svn.cat('english-utf-8.inc.php') + list = self.git.langtree.keys() + list.sort() + translators = XML(self.git.tree['translators.html'].data) + english = self.git.langtree['english-utf-8.inc.php'].data allmessages = len(re.compile('\n\$str').findall(english)) for name in list: if name[-14:] != '-utf-8.inc.php': @@ -931,18 +932,18 @@ class SFGenerator: translator = self.fmt_translator(translator) short = data.langnames.MAP[lang] helper.log.dbg(' - %s [%s]' % (lang, short)) - svnlog = self.svn.log(name) + gitlog = self.git.repo.log(path = 'lang/english-utf-8.inc.php') langs = '%s|%s|%s' % (lang, short, baselang) regexp = re.compile(LANG_REGEXP % (langs, langs), re.IGNORECASE) found = None if lang == 'english': - found = svnlog[0] + found = gitlog[0] else: - for x in svnlog: - if regexp.findall(x['message']) != []: + for x in gitlog: + if regexp.findall(x.message) != []: found = x break - content = self.svn.cat(name) + content = self.git.langtree[name].data missing = len(re.compile('\n\$str.*to translate').findall(content)) translated = allmessages - missing percent = 100.0 * translated / allmessages @@ -953,7 +954,7 @@ class SFGenerator: else: css ='' try: - dt = found['date'] + dt = datetime.datetime(*found.committed_date[:6]) except TypeError: dt = '' self.data['translations'].append({ hooks/post-receive -- phpMyAdmin website

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 289aa8e4ec467ddc107ad550291ca00df17b9c63

by Michal Čihař

The branch, master has been updated via 289aa8e4ec467ddc107ad550291ca00df17b9c63 (commit) via 63e91924957afa9d7116c5ac1a5acdcce9e65dca (commit) via 3495263591f529ad5455d3bc1b09fe3073129296 (commit) via 0c9a156ed2a5edcea007788d661509a26b8bb39f (commit) from 79502ca3ff88d0103624bf2e358899f72fdb6574 (commit) - Log ----------------------------------------------------------------- commit 289aa8e4ec467ddc107ad550291ca00df17b9c63 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:26:23 2010 +0100 Update vcs-* links. commit 63e91924957afa9d7116c5ac1a5acdcce9e65dca Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:24:35 2010 +0100 Update notifications mailing list. commit 3495263591f529ad5455d3bc1b09fe3073129296 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:24:10 2010 +0100 Adjust DOAP. commit 0c9a156ed2a5edcea007788d661509a26b8bb39f Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:22:47 2010 +0100 Another place where it's better to use generic vcs. ----------------------------------------------------------------------- Summary of changes: render.py | 8 ++++---- templates/_page.tpl | 4 ++-- templates/downloads.tpl | 2 +- templates/phpmyadmin-doap.xml.tpl | 8 ++++---- templates/support.tpl | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/render.py b/render.py index cf1fad1..de7fb1f 100755 --- a/render.py +++ b/render.py @@ -468,7 +468,7 @@ class SFGenerator: def get_snapshots_info(self): ''' - Retrieves SVN snapshots info and fills it in data['releases_svn']. + Retrieves vcs snapshots info and fills it in data['release_vcs']. ''' md5_strings = self.urls.load(SNAPSHOT_MD5).split('\n') size_strings = self.urls.load(SNAPSHOT_SIZES).split('\n') @@ -478,12 +478,12 @@ class SFGenerator: continue md5, name = line.split(' ') md5s[name] = md5 - svn = [] + vcs = [] for line in size_strings: if line.strip() == '': continue name, size = line.split(' ') - svn.append({ + vcs.append({ 'name' : name, 'size' : int(size), 'size_k' : int(size) / 1024, @@ -492,7 +492,7 @@ class SFGenerator: 'url' : 'http://dl.cihar.com.nyud.net/phpMyAdmin/master/%s' % name, 'md5' : md5s[name], }) - self.data['release_svn'] = svn + self.data['release_vcs'] = vcs def process_themes(self, xml_files): ''' diff --git a/templates/_page.tpl b/templates/_page.tpl index 0257062..21ce4ec 100644 --- a/templates/_page.tpl +++ b/templates/_page.tpl @@ -14,8 +14,8 @@ <link rel="stylesheet" type="text/css" href="${base_url}css/slimbox.css" media="screen" /> <link rel="shortcut icon" href="${base_url}favicon.ico" type="image/x-icon" /> <link rel="icon" href="${base_url}favicon.ico" type="image/x-icon" /> - <link rel="vcs-svn" href="https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin" title="phpMyAdmin svn repository" /> - <link rel="vcs-browse" href="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/" title="phpMyAdmin svn repository browser" /> + <link rel="vcs-git" href="git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin" title="phpMyAdmin Git repository" /> + <link rel="vcs-browse" href="http://phpmyadmin.git.sourceforge.net/" title="phpMyAdmin Git repository browser" /> <script src="${base_url}js/mootools.js" type="text/javascript"></script> <script src="${base_url}js/mootools-more.js" type="text/javascript"></script> <script src="${base_url}js/slimbox.js" type="text/javascript"></script> diff --git a/templates/downloads.tpl b/templates/downloads.tpl index b9f9ef8..9caf150 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -55,7 +55,7 @@ </tr> </thead> <tbody> - <tr py:for="file in release_svn"> + <tr py:for="file in release_vcs"> <td><a href="${file.url}#!md5!${file.md5}">${file.name}</a></td> <td class="size">${file.humansize}</td> <td>${file.md5}</td> diff --git a/templates/phpmyadmin-doap.xml.tpl b/templates/phpmyadmin-doap.xml.tpl index a3e5ae6..0999f8c 100644 --- a/templates/phpmyadmin-doap.xml.tpl +++ b/templates/phpmyadmin-doap.xml.tpl @@ -35,10 +35,10 @@ </foaf:Person> </developer> <repository> - <SVNRepository> - <location rdf:resource="https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin" /> - <browse rdf:resource="http://phpmyadmin.svn.sourceforge.net/viewvc/phpmyadmin/" /> - </SVNRepository> + <GitRepository> + <location rdf:resource="git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin" /> + <browse rdf:resource="http://phpmyadmin.git.sourceforge.net/" /> + </GitRepository> </repository> <py:for each="release in releases_featured"> <release py:for="file in release.files"> diff --git a/templates/support.tpl b/templates/support.tpl index 081308d..56b894b 100644 --- a/templates/support.tpl +++ b/templates/support.tpl @@ -27,7 +27,7 @@ <li>For news/announcements: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-news">phpmyadmin-news(a)lists.sourceforge.net</a></li> <li>For user questions: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-users">phpmyadmin-users(a)lists.sourceforge.net</a></li> <li>For developer questions: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-devel">phpmyadmin-devel(a)lists.sourceforge.net</a></li> - <li>SVN commit notifications: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-svn">phpmyadmin-svn(a)lists.sourceforge.net</a></li> + <li>Git commit notifications: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-git">phpmyadmin-git(a)lists.sourceforge.net</a></li> <li><a href="http://sourceforge.net/mail/?group_id=23067">Mailing lists overview</a></li> </ul> </div> hooks/post-receive -- phpMyAdmin website

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 79502ca3ff88d0103624bf2e358899f72fdb6574

by Michal Čihař

The branch, master has been updated via 79502ca3ff88d0103624bf2e358899f72fdb6574 (commit) via dd75259ae311996003fbc7b82ff05c418cbd8d34 (commit) from 7906ccb004cfb86562481266d751edd2937d687f (commit) - Log ----------------------------------------------------------------- commit 79502ca3ff88d0103624bf2e358899f72fdb6574 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:20:59 2010 +0100 Ignore generated files. commit dd75259ae311996003fbc7b82ff05c418cbd8d34 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:19:38 2010 +0100 This feed is not SVN/Git dependant, use genric name VCS instead. ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 +++ cache/.gitignore | 1 + render.py | 4 ++-- templates/about-website.tpl | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 cache/.gitignore delete mode 100644 cache/.placeholder diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c5490b --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.pyc +*.swp +output diff --git a/cache/.gitignore b/cache/.gitignore new file mode 100644 index 0000000..2232829 --- /dev/null +++ b/cache/.gitignore @@ -0,0 +1 @@ +*.dump diff --git a/cache/.placeholder b/cache/.placeholder deleted file mode 100644 index e69de29..0000000 diff --git a/render.py b/render.py index 4553815..cf1fad1 100755 --- a/render.py +++ b/render.py @@ -84,7 +84,7 @@ PROJECT_FILES_RSS = 'https://sourceforge.net/api/file/index/project-id/%d/rss' % PROJECT_NEWS_RSS = 'https://sourceforge.net/export/rss2_projnews.php?group_id=%d&rss_fulltext=1…' % PROJECT_ID PROJECT_SUMMARY_RSS = 'https://sourceforge.net/export/rss2_projsummary.php?group_id=%d' % PROJECT_ID DONATIONS_RSS = 'https://sourceforge.net/export/rss2_projdonors.php?group_id=%d&limit=20' % PROJECT_ID -PROJECT_SVN_RSS = 'http://cia.vc/stats/project/phpmyadmin/.rss' +PROJECT_VCS_RSS = 'http://cia.vc/stats/project/phpmyadmin/.rss' PROJECT_DL = 'http://prdownloads.sourceforge.net/%s/%%s' % PROJECT_NAME PROJECT_SVN = 'https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/' TRANSLATIONS_SVN = '%slang/' % PROJECT_SVN @@ -181,7 +181,7 @@ class SFGenerator: 'rss_planet': PLANET_RSS, 'rss_summary': PROJECT_SUMMARY_RSS, 'rss_security': '%s%ssecurity/index.xml' % (SERVER, BASE_URL), - 'rss_svn': PROJECT_SVN_RSS, + 'rss_vcs': PROJECT_VCS_RSS, 'screenshots': data.screenshots.SCREENSHOTS, 'awards': data.awards.AWARDS, 'generated': helper.date.fmtdatetime.utcnow(), diff --git a/templates/about-website.tpl b/templates/about-website.tpl index 2f94fb5..9ffd4bc 100644 --- a/templates/about-website.tpl +++ b/templates/about-website.tpl @@ -46,7 +46,7 @@ history</a>. <li><a href="${rss_files}">phpMyAdmin file releases</a></li> <li><a href="${rss_security}">phpMyAdmin security issues</a></li> <li><a href="${rss_donations}">phpMyAdmin donations</a></li> -<li><a href="${rss_svn}">phpMyAdmin SVN commits</a></li> +<li><a href="${rss_vcs}">phpMyAdmin commits</a></li> </ul> <p>phpMyAdmin software information is available in following machine readable formats:</p> hooks/post-receive -- phpMyAdmin website

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 7906ccb004cfb86562481266d751edd2937d687f

by Michal Čihař

The branch, master has been updated via 7906ccb004cfb86562481266d751edd2937d687f (commit) via 2b8be0b714090252db74f8ddec3d20519633bc48 (commit) from 9ad083429ad1ea1688102664ef06897a2f6b744f (commit) - Log ----------------------------------------------------------------- commit 7906ccb004cfb86562481266d751edd2937d687f Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:15:47 2010 +0100 Use Git snapshots. commit 2b8be0b714090252db74f8ddec3d20519633bc48 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 15:14:14 2010 +0100 Add cache dir. ----------------------------------------------------------------------- Summary of changes: render.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 cache/.placeholder diff --git a/cache/.placeholder b/cache/.placeholder new file mode 100644 index 0000000..e69de29 diff --git a/render.py b/render.py index 59972a3..4553815 100755 --- a/render.py +++ b/render.py @@ -93,8 +93,8 @@ RSS_CZ = 'http://phpmyadmin.cz/rss.xml' RSS_RU = 'http://php-myadmin.ru/rss/news.xml' # Data sources -SVN_MD5 = 'http://dl.cihar.com/phpMyAdmin/trunk/md5.sums' -SVN_SIZES = 'http://dl.cihar.com/phpMyAdmin/trunk/files.list' +SNAPSHOT_MD5 = 'http://dl.cihar.com/phpMyAdmin/master/md5.sums' +SNAPSHOT_SIZES = 'http://dl.cihar.com/phpMyAdmin/master/files.list' # Clean output before generating CLEAN_OUTPUT = True @@ -470,8 +470,8 @@ class SFGenerator: ''' Retrieves SVN snapshots info and fills it in data['releases_svn']. ''' - md5_strings = self.urls.load(SVN_MD5).split('\n') - size_strings = self.urls.load(SVN_SIZES).split('\n') + md5_strings = self.urls.load(SNAPSHOT_MD5).split('\n') + size_strings = self.urls.load(SNAPSHOT_SIZES).split('\n') md5s = {} for line in md5_strings: if line.strip() == '': @@ -489,7 +489,7 @@ class SFGenerator: 'size_k' : int(size) / 1024, 'size_m' : int(size) / (1024 * 1024), 'humansize' : fmt_bytes(size), - 'url' : 'http://dl.cihar.com.nyud.net/phpMyAdmin/trunk/%s' % name, + 'url' : 'http://dl.cihar.com.nyud.net/phpMyAdmin/master/%s' % name, 'md5' : md5s[name], }) self.data['release_svn'] = svn hooks/post-receive -- phpMyAdmin website

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_0RC1-220-gaebacd2

by Michal Čihař

The branch, master has been updated via aebacd260f911b8d8261883493c4b111d8969c10 (commit) via 4ac7e466053422ae48b328b6be2aa9a17812d1dd (commit) via d659f3ba2b6dafbd818caca1f22a45455690198c (commit) via 47ec6a7b7eb899533213136ea7f22cb690dc137c (commit) via 3f5d1063ff6af5aa036be26a4d5fac9806eccfac (commit) via 995b90b5514557cb9ed6042844216fcecfe48a24 (commit) via 11c1029dbd877e4d613763cf20cdee2a4e968244 (commit) via 09896700e4c90916997da5d5d0579ea92a1f6d5a (commit) via 579d321129cb363bfcd049d3087219e68f9dc39e (commit) via 77d88312763af9aba8f25bbefe6a4852ff7f5447 (commit) via ec5d47369cc9f55c7cb102f423a58d4505ce7ce9 (commit) via 7443d8286dfe655dfd38ed20cf26099ae65d2ab2 (commit) via 7efb7849018201c1499ddb60ad494c3c54a023a9 (commit) via 72b9d2abd5fcd251b48bc91fdaded0d7bf69d964 (commit) via 05477fff976073aa2074e905bdfa249779e1fcca (commit) via 58d2c0a58cad7c936eb3c86ca10fec154f1f56e6 (commit) via 861dd5c0c2fed019954ab2129db2d27adfe958a9 (commit) via 3ea273809a93108059f995977b7e871162e06ae3 (commit) via 0d16251c6b9ad831daed75df4db73d8e7e5a3b64 (commit) via be71307d17b7b5494c274c72953545fe01d093a1 (commit) via bc908c732a577b054a3046b2386afe77edd8a8cd (commit) via 377c5f67a0144dcb39f6ecf41f3fc8c42c9d66c1 (commit) via bfff0d94ddadf752d323533a98b633d73d6fd695 (commit) via 856a63e971df53330c7eb519b4aa69b58d5f5d41 (commit) via a7fe9f32fc064c3d699c4acefab0bb73113c0765 (commit) via 0fa6c3d985160ccb857ffe311267a7df22435f75 (commit) via 535ec099f892d94d1c01933e9a8b7d43f9951478 (commit) via bd31cbb26064a2bb23919784ed3183ad5b4e325f (commit) via e5750aa98c60f33ee345c0053042b0ff24cb73dc (commit) via 2fada4e4a3dd405e0549bbe5ce20e2a46ced453f (commit) via 9bcc37451d42dce0f522bf0d51462bb82abc14d8 (commit) via d000a74d09a2f1cd6645df64b1bfa0c55257f9f5 (commit) via f4d129ac03ff7011d6e54d60243c88aebf790e52 (commit) via 0b7a3f716ad59c1b6db88cc721b6d158cf4833a6 (commit) via d24640d62ef13e733f22445a7d3fb5e4cc32a9ca (commit) via 1f5a19b69cc303728417c13dbb23f7fd9fc89a97 (commit) via bf857315b9ca14ebb9dad2d3f1d195fe1a14d331 (commit) via 063058741bc37974e06b7d7db6fc74ce620bf649 (commit) via b9daf34b79b0271e62e4de3bc7b6bf9008e719c5 (commit) via c896fb50ad9ac9dc73bd83a99b01f3a440c753f1 (commit) via f900210a0f05511658a8d64d8876b935ab7a5972 (commit) via 0645a4f1190588403093d7824bfbe28f39972a29 (commit) via 66c830e2a5deaa4196fe82e1df45f1f89bbc5a60 (commit) via 92f1160b2a23f14a966fab1ef2ff2620f363a570 (commit) via 548d96d611b100ef1bf10165eaacb8cd2c5d75f9 (commit) via ee70c958d8df15848cf2f3ef6ed1fe7c75cc28bc (commit) via cbe8f389821d2fb0a107478e73b654309566380d (commit) via b2673cf501e1c25bb185f002b687f70951fceda9 (commit) via 326deca827d87eb148afb96fa6ec7ce29644cb93 (commit) via fd4ded141021d2d496c7095f375aefb10b590c16 (commit) via a239f9bb3ebe0994a76d5d946418bdce4a9298e4 (commit) via 3287ca0e4b40b5c501c1aeab6c0eb90eaa7c3674 (commit) via b1c1640dc92238b0fafb3c0c2f9c4350a05571d0 (commit) via 5fd02248cd4f410d963daf55150c33e8d4e01850 (commit) via fd739840cdb07739c8b971363291c9d0534764ec (commit) via a91fa294db2116ade8f0995b251e9b44b70bc13f (commit) via 624dde89ef6ac51adea3f1be045128bcbcd7eeb8 (commit) via f2f0e9bb47fb2b238f7c53dff83b72fb3b1a1866 (commit) via 644b56f65594244fc0f8ec5f25398ab9b3678e7c (commit) via 91dee4238c0e584afa470287b2c69127d54f8998 (commit) via e5a58432b523ea22d1ec1332e55a758bd7adced2 (commit) via eacec1d091c07a785b63a092e9d5c294f574c107 (commit) via 0a6badd2d60b6cc216f714ea777905566de14e60 (commit) via 1ad5d85666f1c10c7c3da5900fb5fbdcd690499c (commit) via f1b8b850eb559ae202fb7220c5cf3d7703df5e60 (commit) via 6d9b602b8741a253fcfcf7e4c8e14fbe23f35f85 (commit) via aecbb213aaf4f779f8feaa4ad4cc3fa9d59ce673 (commit) via a04da7df128258ce493ff4e6b8f91bece9d48886 (commit) via c67fd7f732e56d668399a4d44bcdf5f2a803a7c3 (commit) via a3d022b7caaeecfe6baf28216302ebadac06190d (commit) via fe5e8999b42b98873a032a937cb873f2d47a1826 (commit) via 2e60e8710e129e6f8942a726f52a2ffdea9d4c25 (commit) via 182ca44769a3940616e42de5b90ad97693dec362 (commit) via cf3f73f5d0f549c7833da0483a168effe627ca16 (commit) via 8adc82666bca869bdf73f2b92d40df532fe10f57 (commit) via bf7b74e941bc012c85e4523b219a1027cbf01de2 (commit) via e16be872b64cab229784a0700a329871454f8baf (commit) via afb6f77d8d2ec4d7ba92ca8279b736e4f5bf7729 (commit) via 4beb8bdff67ad57e27ed1d1ae02451fc356a5df7 (commit) via d0e2fc83f37283eb33c9ad422e938d709a84d98b (commit) via 079cb404c776821bc9b161bd297b956a6e6418a4 (commit) via 891c5780feafe82e1f363f45a23c1067943ce47a (commit) via 6b56175cd1b8e9bbaca5ab56266039b8129b34af (commit) via 01a70cca07878bb83112352b43e3a6bc67a5e224 (commit) via cd6b2795d3168aba7c8c0ff7069b99d86e98c6a7 (commit) via 902e07df774c602e2f63838ae1c57adb88092ddd (commit) via 867782d82ffe888feb40091aa417818e115090b8 (commit) via 6045e72cd355133eb49da59150846c4acbc8103e (commit) via 994381d3c827271b61ccd203f5c953b434a6b772 (commit) via e596726312e3fbd3638e23a536933f22135320d7 (commit) via b10d8c63abb010c9917f3a20b192b22da62bf478 (commit) via 34e8c15a64c656d2f6c40fcc2ba9f8e2f0d8e635 (commit) via db93a7fb0dfc674934d72e3174d024c99b7a0ff1 (commit) via d2880858cb57e4d0289188c60552f726f17b0435 (commit) via 34fbba8ef5a04ad182687bb9a0a5349243cd9790 (commit) via 2e4ce6afa754bb9ff65b624e9f407451da1cdcdf (commit) via f92e4dfad9c33f1c822d375b638ad65fcdd815d1 (commit) via 512975e91cfbb603952690ac2e1926d031174b6c (commit) via 1f56635db547a7440b6463fc4d9d8d5bb1ed65ec (commit) via 294d699e8475cb3ab171441d429e7715beaf3c67 (commit) via 78ee46662ac7e0371109fef2ad5a782a1aa7cc72 (commit) via c67ceaa83b6107a6e0d8e4e1ef1ff26e37e08f1d (commit) via c3259a276c5a455c6e0907cd42edd94f644df7d6 (commit) via 4e4e40188f7d6a0a49e9471da97942c9fbc17797 (commit) via 93bebe47bc8c3b68e2b9df1c3cb6885503aee17b (commit) via 73275fc4deff9ea416589d9a0928e0e90d4607dc (commit) via a2fa8219c85f49b1aeadc5edf37ad4afb89ae6cf (commit) via 526dce65cb41e64c40df2939d5a5bc3db7a683d1 (commit) via f3833884e430cf9104114f391e71925c5f6bd5fa (commit) from 28f58df2fb778a5d5824ca06db8ac30c63e51496 (commit) - Log ----------------------------------------------------------------- commit aebacd260f911b8d8261883493c4b111d8969c10 Merge: 28f58df2fb778a5d5824ca06db8ac30c63e51496 4ac7e466053422ae48b328b6be2aa9a17812d1dd Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 14:06:06 2010 +0100 Merge branch 'QA_3_3' Conflicts: ChangeLog Documentation.html README documentation-gsoc/Synchronization_User_Manual.htm lang/afrikaans-utf-8.inc.php lang/albanian-utf-8.inc.php lang/arabic-utf-8.inc.php lang/azerbaijani-utf-8.inc.php lang/bangla-utf-8.inc.php lang/basque-utf-8.inc.php lang/belarusian_cyrillic-utf-8.inc.php lang/belarusian_latin-utf-8.inc.php lang/bosnian-utf-8.inc.php lang/brazilian_portuguese-utf-8.inc.php lang/bulgarian-utf-8.inc.php lang/catalan-utf-8.inc.php lang/chinese_simplified-utf-8.inc.php lang/chinese_traditional-utf-8.inc.php lang/croatian-utf-8.inc.php lang/czech-utf-8.inc.php lang/danish-utf-8.inc.php lang/dutch-utf-8.inc.php lang/estonian-utf-8.inc.php lang/finnish-utf-8.inc.php lang/galician-utf-8.inc.php lang/georgian-utf-8.inc.php lang/german-utf-8.inc.php lang/greek-utf-8.inc.php lang/hebrew-utf-8.inc.php lang/hindi-utf-8.inc.php lang/hungarian-utf-8.inc.php lang/indonesian-utf-8.inc.php lang/italian-utf-8.inc.php lang/japanese-utf-8.inc.php lang/korean-utf-8.inc.php lang/latvian-utf-8.inc.php lang/lithuanian-utf-8.inc.php lang/macedonian_cyrillic-utf-8.inc.php lang/malay-utf-8.inc.php lang/mongolian-utf-8.inc.php lang/norwegian-utf-8.inc.php lang/persian-utf-8.inc.php lang/polish-utf-8.inc.php lang/portuguese-utf-8.inc.php lang/romanian-utf-8.inc.php lang/russian-utf-8.inc.php lang/serbian_cyrillic-utf-8.inc.php lang/serbian_latin-utf-8.inc.php lang/sinhala-utf-8.inc.php lang/slovak-utf-8.inc.php lang/slovenian-utf-8.inc.php lang/spanish-utf-8.inc.php lang/swedish-utf-8.inc.php lang/tatarish-utf-8.inc.php lang/thai-utf-8.inc.php lang/turkish-utf-8.inc.php lang/ukrainian-utf-8.inc.php lang/uzbek_cyrillic-utf-8.inc.php lang/uzbek_latin-utf-8.inc.php libraries/Config.class.php libraries/Table.class.php libraries/display_tbl.lib.php server_privileges.php server_replication.php server_synchronize.php translators.html ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- phpMyAdmin

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_0RC1-68-g4ac7e46

by Michal Čihař

The branch, QA_3_3 has been updated via 4ac7e466053422ae48b328b6be2aa9a17812d1dd (commit) from d659f3ba2b6dafbd818caca1f22a45455690198c (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58e3122..f120b5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,11 +97,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables - bug [browse] "Show BLOB contents" should display HTML code that is present in a BLOB, thanks to Vincent van der Tuin -<<<<<<< HEAD - [privileges] Improve escaping of hostname -======= -- [privileges] Improve Proper escaping of hostname ->>>>>>> origin/MAINT_3_3_0 3.2.4.0 (2009-12-02) - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status hooks/post-receive -- phpMyAdmin

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_0RC1-67-gd659f3b

by Michal Čihař

The branch, QA_3_3 has been updated via d659f3ba2b6dafbd818caca1f22a45455690198c (commit) via 47ec6a7b7eb899533213136ea7f22cb690dc137c (commit) via 995b90b5514557cb9ed6042844216fcecfe48a24 (commit) via 09896700e4c90916997da5d5d0579ea92a1f6d5a (commit) via 7443d8286dfe655dfd38ed20cf26099ae65d2ab2 (commit) via 05477fff976073aa2074e905bdfa249779e1fcca (commit) via 861dd5c0c2fed019954ab2129db2d27adfe958a9 (commit) via 0d16251c6b9ad831daed75df4db73d8e7e5a3b64 (commit) via bc908c732a577b054a3046b2386afe77edd8a8cd (commit) via 0fa6c3d985160ccb857ffe311267a7df22435f75 (commit) via 9bcc37451d42dce0f522bf0d51462bb82abc14d8 (commit) via f4d129ac03ff7011d6e54d60243c88aebf790e52 (commit) via d24640d62ef13e733f22445a7d3fb5e4cc32a9ca (commit) via bf857315b9ca14ebb9dad2d3f1d195fe1a14d331 (commit) via b9daf34b79b0271e62e4de3bc7b6bf9008e719c5 (commit) via f900210a0f05511658a8d64d8876b935ab7a5972 (commit) via 66c830e2a5deaa4196fe82e1df45f1f89bbc5a60 (commit) via 548d96d611b100ef1bf10165eaacb8cd2c5d75f9 (commit) via cbe8f389821d2fb0a107478e73b654309566380d (commit) via 326deca827d87eb148afb96fa6ec7ce29644cb93 (commit) via a239f9bb3ebe0994a76d5d946418bdce4a9298e4 (commit) via 5fd02248cd4f410d963daf55150c33e8d4e01850 (commit) via fd739840cdb07739c8b971363291c9d0534764ec (commit) via 624dde89ef6ac51adea3f1be045128bcbcd7eeb8 (commit) via 644b56f65594244fc0f8ec5f25398ab9b3678e7c (commit) via e5a58432b523ea22d1ec1332e55a758bd7adced2 (commit) via 0a6badd2d60b6cc216f714ea777905566de14e60 (commit) via f1b8b850eb559ae202fb7220c5cf3d7703df5e60 (commit) via aecbb213aaf4f779f8feaa4ad4cc3fa9d59ce673 (commit) via c67fd7f732e56d668399a4d44bcdf5f2a803a7c3 (commit) via fe5e8999b42b98873a032a937cb873f2d47a1826 (commit) via 182ca44769a3940616e42de5b90ad97693dec362 (commit) via 8adc82666bca869bdf73f2b92d40df532fe10f57 (commit) via e16be872b64cab229784a0700a329871454f8baf (commit) via 4beb8bdff67ad57e27ed1d1ae02451fc356a5df7 (commit) via 079cb404c776821bc9b161bd297b956a6e6418a4 (commit) via 6b56175cd1b8e9bbaca5ab56266039b8129b34af (commit) via cd6b2795d3168aba7c8c0ff7069b99d86e98c6a7 (commit) via 867782d82ffe888feb40091aa417818e115090b8 (commit) via 994381d3c827271b61ccd203f5c953b434a6b772 (commit) via b10d8c63abb010c9917f3a20b192b22da62bf478 (commit) via db93a7fb0dfc674934d72e3174d024c99b7a0ff1 (commit) via 34fbba8ef5a04ad182687bb9a0a5349243cd9790 (commit) via f92e4dfad9c33f1c822d375b638ad65fcdd815d1 (commit) via 1f56635db547a7440b6463fc4d9d8d5bb1ed65ec (commit) via 78ee46662ac7e0371109fef2ad5a782a1aa7cc72 (commit) via c3259a276c5a455c6e0907cd42edd94f644df7d6 (commit) via 93bebe47bc8c3b68e2b9df1c3cb6885503aee17b (commit) via a2fa8219c85f49b1aeadc5edf37ad4afb89ae6cf (commit) from 3f5d1063ff6af5aa036be26a4d5fac9806eccfac (commit) - Log ----------------------------------------------------------------- commit d659f3ba2b6dafbd818caca1f22a45455690198c Merge: 47ec6a7b7eb899533213136ea7f22cb690dc137c 995b90b5514557cb9ed6042844216fcecfe48a24 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 13:56:27 2010 +0100 Merge remote branch 'origin/MAINT_3_3_1' into QA_3_3 Conflicts: Documentation.html README libraries/Config.class.php translators.html commit 47ec6a7b7eb899533213136ea7f22cb690dc137c Merge: 3f5d1063ff6af5aa036be26a4d5fac9806eccfac 09896700e4c90916997da5d5d0579ea92a1f6d5a Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 13:55:07 2010 +0100 Merge remote branch 'origin/MAINT_3_3_0' into QA_3_3 Conflicts: ChangeLog Documentation.html README libraries/Config.class.php libraries/display_import.lib.php translators.html ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index f120b5a..58e3122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,7 +97,11 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #869006 [structure] Ignore number of records for MRG_MyISAM tables - bug [browse] "Show BLOB contents" should display HTML code that is present in a BLOB, thanks to Vincent van der Tuin +<<<<<<< HEAD - [privileges] Improve escaping of hostname +======= +- [privileges] Improve Proper escaping of hostname +>>>>>>> origin/MAINT_3_3_0 3.2.4.0 (2009-12-02) - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status hooks/post-receive -- phpMyAdmin

14 years, 6 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_2_11, updated. RELEASE_2_11_10-3-g8ae41bb

by Michal Čihař

The branch, QA_2_11 has been updated via 8ae41bbc0238581d5e0e692e4dc67e35ded00170 (commit) via 8535d48ae9c8ea554393802db68dbc9ec571b864 (commit) from f175026ff0d873c5c73bc841697596e995e271b9 (commit) - Log ----------------------------------------------------------------- commit 8ae41bbc0238581d5e0e692e4dc67e35ded00170 Merge: f175026ff0d873c5c73bc841697596e995e271b9 8535d48ae9c8ea554393802db68dbc9ec571b864 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Mar 11 13:51:07 2010 +0100 Merge remote branch 'origin/MAINT_2_11_10' into QA_2_11 Conflicts: ChangeLog Documentation.html README libraries/Config.class.php translators.html ----------------------------------------------------------------------- Summary of changes: README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 4936744..46099cc 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ phpMyAdmin - Readme http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller <tobias_at_ratschiller.com> - Copyright (C) 2001-2008 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca> + Copyright (C) 2001-2009 Marc Delisle <Marc.Delisle_at_cegepsherbrooke.qc.ca> Olivier Müller <om_at_omnis.ch> Robin Johnson <robbat2_at_users.sourceforge.net> Alexander M. Turek <me_at_derrabus.de> hooks/post-receive -- phpMyAdmin

14 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2010