Merge remote branch 'origin/master'

Browse Source

...

This commit is contained in:

Roberto Rosario

2011-03-07 18:20:37 -04:00

parent 214a985fd9 9c4d9d9211

commit 118e3d2e4a

1001 changed files with 24 additions and 31 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

apps/common/__init__.py Executable file → Normal file

0

apps/common/api.py Executable file → Normal file

0

apps/common/forms.py Executable file → Normal file

0

apps/common/locale/es/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/common/locale/es/LC_MESSAGES/django.po Executable file → Normal file

0

apps/common/locale/ru/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/common/locale/ru/LC_MESSAGES/django.po Executable file → Normal file

0

apps/common/models.py Executable file → Normal file

0

apps/common/templates/404.html Executable file → Normal file

0

apps/common/templates/500.html Executable file → Normal file

0

apps/common/templates/calculate_form_title.html Executable file → Normal file

0

apps/common/templates/generic_assign_remove.html Executable file → Normal file

0

apps/common/templates/generic_confirm.html Executable file → Normal file

0

apps/common/templates/generic_detail.html Executable file → Normal file

0

apps/common/templates/generic_form.html Executable file → Normal file

0

apps/common/templates/generic_form_instance.html Executable file → Normal file

0

apps/common/templates/generic_form_subtemplate.html Executable file → Normal file

0

apps/common/templates/generic_list.html Executable file → Normal file

0

apps/common/templates/generic_list_subtemplate.html Executable file → Normal file

0

apps/common/templates/generic_navigation.html Executable file → Normal file

0

apps/common/templates/generic_wizard.html Executable file → Normal file

0

apps/common/templates/login.html Executable file → Normal file

0

apps/common/templates/password_change_done.html Executable file → Normal file

0

apps/common/templates/password_change_form.html Executable file → Normal file

0

apps/common/templatetags/__init__.py Executable file → Normal file

0

apps/common/templatetags/attribute_tags.py Executable file → Normal file

0

apps/common/templatetags/navigation.py Executable file → Normal file

0

apps/common/templatetags/project_tags.py Executable file → Normal file

0

apps/common/templatetags/settings.py Executable file → Normal file

0

apps/common/tests.py Executable file → Normal file

0

apps/common/urls.py Executable file → Normal file

0

apps/common/utils.py Executable file → Normal file

0

apps/common/views.py Executable file → Normal file

0

apps/common/wizard.py Executable file → Normal file

0

apps/converter/__init__.py Executable file → Normal file

0

apps/converter/api.py Executable file → Normal file

0

apps/converter/conf/__init__.py Executable file → Normal file

0

apps/converter/conf/settings.py Executable file → Normal file

0

apps/converter/models.py Executable file → Normal file

0

apps/converter/tests.py Executable file → Normal file

0

apps/converter/views.py Executable file → Normal file

0

apps/documents/__init__.py Executable file → Normal file

0

apps/documents/admin.py Executable file → Normal file

0

apps/documents/conf/__init__.py Executable file → Normal file

0

apps/documents/conf/settings.py Executable file → Normal file

0

apps/documents/forms.py Executable file → Normal file

0

apps/documents/locale/es/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/documents/locale/es/LC_MESSAGES/django.po Executable file → Normal file

0

apps/documents/models.py Executable file → Normal file

0

apps/documents/staging.py Executable file → Normal file

0

apps/documents/templates/fancybox.html Executable file → Normal file

0

apps/documents/tests.py Executable file → Normal file

0

apps/documents/urls.py Executable file → Normal file

0

apps/documents/utils.py Executable file → Normal file

0

apps/documents/views.py Executable file → Normal file

0

apps/dynamic_search/__init__.py Executable file → Normal file

0

apps/dynamic_search/api.py Executable file → Normal file

0

apps/dynamic_search/forms.py Executable file → Normal file

0

apps/dynamic_search/locale/es/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/dynamic_search/locale/es/LC_MESSAGES/django.po Executable file → Normal file

0

apps/dynamic_search/locale/ru/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/dynamic_search/locale/ru/LC_MESSAGES/django.po Executable file → Normal file

0

apps/dynamic_search/models.py Executable file → Normal file

0

apps/dynamic_search/templates/search_results.html Executable file → Normal file

0

apps/dynamic_search/tests.py Executable file → Normal file

0

apps/dynamic_search/urls.py Executable file → Normal file

0

apps/dynamic_search/views.py Executable file → Normal file

0

apps/main/__init__.py Executable file → Normal file

0

apps/main/locale/es/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/main/locale/es/LC_MESSAGES/django.po Executable file → Normal file

0

apps/main/models.py Executable file → Normal file

0

apps/main/templates/about.html Executable file → Normal file

0

apps/main/templates/base.html Executable file → Normal file

0

apps/main/templates/home.html Executable file → Normal file

0

apps/main/tests.py Executable file → Normal file

0

apps/main/urls.py Executable file → Normal file

0

apps/main/views.py Executable file → Normal file

0

apps/ocr/__init__.py Executable file → Normal file

0

apps/ocr/api.py Executable file → Normal file

0

apps/ocr/conf/__init__.py Executable file → Normal file

0

apps/ocr/conf/settings.py Executable file → Normal file

0

apps/ocr/models.py Executable file → Normal file

0

apps/ocr/tests.py Executable file → Normal file

0

apps/ocr/urls.py Executable file → Normal file

0

apps/ocr/views.py Executable file → Normal file

0

apps/storage/backends/filebasedstorage.py Executable file → Normal file

0

apps/web_theme/__init__.py Executable file → Normal file

0

apps/web_theme/conf/__init__.py Executable file → Normal file

0

apps/web_theme/conf/settings.py Executable file → Normal file

0

apps/web_theme/locale/es/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/web_theme/locale/es/LC_MESSAGES/django.po Executable file → Normal file

0

apps/web_theme/locale/ru/LC_MESSAGES/django.mo Executable file → Normal file

0

apps/web_theme/locale/ru/LC_MESSAGES/django.po Executable file → Normal file

0

apps/web_theme/media/LICENSE Executable file → Normal file

0

apps/web_theme/media/README.md Executable file → Normal file

0

apps/web_theme/media/Rakefile Executable file → Normal file

0

apps/web_theme/media/VERSION Executable file → Normal file

0

apps/web_theme/media/config/locales/de_de.yml Executable file → Normal file

0

apps/web_theme/media/config/locales/pt_br.yml Executable file → Normal file

0

apps/web_theme/media/features/step_definitions/layout_steps.rb Executable file → Normal file

Some files were not shown because too many files have changed in this diff Show More