Wiki Forum Sign up! Explore Home

Not signed in (Sign In)

LiveSearch

Welcome, Guest

Want to take part in these discussions? Sign in if you have an account, or apply for one below

Vanilla 1.1.2 is a product of Lussumo. More Information: Documentation, Community Support.

    • CommentAuthordarkpollo
    • CommentTimeOct 9th 2008
     permalink
    Hi.

    I would like to modify some files on my local instalation. How will this affect to the system when i want to pull the latest changes that you could make in the "official" version?
    Is there any way to proceed to make the update withoit lost my changes?
    Thanks
    • CommentAuthorari
    • CommentTimeOct 10th 2008
     permalink
    If you use git, changes you make locally will not be overwritten. But sometimes you may need to deal with collisions which need to be merged by hand.

    Are the changes at your end something that could be committed back to CIT, possibly with a preference enabling/disabling the feature?
    • CommentAuthordarkpollo
    • CommentTimeOct 10th 2008
     permalink
    Thanks.
    I am still making the changes, but i cannot test them as my git doesn´t pull properly. (see other forum message).

    When i finished them (also i sent a message asking for help to the dev list) of course they could be committed back to CIT, if you explain me how to. :)

    Thanks!
    • CommentAuthorari
    • CommentTimeOct 11th 2008
     permalink
    Here is a page explaining how to submit patches back to the dev list: http://wiki.clockingit.com/dev:index

    I didn't see your message to the dev list, was it recent?

    As for your git problems, I'm not an expert on git so I can't help, but have you tried a fresh checkout of the repository? It looks like some local files are just out of sync and git doesn't know how to fix them.

    Ari
    • CommentAuthordarkpollo
    • CommentTimeOct 11th 2008
     permalink
    You can find it here:
    http://lists.clockingit.com/pipermail/dev/2008-October/000116.html
    And i could sent you a copy by email if you want.

    I am now updating the server and i will make a fresh install tonight, so i think the git problem will be solved after that.

    Thanks Ari.
    • CommentAuthorari
    • CommentTimeOct 13th 2008
     permalink
    Ah, yes, I did see the post after all, but I wasn't looking for "Angel". I wish I could help more with your questions, but I myself am only starting to understand CIT. Perhaps if you put your changes in the form of a patch they'll be a little easier for others to follow along.

    Some ideas:

    * in the popup 'any severity' should not be -1, but something different to other values, like -10

    Then the query might be:

    unless session[:filter_severity].to_i == -10
    filter << "tasks.severity >= #{session[:filter_severity].to_i} AND "

    Notice that the greater than equals sign means all severities greater or equal than the one chosen.


    The above comments are just from reading your email, not evaluating the actual code.

    Ari
    • CommentAuthordarkpollo
    • CommentTimeOct 13th 2008
     permalink
    Ah, yes, I did see the post after all, but I wasn't looking for "Angel". I wish I could help more with your questions, but I myself am only starting to understand CIT. Perhaps if you put your changes in the form of a patch they'll be a little easier for others to follow along.


    :)
    I am not sure how to "put your changes in the form of a patch".
    But i am learning fast. :P

    I have answer you in the dev list.
    Thank you.

    Darkpollo - Ángel. ;)