Skip to content

Conversation

@xqjibz
Copy link

@xqjibz xqjibz commented Dec 9, 2014

this has passport middleware worked in, so that we're authenticating web requests. See the commit log for a full breakdown of changes made.

Ron Siewert added 30 commits October 7, 2014 17:48
…he connect framework, which I didn't want to debug yet. can do that on another branch at some time in the future
… refs) don't know why this should not change anything but it didn't
…ames

angular is now returning data from node server
…anular view to get status, location(lat/long)
Conflicts:
	public/js/controllers.js
	routes/api.js
	views/index.jade
	views/layout.jade

Now merged Ok
Conflicts:
	public/js/controllers.js
	routes/api.js
	views/index.jade
	views/layout.jade
…olumn info if clicked in a column other than nodeId
…e...hence removing the partial1 and partial2 files
now have table loaded on page load and ref'ing nodes-list.jade
xqjibz and others added 30 commits December 9, 2014 13:20
Merge branch 'authentication' of https://github.com/rsiewert/Nodes-Talking-Admin into authentication
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.

1 participant