Roberto Rosario
|
810cbd710e
|
Merge branch 'cccs-web-master'
|
2014-07-11 18:37:23 -04:00 |
|
Roberto Rosario
|
cac87d1d37
|
Merge branch 'master' of https://github.com/cccs-web/mayan-edms into cccs-web-master
Conflicts:
docs/credits/contributors.rst
|
2014-07-11 18:35:45 -04:00 |
|
Paul Whipp
|
9370d5bd66
|
Update contributors.rst
Added Paul Whipp
|
2014-07-12 08:17:06 +10:00 |
|
Roberto Rosario
|
cdcfc39f3c
|
Remove the donations text
|
2014-07-11 11:29:30 -04:00 |
|
Roberto Rosario
|
48bb4a94c7
|
Fix markup and typo
|
2014-07-11 04:11:44 -04:00 |
|
Roberto Rosario
|
ee52c2cfc0
|
Try a different formatter
|
2014-07-11 04:09:13 -04:00 |
|
Roberto Rosario
|
a9e0bde6ac
|
Add PyPI installation instructions
|
2014-07-11 04:03:59 -04:00 |
|
Roberto Rosario
|
7355c17880
|
Fix markup error
|
2014-07-11 03:56:50 -04:00 |
|
Roberto Rosario
|
f871fe33d7
|
Don't include the single quote ' as a valid secret key character
|
2014-07-11 03:50:59 -04:00 |
|
Roberto Rosario
|
8720dc814d
|
Add PyPI badges
|
2014-07-11 03:45:42 -04:00 |
|
Roberto Rosario
|
2c845ca72e
|
Generate a new secret key and save it to local.py settings after installation, use this local.py file by default
|
2014-07-11 03:34:28 -04:00 |
|
Roberto Rosario
|
0d55f2e0e2
|
Don't include local setting files, include README to create an empty media directory
|
2014-07-11 03:33:37 -04:00 |
|
Roberto Rosario
|
f12e9e4aef
|
Include jpg and js files in the installation
|
2014-07-11 02:54:26 -04:00 |
|
Roberto Rosario
|
f3631ee326
|
Downgrade version
|
2014-07-11 02:54:07 -04:00 |
|
Roberto Rosario
|
17b072df41
|
Update deprecated methods
|
2014-07-11 02:53:36 -04:00 |
|
Roberto Rosario
|
9a05278957
|
Do debug static media serving as per Django 1.6 docs, don't try to import DDT if it is not installed
|
2014-07-11 02:48:33 -04:00 |
|
Roberto Rosario
|
548ccda347
|
Add the Django debug toolbar middleware at the beginning as per the docs
|
2014-07-11 02:47:56 -04:00 |
|
Roberto Rosario
|
657b9106c2
|
Use timezone aware datetime in migration
|
2014-07-11 01:56:54 -04:00 |
|
Roberto Rosario
|
e13637d766
|
Use timezone aware datetime in migration
|
2014-07-11 01:53:32 -04:00 |
|
Roberto Rosario
|
9403f06301
|
Removed unused imports
|
2014-07-11 01:53:08 -04:00 |
|
Roberto Rosario
|
e7c3547e69
|
Cleanups
|
2014-07-11 01:43:29 -04:00 |
|
Roberto Rosario
|
b6d9717223
|
Remove last usage of Django's simplejson library
|
2014-07-11 01:37:57 -04:00 |
|
Roberto Rosario
|
2b2cd80a18
|
Fix and improve the existing tests
|
2014-07-11 01:35:00 -04:00 |
|
Roberto Rosario
|
2a46d6f601
|
Fix and improve the document_signatures test
|
2014-07-11 01:31:59 -04:00 |
|
Roberto Rosario
|
e2ae80b43d
|
Add the old secret key back fixes test runners
|
2014-07-11 01:16:24 -04:00 |
|
Roberto Rosario
|
df55385d07
|
Import base.py by default
|
2014-07-11 01:15:51 -04:00 |
|
Roberto Rosario
|
f2c351fbc7
|
Remove the SITE_ROOT settings variable and use Django's MEDIA_ROOT instead.
By default MEDIA_ROOT will point to a new 'media' inside Mayan's main directory.
|
2014-07-11 01:06:50 -04:00 |
|
Roberto Rosario
|
3f9adb0922
|
Separate development settings file into two, with and without Django Debug Toolbar
|
2014-07-11 00:39:58 -04:00 |
|
Roberto Rosario
|
42f8879efa
|
Merge branch 'cccs-web-master'
|
2014-07-11 00:33:12 -04:00 |
|
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 |
|
Roberto Rosario
|
c35c040513
|
Merge remote-tracking branch 'origin/master'
|
2014-07-10 21:07:37 -04:00 |
|
Roberto Rosario
|
8da0ac2bef
|
Update package name
|
2014-07-10 20:57:46 -04:00 |
|
Roberto Rosario
|
2a89e2be23
|
Merge pull request #13 from mbehrle/feature/lost_merges
Feature/lost merges
|
2014-07-10 20:42:02 -04:00 |
|
Mathias Behrle
|
30f73ba73c
|
Increasing field length of page_label to 40 chars.
The german translation takes 33 chars. This breaks saving the ocr
result.
|
2014-07-11 01:59:04 +02:00 |
|
Roberto Rosario
|
bc2a04efa2
|
Add document uploading and deletion functional test
|
2014-07-10 19:51:56 -04:00 |
|
Mathias Behrle
|
53ab7a23e6
|
Adding french cleanup file.
|
2014-07-11 01:08:11 +02:00 |
|
Mathias Behrle
|
506d65c93e
|
Adding language correction file for Germany (deu).
|
2014-07-11 00:56:15 +02:00 |
|
Roberto Rosario
|
8d119caa81
|
Move instructions from section
|
2014-07-10 04:48:01 -04:00 |
|
Roberto Rosario
|
607050be65
|
Remove unused link and url pattern
|
2014-07-10 04:46:35 -04:00 |
|
Roberto Rosario
|
656c2e6d3c
|
Use the document display view and not the document preview view by default now when clicking on document thumbnails
|
2014-07-10 04:45:53 -04:00 |
|
Roberto Rosario
|
c7e197378c
|
Remove unused URL pattern
|
2014-07-10 04:39:21 -04:00 |
|
Roberto Rosario
|
fc71ca8f8a
|
Update document widget parameters
|
2014-07-10 04:38:54 -04:00 |
|
Roberto Rosario
|
9194b45e91
|
Update document metadata accesor name
|
2014-07-10 04:38:33 -04:00 |
|
Roberto Rosario
|
aa9a5bd206
|
Remove RTD theme code
|
2014-07-10 04:22:10 -04:00 |
|
Roberto Rosario
|
568fe87074
|
Documentation updates
|
2014-07-10 04:19:59 -04:00 |
|
pwhipp
|
a05424c799
|
Added gunicorn to production requirements
|
2014-07-10 18:01:42 +10:00 |
|
pwhipp
|
ec6466dce2
|
removed redundant import
|
2014-07-10 17:43:38 +10:00 |
|
pwhipp
|
af7effb9cb
|
Added deployment information for production site
|
2014-07-10 17:42:07 +10:00 |
|
pwhipp
|
a011098c2c
|
Added .gitignore so that secrets.py never gets added into the repo by accident.
|
2014-07-10 17:03:11 +10:00 |
|
pwhipp
|
877ec04faf
|
Added explicit debug toolbar setup
|
2014-07-10 17:02:01 +10:00 |
|