Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
app/models/user.rb
db/schema.rb
|
|
|
|
|
|
|
|
Conflicts:
app/views/conversations/new.haml
|
|
|
|
|
|
|
|
Use "Sending..." instead of "Posting..." for new conversation.
|
|
|
|
|
|
highlight-unread-conversations
|
|
this should fix #1668
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fix for issue #1603 - use different i18n string for comment likes count
|
|
rafi. never monkey patch anything on the top of a completely random
model. never again. ever.
TODO: look into replacing a monkey patch on a to_s in User#generate_key
that makes the single test green, but my dell had a heart attack other
places, that might just be sqlite3 or my dell
|
|
|
|
|
|
|
|
that ui nice
|
|
|
|
|
|
refer to guids
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back
|
|
|