matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
9012a1101a91ba3c96622aef4d52ca97e9601235
mayan-edms/mayan/apps
History
Roberto Rosario 9012a1101a Merge branch 'feature/remove_non_essentials' into development 
Conflicts:
	mayan/apps/converter/__init__.py
	mayan/apps/converter/api.py
	mayan/apps/converter/views.py
	mayan/urls.py
2014-10-01 22:22:06 -04:00
..
acls
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
app_registry
Update the app API class methods, register the sources app main endpoint, add API doc strings
2014-07-08 18:51:39 -04:00
bootstrap
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
checkouts
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
common
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
converter
Merge branch 'feature/remove_non_essentials' into development
2014-10-01 22:22:06 -04:00
django_gpg
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
document_acls
Update view references to include namespaces
2014-09-06 17:28:40 -04:00
document_comments
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
document_indexing
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
document_signatures
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
documents
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
dynamic_search
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
folders
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
history
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
installation
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
job_processor
Move all settings files from <app>/conf/settings.py to <app>/settings.py
2014-09-11 05:02:40 -04:00
linking
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
lock_manager
Move all settings files from <app>/conf/settings.py to <app>/settings.py
2014-09-11 05:02:40 -04:00
main
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
metadata
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
mimetype
PEP8 cleanups
2014-06-30 00:57:53 -04:00
navigation
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
ocr
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
permissions
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
project_setup
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
project_tools
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
registration
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
rest_api
Enable token authentication for the API, add API token request view
2014-07-24 01:03:51 -04:00
scheduler
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
settings_editor
Move common templates to apps/main/templates/main/*
2014-08-26 02:44:49 -04:00
smart_settings
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
sources
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
statistics
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
storage
Move all settings files from <app>/conf/settings.py to <app>/settings.py
2014-09-11 05:02:40 -04:00
tags
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
user_management
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
web_theme/locale/zh_CN/LC_MESSAGES
Merge branch 'master' into development
2014-10-01 05:19:51 -04:00
__init__.py
Move common templates to apps/main/templates/main/*
2014-08-26 02:44:49 -04:00