danielgrippi
|
91e649977c
|
MS DG update copyright
|
2011-09-14 11:23:12 -07:00 |
|
danielgrippi
|
0cceb4fdd3
|
fixed people/contacts layout; pulled person sub-header into its own partial
|
2011-08-05 15:51:18 -07:00 |
|
danielgrippi
|
e345f2dcbc
|
fix contacts index page
|
2011-07-29 14:15:28 -07:00 |
|
Raphael Sofaer
|
d0ce257107
|
Revert "Revert "Merge branch 'hashtags-in-comments'""
This reverts commit d2e26f6937.
|
2011-07-07 15:10:04 -07:00 |
|
danielgrippi
|
d2e26f6937
|
Revert "Merge branch 'hashtags-in-comments'"
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
|
2011-07-07 13:39:15 -07:00 |
|
danielgrippi
|
310b9969f3
|
hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here...
|
2011-07-07 12:21:57 -07:00 |
|
MrZYX
|
c47c9ef069
|
fix untranslated string; fix two translations; don't mess routes.rb again
|
2011-05-18 00:53:48 +02:00 |
|
danielgrippi
|
648a10e6d3
|
Merge branch 'master' into follow
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
|
2011-05-04 11:35:35 -07:00 |
|
Raphael Sofaer
|
363ef2c276
|
Fix some translations (thanks MrZYX)
|
2011-04-12 12:24:29 -07:00 |
|
Raphael Sofaer
|
555a774668
|
Initial contacts_of_contact page
|
2011-03-23 16:42:53 -07:00 |
|