Commit graph

6348 commits

Author SHA1 Message Date
Dan Hansen
d448436376 this refers to the dom element, not Embedder 2011-03-10 23:11:06 -06:00
Dan Hansen
b50217c98c clean up default.html 2011-03-10 23:06:34 -06:00
maxwell
ffa6b9879f added default development page so it doesnt look so terrible 2011-03-10 20:31:39 -08:00
zhitomirskiyi
35cabd469f fixed the merge for the author convention 2011-03-10 20:13:52 -08:00
zhitomirskiyi
9b00b2c786 Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends'
Conflicts:
	app/models/user.rb
	spec/integration/receiving_spec.rb
	spec/models/mention_spec.rb
	spec/models/status_message_spec.rb
2011-03-10 19:59:12 -08:00
danielgrippi
54130b49b7 Revert "fix a few invalid html tags"
This reverts commit 004d9b5028.
2011-03-10 19:42:37 -08:00
danielgrippi
9ad96726de just use tag search for now 2011-03-10 19:42:24 -08:00
Michael Nutt
004d9b5028 fix a few invalid html tags 2011-03-10 22:18:40 -05:00
Dan Hansen
490a2c6a9e remove extra protocol in the link 2011-03-10 21:16:45 -06:00
Raphael Sofaer
35903514f5 remove wasteful join 2011-03-10 18:53:23 -08:00
Raphael Sofaer
b86098055e Add tag search on public page 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c35f143b29 always link to hashtag. 2011-03-10 18:37:45 -08:00
Raphael Sofaer
ea98b1ca81 Tags now link to meaningless query in PostsController 2011-03-10 18:37:45 -08:00
Raphael Sofaer
f19857cc40 Simplify regex madness 2011-03-10 18:37:45 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
Dan Hansen
10345b14a8 generate jasmine fixture with posts 2011-03-10 19:12:16 -06:00
Dan Hansen
c9545920f8 title on landing page 2011-03-10 18:40:54 -06:00
Dan Hansen
214c677169 process videos last so there aren't conflicts with other markdownify methods 2011-03-10 18:29:08 -06:00
Dan Hansen
d7c7775b6c fallback gracefully, break build if videos can't embed 2011-03-10 18:26:55 -06:00
Dan Hansen
93bdf1e91e add space before link 2011-03-10 18:01:08 -06:00
danielgrippi
2cf0503310 put text below photo in stream 2011-03-10 15:28:44 -08:00
Raphael Sofaer
05f9d79689 Fix public posts page when signed in 2011-03-10 15:26:55 -08:00
danielgrippi
1f3261b2ef make photos larger in the stream 2011-03-10 15:17:41 -08:00
Raphael Sofaer
8f929d2b85 Show local public posts in /p 2011-03-10 14:41:03 -08:00
Michael Nutt
9d1bb3ac21 fix feature for new markup 2011-03-10 16:42:07 -05:00
Michael Nutt
2b6070d325 features for comments 2011-03-10 16:42:07 -05:00
Michael Nutt
8837632dd9 User should be able to comment on their own photo 2011-03-10 16:42:07 -05:00
Michael Nutt
8c5621158d notification now only created when message is received, not when message is first saved 2011-03-10 16:41:03 -05:00
Raphael Sofaer
0416fa14b2 Just use /users/me to update open aspects 2011-03-10 13:03:45 -08:00
Raphael Sofaer
8a419a84a6 fix up some specs 2011-03-10 12:55:05 -08:00
Raphael Sofaer
ddbd5febb3 Make people pages publicly accessible 2011-03-10 12:55:05 -08:00
maxwell
7b0a354677 slight tweaks to pubsubhubub publishing 2011-03-10 12:17:34 -08:00
MrZYX
dd97f1b985 updated locales 2011-03-10 15:50:43 +01:00
MrZYX
58796dcde2 uhm, --amend 2011-03-10 15:35:40 +01:00
MrZYX
7bf256ecfa we need @all_aspects not only in html views 2011-03-10 15:29:49 +01:00
MrZYX
6d314e9394 fixed ostatus builder + spec 2011-03-10 15:17:56 +01:00
MrZYX
1e3533b1b1 made zh-TW as language available. Thanks to iongchun 2011-03-10 14:45:46 +01:00
maxwell
1baafac84b added content to rss feed 2011-03-09 19:11:09 -08:00
maxwell
90aac1d175 spec to have ostatus builder still build rss even if an object does not respond to activity 2011-03-09 18:54:09 -08:00
maxwell
af43a60b62 only grab statuses for public feed 2011-03-09 18:12:36 -08:00
Raphael Sofaer
9324aceefc typo 2011-03-09 18:04:09 -08:00
maxwell
337831bba2 move ostatus builder, actually added the file. 2011-03-09 18:01:48 -08:00
Raphael Sofaer
584684560e Make conversation delete clearer 2011-03-09 17:58:29 -08:00
Raphael Sofaer
e6836c46a7 Remove unnecessary includes, finish renaming set_header_data, only run set_header_data on html requests 2011-03-09 17:50:46 -08:00
Raphael Sofaer
f2cc51dd0d Take current user id out of avatar 2011-03-09 17:50:46 -08:00
maxwell
5b73e9ca06 rename ostatus builder spec to have the correct name 2011-03-09 17:35:21 -08:00
maxwell
1ac688f82c moved an ostatus builder query out to the controller, where it belongs, and corrected the order 2011-03-09 17:33:47 -08:00
maxwell
9d480b0961 remove status_message#public_message: we never use it 2011-03-09 17:14:37 -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
Raphael Sofaer
eafa965504 Try explicitly querying rather than getting postvisibilities 2011-03-09 16:17:48 -08:00