matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hotfix/v0.12.2' into development

Browse Source 
Conflicts:
	apps/common/__init__.py
	apps/documents/forms.py
	apps/feedback/__init__.py
	apps/history/__init__.py
	apps/main/__init__.py
	apps/scheduler/api.py
	apps/sources/models.py
	docs/releases/index.rst
	requirements/production.txt
	settings.py
	urls.py
This commit is contained in:
Roberto Rosario
2012-06-30 04:00:01 -04:00
parent 90c411f554 04de24ea51
commit 080d68c169
438 changed files with 12762 additions and 4473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/scheduler/api.py
View File

@@ -24,3 +24,7 @@ def remove_job(name):
if name in registered_jobs:
scheduler.unschedule_job(registered_jobs[name]['job'])
registered_jobs.pop(name)
def get_job_list():
return registered_jobs.values()