Thanks a lot. I hope the review team finds it a worthy addition to the products you offer.
Disclaimer: I am not a Git expert, but I think a fork with two branches would be the best choice. One branch is the vanilla Mayan and another with your company specific code. You can merge from the vanilla to the company specific one almost straight away, dealing with conflicts only when there are commits the vanilla branch that write over files that are also present in the company branch (which should be very few if any). For improvements in the company branch that you want to merge to the vanilla branch you can use the cherry-pick command and just merge specific commits. On Friday, July 11, 2014 6:20:30 PM UTC-4, Paul Whipp wrote: > > It is a pleasure to contribute to what is looking like a very impressive > package. > > For our use case we need to incorporate Mayan into our existing sites. > I'll begin working on that once the staff have completed their review of > its functionality (assuming they approve it). I'll have to work out a > process where I can keep a clean fork of mayan (to generate pull requests > where I feel I can contribute further), any customisations not suitable for > inclusion and our site specific stuff. > > > On 11 July 2014 11:13, Roberto Rosario <roberto...> wrote: > >> No worries :) >> Thanks for the help. >> On Jul 9, 2014 1:16 AM, "Lachlan Musicman" <[email protected]> wrote: >> >>> Yes, I apologise for sending you on the appsembler path, my bad. >>> >>> >>> cheers >>> L. >>> >>> On 9 July 2014 15:13, Roberto Rosario >>> <roberto...> wrote: >>> > Hi Paul, >>> > >>> > The mayan_appsembler repository is a custom fork of Mayan for the >>> appsembler >>> > platform (https://dashboard.appsembler.com/appstore/app/48/mayan/) >>> and is >>> > not meant for general usage. Deploy from >>> > https://github.com/mayan-edms/mayan-edms (or the older >>> > https://github.com/rosarior/mayan-edms if getting errors) into a >>> virtualenv >>> > as Mayan has quite a bit of dependencies that could clash with system >>> wide >>> > libraries if deployed system wide. The signaler app is a Mayan app >>> > [ >>> https://github.com/mayan-edms/mayan-edms/tree/master/mayan/apps/signaler >>> ] >>> > so I am at a loss as to why your install is saying it is missing. >>> > Registration and bootstrap are Mayan apps too, the requirements.txt >>> has all >>> > the 3rd party apps required. Mayan has now moved to Django 1.6 and a >>> Django >>> > 1.6 project structure which even simplified the installation. I've >>> updated >>> > the installation instructions and simplified them >>> > [http://mayan.readthedocs.org/en/latest/intro/installation.html]. >>> Just tried >>> > a clean install and had no app errors. Give it a second go following >>> this >>> > new instructions. Thanks, >>> > >>> > --Roberto >>> > >>> > >>> > >>> > >>> > On Tuesday, July 8, 2014 8:16:35 PM UTC-4, Paul Whipp wrote: >>> >> >>> >> Thanks for the quick response. I can see it there, along with a lot of >>> >> other modules, which I guess I'm going to need as well. I don't >>> understand >>> >> how the mayan_appsembler repo is intended to fit in with the >>> mayan_edms >>> >> repo. >>> >> >>> >> I've cloned mayan_appsembler and added its apps to my virtualenv path. >>> >> >>> >> Then I hit 'registration' as a missing module so I installed >>> >> 'django-registration' (hope that is the one) - missing from >>> >> requirements.txt? >>> >> >>> >> Then I hit 'bootstrap' as a missing module so I installed >>> django-bootstrap >>> >> (ditto) - missing from requirements.txt? >>> >> >>> >> Then I hit >>> >> >>> >> ... >>> >> >>> >> File >>> >> "/home/paul/wk/cccs/mayan_appsembler/apps/storage/conf/settings.py", >>> line >>> >> 16, in <module> >>> >> {'name': u'FILESTORAGE_LOCATION', 'global_name': >>> >> u'STORAGE_FILESTORAGE_LOCATION', 'default': >>> >> os.path.join(settings.PROJECT_ROOT, u'document_storage'), 'exists': >>> True}, >>> >> File >>> >> >>> "/home/paul/.virtualenvs/mayan/local/lib/python2.7/site-packages/django/conf/__init__.py", >>> >> line 55, in __getattr__ >>> >> return getattr(self._wrapped, name) >>> >> AttributeError: 'Settings' object has no attribute 'PROJECT_ROOT' >>> >> >>> >> >>> >> >>> >> It seems that the installation guide is missing something substantial. >>> >> >>> >> How should I set about getting a working local copy where I'm >>> confident >>> >> that I have the right dependencies so that I can explore the code and >>> >> consider contributing? >>> >> >>> >> Cheers, >>> >> Paul >>> >> >>> >> >>> >> On 9 July 2014 08:05, Lachlan Musicman <[email protected]> wrote: >>> >>> >>> >>> Paul, >>> >>> >>> >>> Seems to be here? >>> >>> >>> >>> >>> https://github.com/rosarior/mayan_appsembler/tree/master/apps/signaler >>> >>> >>> >>> cheers >>> >>> L. >>> >>> >>> >>> On 9 July 2014 07:55, Paul Whipp <[email protected]> wrote: >>> >>> > Hi there, >>> >>> > >>> >>> > I'm taking a look at Mayan which looks potentially very useful. I >>> am an >>> >>> > experienced Django/Python programmer. >>> >>> > >>> >>> > Following your instructions at >>> >>> > https://mayan.readthedocs.org/en/latest/intro/installation.html to >>> >>> > create a >>> >>> > local test installation went very well (nice clear instructions) >>> until >>> >>> > just >>> >>> > before syncing the db. >>> >>> > >>> >>> > When I launch the shell (just to check everything before syncing >>> up the >>> >>> > db) >>> >>> > I get: >>> >>> > >>> >>> > ImportError: No module named signaler >>> >>> > >>> >>> > pip installed everything in the (dev) requirements fine. and there >>> is >>> >>> > no >>> >>> > easy help available via google. >>> >>> > >>> >>> > I could just drop 'signaler' from the list but I worry that it is >>> >>> > likely to >>> >>> > be crucial. >>> >>> > >>> >>> > How can I obtain the missing module? >>> >>> > >>> >>> > I'm hopeful that as it is the last module in the INSTALLED_APPS >>> that >>> >>> > this is >>> >>> > the only thing preventing me getting my test installation up and >>> >>> > running. >>> >>> > >>> >>> > Thanks in anticipation, >>> >>> > Paul Whipp >>> >>> > >>> >>> > Github: https://github.com/pwhipp >>> >>> > Office: 07 3103 2894 (Australia Only) >>> >>> > Mobile: +61 410 545 357 >>> >>> > Skype: paul_whipp >>> >>> > >>> >>> > Django, Python, and PostgreSQL web application developer >>> >>> > >>> >>> > -- >>> >>> > >>> >>> > --- >>> >>> > You received this message because you are subscribed to the Google >>> >>> > Groups >>> >>> > "Mayan EDMS" group. >>> >>> > To unsubscribe from this group and stop receiving emails from it, >>> send >>> >>> > an >>> >>> > email to [email protected]. >>> >>> > For more options, visit https://groups.google.com/d/optout. >>> >>> >>> >>> >>> >>> >>> >>> -- >>> >>> The idea is that a beautiful image is frameable. Everything you need >>> >>> to see is there: It’s everything you want, and it’s very pleasing >>> >>> because there’s no extra information that you don’t get to see. >>> >>> Everything’s in a nice package for you. But sublime art is >>> >>> unframeable: It’s an image or idea that implies that there’s a bigger >>> >>> image or idea that you can’t see: You’re only getting to look at a >>> >>> fraction of it, and in that way it’s both beautiful and scary, >>> because >>> >>> it’s reminding you that there’s more that you don’t have access to. >>> >>> It’s now sort of left the piece itself and it’s become your own >>> >>> invention, so it’s personal as well as being scary as well as being >>> >>> beautiful, which is what I really like about art like that. >>> >>> >>> >>> >>> ----------------------------------------------------------------------------------------------------------- >>> >>> Adventure Time http://theholenearthecenteroftheworld.com/ >>> >>> >>> >>> -- >>> >>> >>> >>> --- >>> >>> You received this message because you are subscribed to a topic in >>> the >>> >>> Google Groups "Mayan EDMS" group. >>> >>> To unsubscribe from this topic, visit >>> >>> https://groups.google.com/d/topic/mayan-edms/300U2OswhW0/unsubscribe >>> . >>> >>> To unsubscribe from this group and all its topics, send an email to >>> >>> [email protected]. >>> >>> For more options, visit https://groups.google.com/d/optout. >>> >> >>> >> >>> > -- >>> > >>> > --- >>> > You received this message because you are subscribed to the Google >>> Groups >>> > "Mayan EDMS" group. >>> > To unsubscribe from this group and stop receiving emails from it, send >>> an >>> > email to [email protected]. >>> > For more options, visit https://groups.google.com/d/optout. >>> >>> >>> >>> -- >>> The idea is that a beautiful image is frameable. Everything you need >>> to see is there: It’s everything you want, and it’s very pleasing >>> because there’s no extra information that you don’t get to see. >>> Everything’s in a nice package for you. But sublime art is >>> unframeable: It’s an image or idea that implies that there’s a bigger >>> image or idea that you can’t see: You’re only getting to look at a >>> fraction of it, and in that way it’s both beautiful and scary, because >>> it’s reminding you that there’s more that you don’t have access to. >>> It’s now sort of left the piece itself and it’s become your own >>> invention, so it’s personal as well as being scary as well as being >>> beautiful, which is what I really like about art like that. >>> >>> ----------------------------------------------------------------------------------------------------------- >>> Adventure Time http://theholenearthecenteroftheworld.com/ >>> >>> -- >>> >>> --- >>> You received this message because you are subscribed to the Google >>> Groups "Mayan EDMS" group. >>> To unsubscribe from this group and stop receiving emails from it, send >>> an email to [email protected]. >>> For more options, visit https://groups.google.com/d/optout. >>> >> -- >> >> --- >> You received this message because you are subscribed to a topic in the >> Google Groups "Mayan EDMS" group. >> To unsubscribe from this topic, visit >> https://groups.google.com/d/topic/mayan-edms/300U2OswhW0/unsubscribe. >> To unsubscribe from this group and all its topics, send an email to >> [email protected]. >> For more options, visit https://groups.google.com/d/optout. >> > > -- --- You received this message because you are subscribed to the Google Groups "Mayan EDMS" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
