Dan Hansen & Maxwell Salzberg
0eb33b371b
blocked users works for multi stream, cuke passes
...
fixed scoping stuff
2011-11-03 12:31:24 -07:00
Dan Hansen
16e76886d9
wip
2011-11-03 12:31:24 -07:00
Daniel Grippi
debf382fac
Merge pull request #2306 from Pistos/issue-2298-following-dot-tags
...
Issue 2298 following dot tags
2011-11-02 21:29:48 -07:00
Pistos
78a96a18e4
This fixes issue #2298 .
...
Following a hashtag with a dot now no longer breaks the user's stream page.
All unacceptable hashtag chars are stripped out, and the given tag is
normalized before being followed.
2011-11-02 23:51:12 -04:00
danielgrippi
995996add1
add spec & change syntax in http_multi
2011-11-02 15:00:30 -07:00
Daniel Grippi
ed029b2fbd
Merge pull request #2251 from manuels/retry_federations
...
Retry federation if remote pod is down
2011-11-02 14:09:30 -07:00
Daniel Grippi
73d3bf46b3
Merge pull request #2300 from Pistos/issue-2213-hashtag-markdown-em-collision
...
Issue 2213 hashtag markdown em collision
2011-11-02 13:23:55 -07:00
Maxwell Salzberg
6df5904e13
stop the catastrophic from happening"
2011-11-02 11:59:55 -07:00
Ilya Zhitomirskiy
640733e3d3
fixed the photo index for person
2011-11-02 10:47:50 -07:00
Pistos
db4bfb73a9
Fix issue #2213 : multi-underscore hashtags no longer get Markdown <em>phasis applied.
2011-11-01 23:35:34 -04:00
Pistos
e912bf3eda
Whitespace cleanup.
2011-11-01 23:35:21 -04:00
Dan Hansen & Maxwell Salzberg
697ad1e84f
add new here to right section
2011-11-01 17:19:05 -05:00
Dan Hansen
066f8d1235
Mention the person who invited a user on first message
2011-10-31 22:16:58 -05:00
Ilya Zhitomirskiy
c64588a68d
adding attachments to all recepients
2011-10-31 18:09:43 -07:00
Ilya Zhitomirskiy
9cadb99f8a
sending csv as a file
2011-10-31 16:39:09 -07:00
Ilya Zhitomirskiy
41ccc6b28e
Revert "trying removing extending of empty module"
...
This reverts commit aaafeb27e4 .
2011-10-31 15:12:01 -07:00
Lennart Prelle
f2123d942d
make language for email-invitation available
2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy
aaafeb27e4
trying removing extending of empty module
2011-10-31 12:53:27 -07:00
Ilya Zhitomirskiy
82fabbadd1
Revert "remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)"
...
This reverts commit 95aac2f352 .
2011-10-31 12:38:00 -07:00
danielgrippi
95aac2f352
remove sort order option from the stream (commented at is too crazy and way to slow on large data sets)
2011-10-30 21:46:23 -07:00
Pistos
d643f7e893
Make the donation form (right sidebar) optional. Show or hide via application.yml .
2011-10-29 00:42:09 -04:00
danielgrippi
0def71d74f
add some feedback text & animation; added spec for collapsing tags
2011-10-27 19:57:00 -07:00
danielgrippi
e8169ee581
follow tag from sidebar
2011-10-27 18:42:20 -07:00
Dan Hansen
29a0706123
hide duplicate flash notice on Sessions#new
2011-10-27 20:31:14 -05:00
danielgrippi
c8fc9fcb76
fixed spinny location on getting_started
2011-10-27 18:03:09 -07:00
danielgrippi
0b18e47b82
connect_to_comment text for federated users
2011-10-27 17:24:25 -07:00
danielgrippi
07a4fb8e96
download photo unavailable prompt
2011-10-27 17:22:33 -07:00
danielgrippi
b879070744
avatars for likes
2011-10-26 23:50:01 -07:00
Maxwell Salzberg
94ebc8b37a
update title
2011-10-26 17:40:24 -07:00
danielgrippi
96f74cf930
added feedback to all getting_started states. postive feedback, ftw.
2011-10-26 17:34:15 -07:00
Maxwell Salzberg
9789e25c99
fix oembed spec; prevent people from commenting on posts that wont federate
2011-10-26 17:32:27 -07:00
danielgrippi
dd00523616
show flash messages when adding a person to an aspect
2011-10-26 16:36:47 -07:00
Ilya Zhitomirskiy
53b27a7627
added a rake task to email retention to admins
2011-10-26 16:35:20 -07:00
Manuel Schölling
bcbc86e502
Retry federation if remote pod is down
2011-10-27 00:36:55 +02:00
Maxwell Salzberg
7e73865147
mangle oembed stuff to prevent content warnings, only support services that work when you mangle them; please let us know if your favorite service works when you gsub out all of the https links
2011-10-26 15:11:31 -07:00
Pistos
29573586c8
Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login
2011-10-25 23:02:42 -04:00
Maxwell Salzberg
1a521a792a
zomg text collapse is finally back #thankgod
2011-10-25 19:46:09 -07:00
Pistos
3ce0806cbc
Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login
...
Conflicts:
app/controllers/comments_controller.rb
app/helpers/comments_helper.rb
2011-10-25 22:21:08 -04:00
danielgrippi
f204910aa4
add 'mark all as read' on notification dropdown
2011-10-25 17:33:57 -07:00
danielgrippi
9fba69cd5b
added person stream; temp hack for photos
2011-10-25 16:29:45 -07:00
danielgrippi
0512ade65a
made name smaller and clickable on aspects/index [ci skip]
2011-10-24 21:43:32 -07:00
danielgrippi
19897df1ec
more first_name fixing
2011-10-24 21:34:56 -07:00
danielgrippi
e71fcea762
first_name now takes everything but the last word in the name field
2011-10-24 21:27:21 -07:00
danielgrippi
03d3e885b5
disapora logo goes to stream page on mobile
2011-10-24 21:20:31 -07:00
danielgrippi
28e08fb6a3
show actual screenshots of diaspora mobile on logout; supress log out flash message; bootstrap on logged out page (can we get d* shots in wp7 and android emulators?)
2011-10-24 20:51:16 -07:00
danielgrippi
5d54fc6c28
removed community spotlight stream link from right side
2011-10-24 20:14:28 -07:00
danielgrippi
02199b172b
remove duplicate wording
2011-10-24 18:51:34 -07:00
danielgrippi
0033237b4e
made flash messages awesome this time
2011-10-24 17:33:18 -07:00
Maxwell Salzberg
d5e3033308
make a setting to check out the new getting started
2011-10-24 17:10:36 -07:00
danielgrippi
0874a632f4
make gs dismissal icon translucent
2011-10-24 16:11:26 -07:00