Commit graph

7934 commits

Author SHA1 Message Date
danielgrippi
fdaa44ca9c add hovercards to links in likes 2011-07-06 21:09:24 -07:00
danielgrippi
f0fa79bb09 Revert "ordered hash stuff"
This reverts commit 2d98b939d1.
2011-07-06 19:13:34 -07:00
danielgrippi
2d98b939d1 ordered hash stuff 2011-07-06 19:11:53 -07:00
danielgrippi
b1fc87ea30 add basic overview page to admin controller 2011-07-06 19:08:09 -07:00
Raphael Sofaer
46ef376bc1 Fix notifications feature 2011-07-06 19:00:29 -07:00
Raphael Sofaer
03df3e3e59 Fix manages_aspects feature 2011-07-06 19:00:28 -07:00
danielgrippi
f3d185fe41 hovercard on comments 2011-07-06 17:13:11 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
738487b381 moved the are you sure dialog into a translation 2011-07-06 16:34:51 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
8d94115bbc added the start conversation button back with a message if you try to add more than 16 people 2011-07-06 16:05:12 -07:00
Jordi Mallach
355e29c237 Better messages for following. 2011-07-07 00:34:19 +02:00
Jordi Mallach
fcb3d843e5 Fix names and indentation of some keys. Oops. 2011-07-06 23:47:24 +02:00
Jordi Mallach
5cac35ed27 Updated Catalan translation to c3e477f2. 2011-07-06 23:47:24 +02:00
danielgrippi
76382b074c fix jammit warnings; specs 2011-07-06 14:32:40 -07:00
Raphael Sofaer
9765bdc391 Don't get posts for a hovercard request 2011-07-06 14:11:07 -07:00
danielgrippi
4c380b4edf fix hashtags in hovercard 2011-07-06 13:57:04 -07:00
danielgrippi
dfd30a71bf Merge branch 'hovercard' 2011-07-06 13:51:58 -07:00
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
danielgrippi
d51e9431a6 fixed some styling/positioning. don't display a hovercard for the current user's person links 2011-07-06 12:45:16 -07:00
danielgrippi
a96b77555e DHHHHHHHHHHHHHHHHHHHHHHHHHH hovercard caching with subscription on state change 2011-07-06 12:45:16 -07:00
danielgrippi
f28bb76755 hovercards cache both dropdown and person responses 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
675d9d7485 wip. Person#as_json is breaking right now 2011-07-06 12:45:16 -07:00
Dan Hansen
8f31e99535 missed hovercard.js 2011-07-06 12:45:16 -07:00
Dan Hansen
e852940382 HOVERCARD 2011-07-06 12:45:16 -07:00
Raphael Sofaer
1d5b08aa92 Don't use the pretty formatter on CI 2011-07-06 10:09:58 -07:00
Daniel Grippi
030e7663f4 Merge pull request #671 from disconn3ct/deploy-current-branch
deploy the currently checked-out branch
2011-07-06 10:07:44 -07:00
Daniel Grippi
0cd3878bb8 Merge pull request #670 from galaxor/1137-bad_rsa_keys
1137 bad rsa keys
2011-07-06 10:00:44 -07:00
Dis McCarthy
bf4fb994f5 deploy the currently checked-out branch 2011-07-06 10:41:19 -04:00
MrZYX
78ba1590e5 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2011-07-06 15:44:46 +02:00
MrZYX
b7e86673e8 updated locales 2011-07-06 15:41:29 +02:00
MrZYX
8c1c546bdf fixed #884 2011-07-06 15:38:54 +02:00
danielgrippi
d74942877f touch up message inbox view 2011-07-06 00:38:25 -07:00
Raphael Sofaer
19911bc856 Fix cucumber on my computer 2011-07-05 19:23:58 -07:00
Raphael Sofaer
4a9900dff6 Fix some ui bugs on the post show page 2011-07-05 18:52:00 -07:00
Raphael Sofaer
27f78dd1ad Rake cucumber should be pretty 2011-07-05 18:15:17 -07:00
Raphael Sofaer
2a9fc776e6 Downcase tag name in tagscontroller 2011-07-05 18:03:46 -07:00
Raphael Sofaer
efd6275e68 Don't instantiate objects in tag_string 2011-07-05 17:56:38 -07:00
Raphael Sofaer
0ac28cd9ea Pending spec for 500 on capital letters 2011-07-05 17:31:49 -07:00
danielgrippi
41be7a37b0 hide aspect dropdowns on tag show temporarily 2011-07-05 16:42:32 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
e2b373695d Add null false on tag_followings fields 2011-07-05 16:29:48 -07:00
danielgrippi
ecaf7974e3 removed fixed sidebar for tag following 2011-07-05 16:27:41 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
06abdce180 Use explicit classes in the hover step definition 2011-07-05 15:33:34 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
47e0558c3e Merge branch 'follow_tags' 2011-07-05 15:03:51 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3e477f2c5 Color the follow tag button 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
0ab961e096 tags controller fixed 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
027f096ca7 turns out for the join in the controller to work the current user needs to have contacts to whom they went to, added a spec 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
2d8b5bd54c refactored the controller, moved flash message into translations 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
edac7601f5 checkedout the create.js from master 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d15673c3de changed the variable name 2011-07-05 15:03:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
f0d9d318e8 a user can now follow and unfollow a tag 2011-07-05 15:03:26 -07:00