Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed code conventions #91

Merged
merged 2 commits into from
Dec 18, 2015
Merged

Fixed code conventions #91

merged 2 commits into from
Dec 18, 2015

Conversation

kaine119
Copy link
Contributor

https://codein.withgoogle.com/dashboard/task-instances/5021956311089152/

I'm Kai En, from the above Google Code-in task. I've fixed some spelling mistakes and coding conventions.

@robbyoconnor
Copy link
Member

Your branch has conflicts which must be resolved.

@robbyoconnor
Copy link
Member

Rebase and Squash your commits please.

@robbyoconnor
Copy link
Member

@mogoodrich, could you have a look at this?

@mogoodrich
Copy link
Member

@kaine119 @robbyoconnor annoying, this diff is so big github won't show me the whole thing. Kai En, can you summarize what you did? Was it just applying the formatter? Thanks!

@dkayiwa
Copy link
Member

dkayiwa commented Dec 18, 2015

Looks like so! :)

@kaine119
Copy link
Contributor Author

@mogoodrich: Yes, I did just apply the formatter. I fixed indents, staggered long lines, and added curly braces to some if statements, i.e:

if (condition) {
    // do stuff
}

instead of

if (condition)
    //do stuff

Here's a (mostly accurate) list of changes.
module-htmlformentry changes.txt

@mogoodrich
Copy link
Member

@kaine119 thanks for the very detailed explanation!

@lluismf
Copy link

lluismf commented Dec 18, 2015

@ mogoodrich Weird that github can't show you the diff, which browser are you using?

@mogoodrich
Copy link
Member

Chrome. I can see most of it, but it tells me it is too big to show all of it:

https://github.com/openmrs/openmrs-module-htmlformentry/pull/91/files

(I think I've got all the information I need)

@lluismf
Copy link

lluismf commented Dec 18, 2015

ok got the same message with Firefox (I was looking at another link).

mogoodrich added a commit that referenced this pull request Dec 18, 2015
@mogoodrich mogoodrich merged commit 48e00ff into openmrs:master Dec 18, 2015
@mogoodrich
Copy link
Member

@kaine119 I just merged this in, but it resulted in compile errors, so I had to revert. See here:

http://bamboo.pih-emr.org:8085/browse/MIREBALAIS-HFE-467

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants