search

rashadkm / webgrass

Other
1 stars 3 forks source link

fixes for module ui #15

Closed mayank33 closed 8 years ago

rashadkm commented 8 years ago

can you explain why this include grassdata?. there is always something "unwanted" in commits

rashadkm commented 8 years ago

other than changes in grassdata and init_grass.sh everything else looks fine.

But there are merge conflicts. fix that first.

mayank33 commented 8 years ago

Please see now.I tried to solve them but If merge conflicts are much, then I will have to first rebase it and then apply my changes. See if it is easy to merge.

mayank33 commented 8 years ago

If not, then I will rebase it

rashadkm commented 8 years ago

let me know when it is ready for review again.

mayank33 commented 8 years ago

you can merge it now

rashadkm commented 8 years ago

what about the grassdata changes?

On Sun, Aug 7, 2016 at 4:06 PM, Mayank Agrawal notifications@github.com wrote:

you can merge it now

— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/rashadkm/webgrass/pull/15#issuecomment-238084352, or mute the thread https://github.com/notifications/unsubscribe-auth/ACSNO5nB9SPQohEdvhHfzgDcHUdY1coHks5qdeZOgaJpZM4JeXDd .

Regards, Rashad

mayank33 commented 8 years ago

grassdata, location, mapset has to be taken from the user and should be put in rc file. we can talk about it tommorow. variable set in cmake are not accessible in init_grass.sh

rashadkm commented 8 years ago

remove temp directory. i don't think it is needed.

rashadkm commented 8 years ago

always you make a single commit with a bunch of unrelated changes. "rendering", "everything done". why is that?

we always ask to put commits correctly. but this never happened.

rashadkm commented 8 years ago

grassdata directory is still there. cannot merge it.

mayank33 commented 8 years ago

removed