search

vojtajina / helpdesk-client

Helpdesk application - simple JS client, written in angularjs, working with REST service
www.angularjs.org
59 stars 23 forks source link

Status #6

Closed alenkacz closed 13 years ago

vojtajina commented 13 years ago

Couple of comments in-lined. Next time, always run all tests before pushing pull request :-D

Rebase to latest master - there will be simple conflict... I really recommend to configure git mergetool to use some GUI tool for 3-way merging. I like p4merge on Mac, or DiffMerge on Linux. Of course, it's up to you - you can do merging from command line as well... http://www.sourcegear.com/diffmerge/ http://www.perforce.com/product/components/perforce_visual_merge_and_diff_tools

alenkacz commented 13 years ago

rebased and fixed! Let's start the next iteration :o)

vojtajina commented 13 years ago

Note that it was not rebased on latest master. The common parent with master was 73c1169eeae483a262fba04e315470fd3337160c, but the master was on 12cbfc51e144de94cb441b8e7249213bc7b8da73. I fixed couple of tabs to spaces as well and changed the status toolbar to be fixed position, so that you can see the status even when scrolled down the page...

Merged as 3fc6e5737902800a5ca99e6d3dfd812adb797af8. :+1: Thank you very much !