Age | Commit message (Collapse) | Author |
|
|
|
|
|
Conflicts:
app/models/user.rb
db/schema.rb
|
|
|
|
|
|
|
|
|
|
merge_email_change
Conflicts:
app/controllers/users_controller.rb
config/locales/diaspora/en.yml
db/schema.rb
spec/controllers/users_controller_spec.rb
spec/mailers/notifier_spec.rb
|
|
|
|
|
|
|
|
having some service user data
|
|
|
|
include author_id; extracted before_save callback needed for tags into Diaspora::Taggable.
|
|
|
|
|
|
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
|
|
|
|
|
|
|
|
|
|
|
|
vertical rule to people pages
|
|
|
|
|
|
Conflicts:
Gemfile
Gemfile.lock
app/models/app_config.rb
app/models/post.rb
db/schema.rb
public/stylesheets/sass/application.sass
spec/lib/webfinger_spec.rb
|
|
|
|
|
|
|
|
|
|
user's authorizations
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
guard for ruby 1.8.x.
|
|
|
|
|
|
|
|
|
|
|
|
oauth flow
|
|
former migration had dependent spelled wrong, and it silently failed
|
|
|
|
being updated
|
|
|
|
|