Changeset 2210 in products


Ignore:
Timestamp:
Apr 27, 2010 12:02:35 PM (12 years ago)
Author:
mylan
Message:

Merged all changes from branches/captchas-refactoring into trunk.

Merged revisions 3004,3006,3094,3096-3099,3119-3120 via svnmerge from
http://svn.quintagroup.com/products/quintagroup.formlib.captcha/branches/captchas-refactoring

........

r3004 | liebster | 2010-03-22 16:16:05 +0200 (Mon, 22 Mar 2010) | 1 line


Remove egg info

........

r3006 | liebster | 2010-03-22 16:20:03 +0200 (Mon, 22 Mar 2010) | 1 line


Add depending quintagroup.captcha.core

........

r3094 | mylan | 2010-04-01 16:53:05 +0300 (Thu, 01 Apr 2010) | 1 line


#173: Fix wrong import, update package description, add zope.formlib as dependency

........

r3096 | mylan | 2010-04-01 17:39:30 +0300 (Thu, 01 Apr 2010) | 1 line


#173: update dependencies list in quintagroup.formlib.captcha package, commented for now

........

r3097 | mylan | 2010-04-01 18:48:49 +0300 (Thu, 01 Apr 2010) | 1 line


#173: Move quintagroup.formlib.captcha.form content into the quintagroup.formlib.captcha, add zope.app.form as direct requirement

........

r3098 | mylan | 2010-04-02 13:38:30 +0300 (Fri, 02 Apr 2010) | 1 line


#186: Remove needless namespace declarations in configure.zcml

........

r3099 | mylan | 2010-04-02 13:40:52 +0300 (Fri, 02 Apr 2010) | 1 line


#186: added tests for field and widget staff registration, for captcha widget operation

........

r3119 | mylan | 2010-04-08 16:42:00 +0300 (Thu, 08 Apr 2010) | 1 line


#186: Add dependency package include in configure.zcml

........

r3120 | mylan | 2010-04-08 16:42:34 +0300 (Thu, 08 Apr 2010) | 1 line


#186: Fixed registration tests

........

Location:
quintagroup.formlib.captcha/trunk
Files:
1 deleted
4 edited
5 copied

Legend:

Unmodified
Added
Removed
  • quintagroup.formlib.captcha/trunk

    • Property svnmerge-integrated changed from /quintagroup.formlib.captcha/branches/captchas-refactoring:1-3002 to /quintagroup.formlib.captcha/branches/captchas-refactoring:1-3248
    • Property svn:mergeinfo set to /quintagroup.formlib.captcha/branches/captchas-refactoring:1965-2081
  • quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/__init__.py

    r1959 r2210  
    1 # 
     1from widget import CaptchaWidget 
     2from field import Captcha 
  • quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/configure.zcml

    r1959 r2210  
    11<configure 
    22    xmlns="http://namespaces.zope.org/zope" 
    3     xmlns:zcml="http://namespaces.zope.org/zcml" 
    43    i18n_domain="quintagroup.formlib.captcha"> 
    54 
    6     <include package=".form" 
    7              zcml:condition="installed zope.app.form"/> 
     5  <include package="quintagroup.captcha.core" /> 
     6  <include package="zope.formlib" /> 
    87 
     8  <view 
     9      type="zope.publisher.interfaces.browser.IBrowserRequest" 
     10      for=".interfaces.ICaptcha" 
     11      provides="zope.app.form.interfaces.IInputWidget" 
     12      factory=".widget.CaptchaWidget" 
     13      permission="zope.Public" 
     14      /> 
    915 
    1016</configure> 
  • quintagroup.formlib.captcha/trunk/setup.py

    r1959 r2210  
    66setup(name='quintagroup.formlib.captcha', 
    77      version=version, 
    8       description="Captcha field for formlib based on qPloneCaptchas Zope2 Product", 
     8      description="Captcha field for formlib based on quintagroup.captcha.core package", 
    99      long_description=open("README.txt").read() + "\n" + 
    1010                       open(os.path.join("docs", "HISTORY.txt")).read(), 
     
    2727          'setuptools', 
    2828          # -*- Extra requirements: -*- 
     29          'quintagroup.captcha.core', 
     30          'zope.app.form', 
     31          # 'zope.component', 
     32          # 'zope.interface', 
     33          # 'zope.schema', 
     34          # 'zope.i18n', 
     35          # 'Products.CMFCore', 
    2936      ], 
    3037      entry_points=""" 
Note: See TracChangeset for help on using the changeset viewer.