Commit graph

519 commits

Author SHA1 Message Date
zhitomirskiyi
dcc80d5b43 almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
c3b9da8d37 Add specs to conversations#new. Unpending spec for create. 2011-03-19 22:30:58 -07:00
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
MrZYX
dce54f3d40 fixed #947 2011-03-19 15:05:45 +01:00
Raphael Sofaer
42a361dcce Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests 2011-03-18 21:07:31 -07:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -07:00
maxwell
93f7f28b07 if you search for a hash (with a '#') it will just take you to that hash page 2011-03-17 19:16:29 -07:00
maxwell
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
maxwell
bca184eaf3 photos are now successfully delayed 2011-03-17 13:59:53 -07:00
Raphael Sofaer
72523cc7f9 SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to 2011-03-17 12:56:23 -07:00
zhitomirskiyi
a30affe8d3 moved the fixture to the right place 2011-03-17 10:56:59 -07:00
zhitomirskiyi
3d34e3bd35 publishing from a person profile page wip
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one

a tiny sass add

publishing from the profile works, need js translation

added the translation

made the hover state consistant

need to fix the cucumber spec

specs are green need to add a button

added the buttion to mention people

moved the publisher to the facebox

fixed the cucumbers for the modal window
2011-03-17 10:56:58 -07:00
Kiran Soumya
6d113da242 Bug Fix:868 for Users unable to download photos 2011-03-17 01:14:05 +05:30
danielgrippi
68479481cf made websockets far less dumb. don't render partials for people not connected. 2011-03-15 18:21:09 -07:00
danielgrippi
1988e195fb a user can put tags in their profile and they show up on the person/show page. 2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d breaking out Diaspora::Taggable wip 2011-03-15 13:21:36 -07:00
Raphael Sofaer
1666843aa9 Fix 500 in publicsController 2011-03-14 16:48:07 -07:00
Raphael Sofaer
2cd6e89e5c Fix merge error from message - text refactor 2011-03-14 11:49:10 -07:00
Raphael Sofaer
1b0445563e Specs passing with text 2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408 Changing message to text, partway done, deleted data conversion 2011-03-14 11:39:31 -07:00
Sarah Mei
03f90a999d refactor aspects controller spec 2011-03-13 21:32:59 -07:00
Sarah Mei
1d6a69ea82 refactor photos controller spec 2011-03-13 20:54:47 -07:00
maxwell
580f0576c8 added test for edit 2011-03-11 15:43:29 -08:00
maxwell
52b970098b add specs for updating email settings in the controller, and user#mail 2011-03-11 15:43:29 -08:00
Raphael Sofaer
8f1a6f502e Change equals to sort-of-equals 2011-03-11 14:23:03 -08:00
danielgrippi
9ad96726de just use tag search for now 2011-03-10 19:42:24 -08:00
Raphael Sofaer
b86098055e Add tag search on public page 2011-03-10 18:37:45 -08:00
Dan Hansen
10345b14a8 generate jasmine fixture with posts 2011-03-10 19:12:16 -06:00
Raphael Sofaer
05f9d79689 Fix public posts page when signed in 2011-03-10 15:26:55 -08:00
Raphael Sofaer
8f929d2b85 Show local public posts in /p 2011-03-10 14:41:03 -08:00
Raphael Sofaer
ddbd5febb3 Make people pages publicly accessible 2011-03-10 12:55:05 -08:00
maxwell
1baafac84b added content to rss feed 2011-03-09 19:11:09 -08:00
maxwell
f9279f9bbc fixed public route not fetching posts, also an error in status_message activity markup 2011-03-09 17:08:41 -08:00
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages'
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
danielgrippi
fca5310c77 dispatch the conversation in ConversationsController 2011-03-07 17:54:25 -08:00
Raphael Sofaer
909a198380 Post photos without text 2011-03-07 10:03:43 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
Raphael Sofaer
435451bc5b admins can resend invitations 2011-03-03 16:59:33 -08:00
Raphael Sofaer
da12954d22 Move statusmessage create view out to partial 2011-03-03 11:10:44 -08:00
zhitomirskiyi
9d7611f8d8 addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling 2011-03-02 12:27:57 -08:00
Raphael Sofaer
770091e82b Don't retrieve all the user's contacts again unnecessarily 2011-03-02 12:11:25 -08:00
zhitomirskiyi
f58c477673 added the forgotten files 2011-03-01 23:55:11 -08:00
danielvincent
21fd546cd0 posts now have authors instead of people 2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0 Delete statistic and data point models 2011-03-01 16:54:12 -08:00
danielvincent
11309574cf messages are now relayable, a comment has an author as opposed to a person. 2011-03-01 12:39:42 -08:00
danielvincent
1072806d8f PrivateMessage -> Conversation, Message. 2011-03-01 12:25:55 -08:00
danielvincent
a179bac689 fixed migrations, added unread to PrivateMessageVisibilities 2011-03-01 12:25:54 -08:00
danielvincent
979d9d7fb4 added delete actions for private messages 2011-03-01 12:14:31 -08:00