search

reading-am / reading

The dreams! The dreams! It's all just absurdity in the light of day but the dreams!
MIT License
10 stars 0 forks source link

332 notifications #377

Closed thebyrd closed 2 years ago

leppert commented 11 years ago

Did you rebase this and force push to origin?

git rebase origin/master git push origin/332-notifications --force

Make sure the rebase went well before you force push since it's a destructive action.

On Feb 11, 2013, at 2:52 PM, David Byrd notifications@github.com wrote:

You can merge this Pull Request by running

git pull https://github.com/leppert/reading 332-notifications Or view, comment on, or merge it at:

https://github.com/leppert/reading/pull/377

Commit Summary

try this saving some code for steve to look at dummy notification complete no need to assign the new Notification to a var not just listening for comments#create event removed #r_am and made .r_notification the container now everyone gets a notification for every comment on reading removed some debug code push notifications and toggle page title add notifications route and button add notifications template added subscription model add 'notify_when_mentioned' field properly migrate starting settings template implemented api/me finished notifications v1 removed debug code removed what's left of the subscription model removed what's left of the notify_when_mentioned attr removed users_controller#notificaitons removed views/notifications removed notifications from settings cleaned up schema.rb schema now matches master File Changes

M README.md (3) A app/assets/javascripts/backbone/templates/notifications/notification.hbs (4) A app/assets/javascripts/backbone/views/notifications/notification.coffee (59) A app/assets/javascripts/notifier/loader.coffee (5) A app/assets/javascripts/notifier/real_loader.coffee (36) A app/assets/stylesheets/notifications/notifications.css.less (82) M app/controllers/api/users_controller.rb (6) M app/models/comment.rb (13) M app/models/comment_observer.rb (8) M config/routes.rb (1) M db/schema.rb (5) Patch Links:

https://github.com/leppert/reading/pull/377.patch https://github.com/leppert/reading/pull/377.diff

thebyrd commented 11 years ago

Ok, I used the github interface, but I'll try again with the cmd line — Sent from Mailbox for iPhone

On Mon, Feb 11, 2013 at 3:31 PM, Greg Leppert notifications@github.com wrote:

Did you rebase this and force push to origin?

git rebase origin/master git push origin/332-notifications --force Make sure the rebase went well before you force push since it's a destructive action. On Feb 11, 2013, at 2:52 PM, David Byrd notifications@github.com wrote:

You can merge this Pull Request by running

git pull https://github.com/leppert/reading 332-notifications Or view, comment on, or merge it at:

https://github.com/leppert/reading/pull/377

Commit Summary

try this saving some code for steve to look at dummy notification complete no need to assign the new Notification to a var not just listening for comments#create event removed #r_am and made .r_notification the container now everyone gets a notification for every comment on reading removed some debug code push notifications and toggle page title add notifications route and button add notifications template added subscription model add 'notify_when_mentioned' field properly migrate starting settings template implemented api/me finished notifications v1 removed debug code removed what's left of the subscription model removed what's left of the notify_when_mentioned attr removed users_controller#notificaitons removed views/notifications removed notifications from settings cleaned up schema.rb schema now matches master File Changes

M README.md (3) A app/assets/javascripts/backbone/templates/notifications/notification.hbs (4) A app/assets/javascripts/backbone/views/notifications/notification.coffee (59) A app/assets/javascripts/notifier/loader.coffee (5) A app/assets/javascripts/notifier/real_loader.coffee (36) A app/assets/stylesheets/notifications/notifications.css.less (82) M app/controllers/api/users_controller.rb (6) M app/models/comment.rb (13) M app/models/comment_observer.rb (8) M config/routes.rb (1) M db/schema.rb (5) Patch Links:

https://github.com/leppert/reading/pull/377.patch

https://github.com/leppert/reading/pull/377.diff

Reply to this email directly or view it on GitHub: https://github.com/leppert/reading/pull/377#issuecomment-13400951

thebyrd commented 11 years ago

I got "Everything up-to-date" when I did that.

leppert commented 11 years ago

Everything up-to-date? Hmmm.

Email me the output of this command:

git show --summary git merge-base 332-notifications master

On Feb 11, 2013, at 8:51 PM, David Byrd notifications@github.com wrote:

I got "Everything up-to-date" when I did that.

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