search

radiegtya / meteoris2

a Realtime Javascript Boilerplate base on Meteor Js Framework
MIT License
246 stars 45 forks source link

Modify .gitignore to ignore *.*~ backup files, also removed the *.*~ files that existed. #30

Closed ssteinerx closed 9 years ago

radiegtya commented 9 years ago

what is difference between this and Ssteiner x flip tree #31? I think it's just the same, I'll just merge the #31 instead

ssteinerx commented 9 years ago

Nothing, github doesn't seem to nail separate pull requests to particular revisions which I think it should. Subrepositories are checkouts at specific marks, why wouldn't pull requests be?

S

On Jan 13, 2015, at 5:13 AM, Ega Wachid Radiegtya wrote:

what is difference between this and Ssteiner x flip tree #31?

— Reply to this email directly or view it on GitHub.

radiegtya commented 9 years ago

ok good job @ssteinerx. But please hard retest it again from now. I'll help when i have time.

ssteinerx commented 9 years ago

I'm getting a small code generation error:

While building the application: lib/collections/Dogfood.js:15:4: Unexpected token ,

Investigating. I think this might have to do with the old bug about the last blank field entry line having to be deleted manually (which is now caught by an error message, but you still have to delete the blank field manually). I.E. it looks like the 'fix' may have introduced a new error. I'll look right now, and post another PR when I get it fixed.

ssteinerx commented 9 years ago

This does not occur in the unflipped app, but mugen is generating a "," in the output as if there were a second field when only one is entered in the form.

In the unflipped version, I cannot access the new collection (which I created when NOT logged in).

ssteinerx commented 9 years ago

Please move my changes to a flipped branch, leaving the unflipped as the current "master", and we can continue from there.

That will leave 'master' in a less broken state (I still think the 404 forbidden is a bug), and we can merge back when this all works.

Sorry for the trouble, I should have been more clear about merging this into a branch in the first place.

ssteinerx commented 9 years ago

Yes, we need to work on a branch until we both agree that it's working well.

If you'll pull over my ssteinerX-flip-tree branch into the main repo, I can send pull requests from my branch to yours and we can merge when we have both had time to test.

Steve

On Jan 13, 2015, at 5:40 AM, Ega Wachid Radiegtya wrote:

ok good job @ssteinerx. But please hard retest it again from now. I'll help when i have time.

— Reply to this email directly or view it on GitHub.

radiegtya commented 9 years ago

Your pr is ok, after I had detailed looking from your pr. I think the problem came from this file you are changing.

private/mugen/collections/TemplateCollection.js

tomorrow I`ll check it

ssteinerx commented 9 years ago

You are correct. Fixed. It was a change I made when I moved '/private' to under mugen which makes it not 'private'. The 'private' folder behaves differently from all other folders in Meteor and must be in the root to function properly. I think that's a mistake and am chatting with the Meteor guys about it.

Working on a couple of other things and I'll send a new, fixed pull request in a little while.

Thanks!

Steve

On Jan 13, 2015, at 8:06 AM, Ega Wachid Radiegtya wrote:

Your pr is ok, after I had detailed looking from your pr. I think the problem came from this file you are changing.

private/mugen/collections/TemplateCollection.js

tomorrow I`ll check it

— Reply to this email directly or view it on GitHub.