Dan Hansen
|
545611fffa
|
green?
|
2011-08-21 20:45:51 -05:00 |
|
Dan Hansen
|
3ed50cab94
|
Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged
Conflicts:
app/views/status_messages/bookmarklet.html.haml
config/assets.yml
db/schema.rb
public/javascripts/contact-edit.js
public/javascripts/publisher.js
public/javascripts/view.js
|
2011-08-20 14:40:56 -05:00 |
|
Maxwell Salzberg
|
735a37ffe0
|
really basic preventivie mesures for facebook friending. we need to GO ALL THE WAY and proxy facebook users to be in many aspects
|
2011-08-19 15:57:10 -07:00 |
|
Maxwell Salzberg
|
bb5ada6533
|
create a wrapper class for devise mailer, both so we can resquify it and so we can inject helpers
|
2011-08-19 15:57:10 -07:00 |
|
Maxwell Salzberg
|
e4062bf5fd
|
now functionally correct
|
2011-08-19 15:56:32 -07:00 |
|
Maxwell Salzberg
|
70fe2cf10f
|
wip
|
2011-08-19 15:56:31 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
2c47262d54
|
manually pulled in manuels latest commits
|
2011-08-18 16:49:26 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
c3bcb9c962
|
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
This reverts commit a407f12463.
|
2011-08-18 16:48:20 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
a407f12463
|
Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
This reverts commit 2777f16f4f, reversing
changes made to 8b278adff6.
|
2011-08-18 16:16:14 -07:00 |
|
Raphael Sofaer
|
cc3eeac98e
|
Merge the aspect dropdown in the publisher with master, some things are still broken
|
2011-08-16 14:59:53 -07:00 |
|
Raphael Sofaer
|
d228f50557
|
Acceptable ajax loader for the aspect dropdown.
|
2011-08-13 12:45:17 -07:00 |
|
danielgrippi
|
1c5f61fb78
|
dropdown images as embedded assets and not 2 separate image tags
|
2011-08-12 18:18:58 -07:00 |
|
danielgrippi
|
75f3accd37
|
moved facebook friend inviter/finder into contacts layout & re-added search
|
2011-08-12 17:05:01 -07:00 |
|
Dan Hansen
|
2e9040e227
|
merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less
|
2011-08-10 23:57:33 -07:00 |
|
Manuel Schölling
|
fead6032f7
|
Issue 1586: added a aspect drop down next to the submit button in the publisher
|
2011-08-07 12:51:32 +02:00 |
|
Sarah Mei
|
7f81892245
|
For some reason, firefox doesn't like the outerHTML property of this div - it's always undefined. This was manifesting itself as ajax requests never completing in the cucumber feature due to a js error.
|
2011-07-31 13:32:05 -07:00 |
|
danielgrippi
|
a96b77555e
|
DHHHHHHHHHHHHHHHHHHHHHHHHHH hovercard caching with subscription on state change
|
2011-07-06 12:45:16 -07:00 |
|
Ilyaaaaaaaaaaaaa Zhitomirskiy
|
1c79c2c6f0
|
made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses
|
2011-07-06 12:45:16 -07:00 |
|
danielgrippi
|
4e48db23f0
|
aspect dropdown shows name of aspect if contact is only in one; green
|
2011-06-30 12:18:41 -07:00 |
|
danielgrippi
|
d70f10b609
|
made dropdown selectors sexi
|
2011-05-16 16:29:13 -07:00 |
|
Ilya Zhitomirskiy
|
709ac44da3
|
fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
|
2011-05-16 02:16:46 -07:00 |
|
danielgrippi
|
402e84708b
|
ms iz; everything is green, the sharewith is translated in js, fixed the clicking on the checkbox bug
|
2011-05-13 16:05:37 -07:00 |
|
danielgrippi
|
a9a1280e17
|
one cuke failing. wip
|
2011-05-12 20:41:56 -07:00 |
|
danielgrippi
|
7893129435
|
prevent user from hitting aspectmemberships controller before response on dropdowns
|
2011-05-11 17:07:58 -07:00 |
|
danielgrippi
|
c67d143719
|
dropdown in ContactsController#sharing now works
|
2011-05-11 15:47:13 -07:00 |
|
danielgrippi
|
9f3044838d
|
Views for contactscontroller#sharing almost done, cuke for editing aspect memberships started
|
2011-05-11 14:53:43 -07:00 |
|