Commit Graph

7 Commits

Author SHA1 Message Date
Roberto Rosario
972aa02976 Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master
Conflicts:
	mayan/settings/includes/common.py
2014-07-11 00:32:50 -04:00
pwhipp
877ec04faf Added explicit debug toolbar setup 2014-07-10 17:02:01 +10:00
Roberto Rosario
e60d5fedfa Add django rest swagger to the requirements 2014-07-09 14:23:45 -04:00
Roberto Rosario
d19f3da730 Backport statistics app, remove statistic code from the main app, convert the documents and ocr apps to use the new statictics app code 2014-07-04 01:46:16 -04:00
Roberto Rosario
3c9bbb05b5 Get rid of the DEVELOPMENT global flag, DEBUG now triggers development mode too 2014-06-29 15:59:31 -04:00
Roberto Rosario
3b73936723 Update patterns, url imports in all of the project's urls.py files 2014-06-26 15:27:03 -04:00
Roberto Rosario
fed1bb7985 Reduce directory struture complexity 2014-06-19 15:42:06 +02:00