Adding Persona Authentication # DO NOT MERGE #

[edchiou]

Backend functionality for Persona, going to add GitHub to this if possible

Note: Since the Waterbear folder in this repo is listed as a submodule, I have to push front-end modifications via Waterbear rather than this repo.

[stretchyboy]

All of my computers died last night (4 ..... really 4 of them) so I maybe a
day or so before I can test this, but its half term here next week so I'm
not teaching and should be able to concentrate on Waterbear things for a
few days.

On 21 February 2014 06:51, edchiou [email protected] wrote:

Backend functionality for Persona, going to add GitHub to this if possible

Note: Since the Waterbear folder in this repo is listed as a submodule, I

have to push front-end modifications via Waterbear rather than this repo.

You can merge this Pull Request by running

git pull https://github.com/edchiou/RPi-WaterbearNodeJS persona_auth

Or view, comment on, or merge it at:

#1
Commit Summary

• does this work

File Changes

• M package.jsonhttps://github.com/Adding Persona Authentication # DO NOT MERGE # #1/files#diff-0(3)
• M waterbear.jshttps://github.com/Adding Persona Authentication # DO NOT MERGE # #1/files#diff-1(221)

Patch Links:

• https://github.com/waterbearlang/RPi-WaterbearNodeJS/pull/1.patch
• https://github.com/waterbearlang/RPi-WaterbearNodeJS/pull/1.diff

Reply to this email directly or view it on GitHubhttps://github.com//pull/1
.

Regards,

Martyn

https://twitter.com/#!/stretchyboy

[stretchyboy]

Sorry, I can't find the front end changes to go with this.

On 21 February 2014 14:32, Martyn Eggleton [email protected]:

All of my computers died last night (4 ..... really 4 of them) so I maybe
a day or so before I can test this, but its half term here next week so I'm
not teaching and should be able to concentrate on Waterbear things for a
few days.

On 21 February 2014 06:51, edchiou [email protected] wrote:

Backend functionality for Persona, going to add GitHub to this if possible

Note: Since the Waterbear folder in this repo is listed as a submodule, I

have to push front-end modifications via Waterbear rather than this repo.

You can merge this Pull Request by running

git pull https://github.com/edchiou/RPi-WaterbearNodeJS persona_auth

Or view, comment on, or merge it at:

#1
Commit Summary

• does this work

File Changes

• M package.jsonhttps://github.com/Adding Persona Authentication # DO NOT MERGE # #1/files#diff-0(3)
• M waterbear.jshttps://github.com/Adding Persona Authentication # DO NOT MERGE # #1/files#diff-1(221)

Patch Links:

• https://github.com/waterbearlang/RPi-WaterbearNodeJS/pull/1.patch
• https://github.com/waterbearlang/RPi-WaterbearNodeJS/pull/1.diff

Reply to this email directly or view it on GitHubhttps://github.com//pull/1
.

Regards,

Martyn

https://twitter.com/#!/stretchyboy

Regards,

Martyn

https://twitter.com/#!/stretchyboy

[edchiou]

I have yet to make a pull request for the front-end changes. Not sure how to reference a different branch for the Waterbear submodule.

Are there any RPi-specific changes to the Waterbear submodule that I should be aware of? For the front-end, I was thinking of just branching off of Waterbear's master branch and applying the changes there, unless there are compatibility issues.

My branch for the front end is here: https://github.com/waterbearlang/waterbear/tree/persona_front

[stretchyboy]

Method 1

cd into the waterbear dir and do a checkout (and pull) to get to the
correct branch.
cd .. back up to the server dir and git add waterbear & commit it and do
the pull request from the server dir (leaving the frontend pull request to
a pull to master when we are done?)

Method 2 just point me at the repo and branch you have the changes on and I
can have a look before doing Method 1

On 25 February 2014 10:37, edchiou [email protected] wrote:

I have yet to make a pull request for the front-end changes. Not sure how
to reference a different branch for the Waterbear submodule.

Reply to this email directly or view it on GitHubhttps://github.com//pull/1#issuecomment-35994848
.

Regards,

Martyn

https://twitter.com/#!/stretchyboy